summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2017-05-25 18:23:35 +0200
committerLubomir Rintel <lkundrak@v3.sk>2017-06-01 11:28:57 +0200
commit29a0876db6205f7a017c335df22d4a115fe04fe5 (patch)
treea9dd527a5c737e61d5d1c4f0e7acbbff60ad18e3
parentd6f2a2e73c1a98da6f1959a2360810ac258260ad (diff)
downloadNetworkManager-29a0876db6205f7a017c335df22d4a115fe04fe5.tar.gz
bluetooth: emit component-added when a network server is added
-rw-r--r--src/devices/bluetooth/nm-bluez-manager.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index e290173220..33bea4e27c 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -146,7 +146,7 @@ cleanup_checking (NMBluezManager *self, gboolean do_unwatch_name)
static void
-manager_bdaddr_added_cb (NMBluez4Manager *bluez_mgr,
+manager_bdaddr_added_cb (GObject *manager,
NMBluezDevice *bt_device,
const char *bdaddr,
const char *name,
@@ -180,6 +180,13 @@ manager_bdaddr_added_cb (NMBluez4Manager *bluez_mgr,
}
static void
+manager_network_server_added_cb (GObject *manager,
+ gpointer user_data)
+{
+ nm_device_factory_emit_component_added (NM_DEVICE_FACTORY (user_data), NULL);
+}
+
+static void
setup_version_number (NMBluezManager *self, int bluez_version)
{
NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self);
@@ -228,6 +235,10 @@ setup_bluez5 (NMBluezManager *self)
NM_BLUEZ_MANAGER_BDADDR_ADDED,
G_CALLBACK (manager_bdaddr_added_cb),
self);
+ g_signal_connect (manager,
+ NM_BLUEZ_MANAGER_NETWORK_SERVER_ADDED,
+ G_CALLBACK (manager_network_server_added_cb),
+ self);
nm_bluez5_manager_query_devices (manager);
}
@@ -427,7 +438,7 @@ dispose (GObject *object)
g_clear_object (&priv->manager4);
}
if (priv->manager5) {
- g_signal_handlers_disconnect_by_func (priv->manager5, manager_bdaddr_added_cb, self);
+ g_signal_handlers_disconnect_by_data (priv->manager5, self);
g_clear_object (&priv->manager5);
}