From e8df700cdd750e1287a79eb95eed29763fb1336a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 20 Feb 2013 12:07:13 -0600 Subject: [PATCH] bluetooth: fix handling of ModemManager restarts When built with MM1 support, the restart handling code here would fail for both old MM and new MM. The code should ignore the name owner change even if the incoming bus name is *neither* old MM nor new MM. It wasn't doing that. --- src/nm-device-bt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 8ecb9b119f..8a4b2eabb5 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));