From 8d275584fc94f398f0a7c990dcd057533d9a5856 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Feb 2013 23:06:45 +0100 Subject: Imported Upstream version 0.9.8.0 --- src/nm-device-bt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/nm-device-bt.c') diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 366e2683..5766ab8e 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -1150,13 +1150,12 @@ mm_name_owner_changed (NMDBusManager *dbus_mgr, gboolean new_owner_good; /* Can't handle the signal if its not from the modem service */ - if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0) - return; - + if ( strcmp (MM_OLD_DBUS_SERVICE, name) != 0 #if WITH_MODEM_MANAGER_1 - if (strcmp (MM_NEW_DBUS_SERVICE, name) != 0) - return; + && strcmp (MM_NEW_DBUS_SERVICE, name) != 0 #endif + ) + return; old_owner_good = (old_owner && strlen (old_owner)); new_owner_good = (new_owner && strlen (new_owner)); -- cgit 1.3.0-6-gf8a5