diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-25 18:38:10 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-31 20:05:53 +0200 |
| commit | 43c43d5e3a01b3d33d386b7472c58f1a0cce2a46 (patch) | |
| tree | f6361e4be905f3f3f790d065fad81b8f8ea92ea7 | |
| parent | c22672b3834a92f16edb13aa3106873ed3aee91d (diff) | |
| download | NetworkManager-43c43d5e3a01b3d33d386b7472c58f1a0cce2a46.tar.gz | |
bluetooth: streamline NMBluez5Manager teardown a bit
| -rw-r--r-- | src/devices/bluetooth/nm-bluez5-manager.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index 88759301d5..27d4989b46 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -306,22 +306,6 @@ name_owner_changed_cb (GObject *object, } } -static void -bluez_cleanup (NMBluez5Manager *self, gboolean do_signal) -{ - NMBluez5ManagerPrivate *priv = NM_BLUEZ5_MANAGER_GET_PRIVATE (self); - - if (priv->proxy) { - g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (name_owner_changed_cb), self); - g_clear_object (&priv->proxy); - } - - if (do_signal) - remove_all_devices (self); - else - g_hash_table_remove_all (priv->devices); -} - /*****************************************************************************/ static void @@ -351,8 +335,14 @@ static void dispose (GObject *object) { NMBluez5Manager *self = NM_BLUEZ5_MANAGER (object); + NMBluez5ManagerPrivate *priv = NM_BLUEZ5_MANAGER_GET_PRIVATE (self); + + if (priv->proxy) { + g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (name_owner_changed_cb), self); + g_clear_object (&priv->proxy); + } - bluez_cleanup (self, FALSE); + g_hash_table_remove_all (priv->devices); G_OBJECT_CLASS (nm_bluez5_manager_parent_class)->dispose (object); } |