diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:55 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:55 +0100 |
| commit | 6bb18bdca6b7bf811bdd00dbea1b09f3a367d2dc (patch) | |
| tree | 8fec068abdd1bc1ade3839f599e1c18d6c524a6a /src/nm-device-bt.c | |
| parent | fdcb282bbb150da0049cf2dd5b54e56eb3d0b55f (diff) | |
| parent | 8d275584fc94f398f0a7c990dcd057533d9a5856 (diff) | |
Merge tag 'upstream/0.9.8.0' into experimental
Upstream version 0.9.8.0
Diffstat (limited to 'src/nm-device-bt.c')
| -rw-r--r-- | src/nm-device-bt.c | 9 |
1 files changed, 4 insertions, 5 deletions
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)); |