fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 04:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: Split out connecting to a UPower daemon

Browse source
This commit is contained in:
Bastien Nocera 2019-10-23 17:18:56 +02:00
parent 78426641df
commit 90d4530142
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
libupower-glib/up-client.c
View file

@ -524,6 +524,35 @@ up_client_class_init (UpClientClass *klass)
G_TYPE_NONE, 1, G_TYPE_STRING);
}
static void
connect_to_one_daemon (GBusType bus_type,
const char *name,
const char *object_path,
GCancellable *cancellable,
GError **error)
{
GDBusProxy *proxy;
proxy = up_exported_daemon_proxy_new_for_bus_sync (bus_type,
G_DBUS_PROXY_FLAGS_NONE,
name,
object_path,
cancellable,
error);
if (proxy == NULL)
return NULL;
/* all callbacks */
g_signal_connect (proxy, "device-added",
G_CALLBACK (up_device_added_cb), client);
g_signal_connect (proxy, "device-removed",
G_CALLBACK (up_device_removed_cb), client);
g_signal_connect (proxy, "notify",
G_CALLBACK (up_client_notify_cb), client);
return proxy;
}
static gboolean
up_client_initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
{
@ -536,23 +565,14 @@ up_client_initable_init (GInitable *initable, GCancellable *cancellable, GError
}
/* connect to main interface */
client->priv->proxy = up_exported_daemon_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
"org.freedesktop.UPower",
"/org/freedesktop/UPower",
cancellable,
error);
if (client->priv->proxy == NULL)
client->priv->proxy = connect_to_one_daemon (G_BUS_TYPE_SYSTEM,
"org.freedesktop.UPower",
"/org/freedesktop/UPower",
cancellable,
error);
if (!client->priv->proxy)
return FALSE;
/* all callbacks */
g_signal_connect (client->priv->proxy, "device-added",
G_CALLBACK (up_device_added_cb), client);
g_signal_connect (client->priv->proxy, "device-removed",
G_CALLBACK (up_device_removed_cb), client);
g_signal_connect (client->priv->proxy, "notify",
G_CALLBACK (up_client_notify_cb), client);
return TRUE;
}