diff options
| author | David Zeuthen <davidz@redhat.com> | 2008-11-11 10:42:53 -0500 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2008-11-11 10:42:53 -0500 |
| commit | 9f4bdecd33119b53b52a29c9dafb43d119f864c1 (patch) | |
| tree | dfcbbfc074c48f52d1b7757271c3c3ebb25238c5 | |
| parent | ace8a0a2423dd44220eba0512d23f77aefe33699 (diff) | |
| download | upower-9f4bdecd33119b53b52a29c9dafb43d119f864c1.tar.gz | |
move object paths so things are rooted under /org/freedesktop/DeviceKit/Power
| -rw-r--r-- | libdevkit-power/dkp-client.c | 6 | ||||
| -rw-r--r-- | src/dkp-daemon.c | 3 | ||||
| -rw-r--r-- | src/dkp-device.c | 2 | ||||
| -rw-r--r-- | tools/dkp-battery-power.c | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/libdevkit-power/dkp-client.c b/libdevkit-power/dkp-client.c index 1869c0a..d6db70a 100644 --- a/libdevkit-power/dkp-client.c +++ b/libdevkit-power/dkp-client.c @@ -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; diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c index 9ed3d2b..be884e8 100644 --- a/src/dkp-daemon.c +++ b/src/dkp-daemon.c @@ -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, diff --git a/src/dkp-device.c b/src/dkp-device.c index b1f86be..bdd10a5 100644 --- a/src/dkp-device.c +++ b/src/dkp-device.c @@ -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); diff --git a/tools/dkp-battery-power.c b/tools/dkp-battery-power.c index 841d735..f32adc5 100644 --- a/tools/dkp-battery-power.c +++ b/tools/dkp-battery-power.c @@ -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; |