fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 21:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-bt: watch both old and new ModemManager interface name owner changes

Browse source
This commit is contained in:
Aleksander Morgado 2012-11-07 15:40:42 +01:00 • committed by Dan Williams
parent 998b9295c9
commit 2a1481112c
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,8 @@
#include "nm-enum-types.h"
#include "nm-utils.h"
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_OLD_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_NEW_DBUS_SERVICE "org.freedesktop.ModemManager1"
#define BLUETOOTH_DUN_UUID "dun"
#define BLUETOOTH_NAP_UUID "nap"
@ -1154,9 +1155,14 @@ 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_DBUS_SERVICE, name) != 0)
if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0)
return;
#if WITH_MODEM_MANAGER_1
if (strcmp (MM_NEW_DBUS_SERVICE, name) != 0)
return;
#endif
old_owner_good = (old_owner && strlen (old_owner));
new_owner_good = (new_owner && strlen (new_owner));
@ -1197,6 +1203,7 @@ static void
nm_device_bt_init (NMDeviceBt *self)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
gboolean mm_running;
priv->dbus_mgr = nm_dbus_manager_get ();
@ -1205,7 +1212,13 @@ nm_device_bt_init (NMDeviceBt *self)
G_CALLBACK (mm_name_owner_changed),
self);
set_mm_running (self, nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_DBUS_SERVICE));
/* Initial check to see if ModemManager is running */
mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_OLD_DBUS_SERVICE);
#if WITH_MODEM_MANAGER_1
if (!mm_running)
mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_NEW_DBUS_SERVICE);
#endif
set_mm_running (self, mm_running);
}
static void