diff options
Diffstat (limited to 'src/devices/nm-device-olpc-mesh.c')
| -rw-r--r-- | src/devices/nm-device-olpc-mesh.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/devices/nm-device-olpc-mesh.c b/src/devices/nm-device-olpc-mesh.c index 4a5c5f949a..209568e367 100644 --- a/src/devices/nm-device-olpc-mesh.c +++ b/src/devices/nm-device-olpc-mesh.c @@ -50,7 +50,7 @@ #include "nm-activation-request.h" #include "nm-setting-connection.h" #include "nm-setting-olpc-mesh.h" -#include "nm-manager.h" +#include "nm-device-manager.h" #include "nm-enum-types.h" #include "nm-dbus-manager.h" #include "wifi-utils.h" @@ -357,7 +357,7 @@ dispose (GObject *object) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (object); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); - NMManager *manager; + NMDeviceManager *device_manager; if (priv->dispose_has_run) { G_OBJECT_CLASS (nm_device_olpc_mesh_parent_class)->dispose (object); @@ -370,12 +370,11 @@ dispose (GObject *object) companion_cleanup (self); - manager = nm_manager_get (); + device_manager = nm_device_manager_get (); if (priv->device_added_id) - g_signal_handler_disconnect (manager, priv->device_added_id); + g_signal_handler_disconnect (device_manager, priv->device_added_id); if (priv->device_removed_id) - g_signal_handler_disconnect (manager, priv->device_removed_id); - g_object_unref (manager); + g_signal_handler_disconnect (device_manager, priv->device_removed_id); G_OBJECT_CLASS (nm_device_olpc_mesh_parent_class)->dispose (object); } @@ -531,7 +530,6 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other) NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); const guint8 *my_addr, *their_addr; guint their_addr_len; - NMManager *manager; if (!NM_IS_DEVICE_WIFI (other)) return FALSE; @@ -545,12 +543,10 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other) priv->companion = other; /* When we've found the companion, stop listening for other devices */ - manager = nm_manager_get (); if (priv->device_added_id) { - g_signal_handler_disconnect (manager, priv->device_added_id); + g_signal_handler_disconnect (nm_device_manager_get (), priv->device_added_id); priv->device_added_id = 0; } - g_object_unref (manager); nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_DISCONNECTED, @@ -578,7 +574,7 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other) } static void -device_added_cb (NMManager *manager, NMDevice *other, gpointer user_data) +device_added_cb (NMDeviceManager *device_manager, NMDevice *other, gpointer user_data) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data); @@ -586,7 +582,7 @@ device_added_cb (NMManager *manager, NMDevice *other, gpointer user_data) } static void -device_removed_cb (NMManager *manager, NMDevice *other, gpointer user_data) +device_removed_cb (NMDeviceManager *device_manager, NMDevice *other, gpointer user_data) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data); @@ -599,8 +595,8 @@ check_companion_cb (gpointer user_data) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data); NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); - NMManager *manager; - GSList *list; + NMDeviceManager *device_manager; + const GSList *list; if (priv->companion != NULL) { nm_device_state_changed (NM_DEVICE (user_data), @@ -612,23 +608,21 @@ check_companion_cb (gpointer user_data) if (priv->device_added_id != 0) return FALSE; - manager = nm_manager_get (); + device_manager = nm_device_manager_get (); - priv->device_added_id = g_signal_connect (manager, "device-added", + priv->device_added_id = g_signal_connect (device_manager, NM_DM_SIGNAL_DEVICE_ADDED, G_CALLBACK (device_added_cb), self); if (!priv->device_removed_id) { - priv->device_removed_id = g_signal_connect (manager, "device-removed", + priv->device_removed_id = g_signal_connect (device_manager, NM_DM_SIGNAL_DEVICE_REMOVED, G_CALLBACK (device_removed_cb), self); } - /* Try to find the companion if it's already known to the NMManager */ - for (list = nm_manager_get_devices (manager); list ; list = g_slist_next (list)) { + /* Try to find the companion if it's already known to the NMDeviceManager */ + for (list = nm_device_manager_get_devices (device_manager); list ; list = g_slist_next (list)) { if (is_companion (self, NM_DEVICE (list->data))) break; } - g_object_unref (manager); - return FALSE; } |