fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 04:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bt: minor refactoring of mm_name_owner_changed() function

Browse source
This commit is contained in:
Thomas Haller 2017-04-21 20:20:40 +02:00
parent d1ef7f7aac
commit 7840dde47b
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/devices/bluetooth/nm-device-bt.c
View file

@ -982,18 +982,21 @@ set_mm_running (NMDeviceBt *self, gboolean running)
}
static void
mm_name_owner_changed (GObject *object,
GParamSpec *pspec,
NMDeviceBt *self)
mm_name_owner_changed (NMDeviceBt *self)
{
char *owner;
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
gs_free char *owner = NULL;
owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
if (owner) {
set_mm_running (self, TRUE);
g_free (owner);
} else
set_mm_running (self, FALSE);
owner = g_dbus_proxy_get_name_owner (priv->mm_proxy);
set_mm_running (self, owner != NULL);
}
static void
mm_name_owner_changed_cb (GObject *object,
GParamSpec *pspec,
NMDeviceBt *self)
{
mm_name_owner_changed (self);
}
/*****************************************************************************/
@ -1073,9 +1076,9 @@ constructed (GObject *object)
NULL, &error);
if (priv->mm_proxy) {
g_signal_connect (priv->mm_proxy, "notify::g-name-owner",
G_CALLBACK (mm_name_owner_changed),
G_CALLBACK (mm_name_owner_changed_cb),
self);
mm_name_owner_changed (G_OBJECT (priv->mm_proxy), NULL, self);
mm_name_owner_changed (self);
} else {
_LOGW (LOGD_MB, "Could not create proxy for '%s': %s",
NM_MODEM_MANAGER_MM_DBUS_SERVICE, error->message);
@ -1135,7 +1138,7 @@ dispose (GObject *object)
g_signal_handlers_disconnect_matched (priv->bt_device, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
if (priv->mm_proxy) {
g_signal_handlers_disconnect_by_func (priv->mm_proxy, G_CALLBACK (mm_name_owner_changed), object);
g_signal_handlers_disconnect_by_func (priv->mm_proxy, G_CALLBACK (mm_name_owner_changed_cb), object);
g_clear_object (&priv->mm_proxy);
}