diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-01-25 16:48:41 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-01-27 14:23:34 +0100 |
| commit | 30bedd0b39656e96fd7b8e5fb5197e6ce7e4f33d (patch) | |
| tree | e0b5f23ee480d3bed40cdeb0546311617f0b7ce8 | |
| parent | 81a9d84d60dd4f204b0445d25be28d4e12cb19bb (diff) | |
| download | NetworkManager-30bedd0b39656e96fd7b8e5fb5197e6ce7e4f33d.tar.gz | |
bluez: own reference to connection provider in NMBluezDevice
(cherry picked from commit 53233bb04ccb65cc24ad186c98a46963f437850e)
| -rw-r--r-- | src/devices/bluetooth/nm-bluez-device.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 89ad827077..e6a62121d0 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -1030,7 +1030,7 @@ nm_bluez_device_new (const char *path, const char *interface_name = NULL; g_return_val_if_fail (path != NULL, NULL); - g_return_val_if_fail (provider != NULL, NULL); + g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (provider), NULL); g_return_val_if_fail (bluez_version == 4 || bluez_version == 5, NULL); self = (NMBluezDevice *) g_object_new (NM_TYPE_BLUEZ_DEVICE, @@ -1044,7 +1044,7 @@ nm_bluez_device_new (const char *path, priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self); priv->bluez_version = bluez_version; - priv->provider = provider; + priv->provider = g_object_ref (provider); g_return_val_if_fail (bluez_version == 5 || (bluez_version == 4 && adapter_address), NULL); if (adapter_address) set_adapter_address (self, adapter_address); @@ -1118,9 +1118,11 @@ dispose (GObject *object) } #endif - g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_added, self); - g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_removed, self); - g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_updated, self); + if (priv->provider) { + g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_added, self); + g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_removed, self); + g_signal_handlers_disconnect_by_func (priv->provider, cp_connection_updated, self); + } g_slist_free_full (priv->connections, g_object_unref); priv->connections = NULL; @@ -1136,6 +1138,8 @@ dispose (GObject *object) nm_settings_connection_delete (NM_SETTINGS_CONNECTION (to_delete), NULL, NULL); g_object_unref (to_delete); } + + g_clear_object (&priv->provider); } static void |