mirror of
https://gitlab.freedesktop.org/upower/upower.git
synced 2026-05-04 18:48:05 +02:00
move object paths so things are rooted under /org/freedesktop/DeviceKit/Power
This commit is contained in:
parent
ace8a0a242
commit
9f4bdecd33
4 changed files with 11 additions and 6 deletions
|
|
@ -337,8 +337,10 @@ dkp_client_init (DkpClient *client)
|
|||
}
|
||||
|
||||
/* connect to main interface */
|
||||
client->priv->proxy = dbus_g_proxy_new_for_name (client->priv->bus, "org.freedesktop.DeviceKit.Power",
|
||||
"/", "org.freedesktop.DeviceKit.Power");
|
||||
client->priv->proxy = dbus_g_proxy_new_for_name (client->priv->bus,
|
||||
"org.freedesktop.DeviceKit.Power",
|
||||
"/org/freedesktop/DeviceKit/Power",
|
||||
"org.freedesktop.DeviceKit.Power");
|
||||
if (client->priv->proxy == NULL) {
|
||||
egg_warning ("Couldn't connect to proxy");
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -585,7 +585,8 @@ gpk_daemon_register_power_daemon (DkpDaemon *daemon)
|
|||
polkit_tracker_set_system_bus_connection (daemon->priv->pk_tracker, connection);
|
||||
polkit_tracker_init (daemon->priv->pk_tracker);
|
||||
|
||||
dbus_g_connection_register_g_object (daemon->priv->system_bus_connection, "/",
|
||||
dbus_g_connection_register_g_object (daemon->priv->system_bus_connection,
|
||||
"/org/freedesktop/DeviceKit/Power",
|
||||
G_OBJECT (daemon));
|
||||
|
||||
daemon->priv->system_bus_proxy = dbus_g_proxy_new_for_name (daemon->priv->system_bus_connection,
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@ dkp_device_compute_object_path (DkpDevice *device)
|
|||
if (id[i] == ':')
|
||||
id[i] = 'o';
|
||||
}
|
||||
object_path = g_build_filename ("/devices", id, NULL);
|
||||
object_path = g_build_filename ("/org/freedesktop/DeviceKit/Power/devices", id, NULL);
|
||||
|
||||
g_free (basename);
|
||||
g_free (id);
|
||||
|
|
|
|||
|
|
@ -37,8 +37,10 @@ main (int argc, char **argv)
|
|||
goto out;
|
||||
}
|
||||
|
||||
proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Power",
|
||||
"/", "org.freedesktop.DeviceKit.Power");
|
||||
proxy = dbus_g_proxy_new_for_name (bus,
|
||||
"org.freedesktop.DeviceKit.Power",
|
||||
"/org/freedesktop/DeviceKit/Power",
|
||||
"org.freedesktop.DeviceKit.Power");
|
||||
if (proxy == NULL) {
|
||||
egg_warning ("Couldn't connect to DeviceKit-power");
|
||||
goto out;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue