fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 15:50:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: fix handling of ModemManager restarts

Browse source 
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.
This commit is contained in:
Dan Williams 2013-02-20 12:07:13 -06:00
parent ddbb13bcc6
commit e8df700cdd
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-device-bt.c
View file

@ -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));