diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | devkit-power-gobject/dkp-client.c | 12 | ||||
-rw-r--r-- | devkit-power-gobject/dkp-device.c | 8 | ||||
-rw-r--r-- | devkit-power-gobject/dkp-wakeups.c | 12 | ||||
-rw-r--r-- | doc/Makefile.am | 6 | ||||
-rw-r--r-- | doc/dbus/Makefile.am | 10 | ||||
-rw-r--r-- | doc/devkit-power-docs.xml | 6 | ||||
-rw-r--r-- | doc/man/DeviceKit-power.xml | 2 | ||||
-rw-r--r-- | doc/man/devkit-power-daemon.xml | 4 | ||||
-rw-r--r-- | src/Makefile.am | 36 | ||||
-rw-r--r-- | src/org.freedesktop.DeviceKit.Power.conf.in | 34 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.Device.xml (renamed from src/org.freedesktop.DeviceKit.Power.Device.xml) | 16 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.QoS.xml (renamed from src/org.freedesktop.DeviceKit.Power.QoS.xml) | 6 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.Wakeups.xml (renamed from src/org.freedesktop.DeviceKit.Power.Wakeups.xml) | 6 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.conf.in | 34 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.service.in (renamed from src/org.freedesktop.DeviceKit.Power.service.in) | 2 | ||||
-rw-r--r-- | src/org.freedesktop.UPower.xml (renamed from src/org.freedesktop.DeviceKit.Power.xml) | 18 | ||||
-rw-r--r-- | src/up-daemon.c | 2 | ||||
-rw-r--r-- | src/up-device.c | 2 | ||||
-rw-r--r-- | src/up-main.c | 2 | ||||
-rw-r--r-- | src/up-qos.c | 2 | ||||
-rw-r--r-- | src/up-wakeups.c | 2 | ||||
-rw-r--r-- | tools/Makefile.am | 4 |
23 files changed, 114 insertions, 114 deletions
@@ -15,5 +15,5 @@ Requirements: DeviceKit-power is an abstraction for enumerating power devices, listening to device events and querying history and statistics. Any application or service on the system can access the -org.freedesktop.DeviceKit.Power service via the system message bus. +org.freedesktop.UPower service via the system message bus. diff --git a/devkit-power-gobject/dkp-client.c b/devkit-power-gobject/dkp-client.c index 34f7b58..feac826 100644 --- a/devkit-power-gobject/dkp-client.c +++ b/devkit-power-gobject/dkp-client.c @@ -244,7 +244,7 @@ dkp_client_ensure_properties (DkpClient *client) error = NULL; ret = dbus_g_proxy_call (client->priv->prop_proxy, "GetAll", &error, - G_TYPE_STRING, "org.freedesktop.DeviceKit.Power", + G_TYPE_STRING, "org.freedesktop.UPower", G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID); @@ -652,9 +652,9 @@ 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", - "org.freedesktop.DeviceKit.Power"); + "org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.UPower"); if (client->priv->proxy == NULL) { g_warning ("Couldn't connect to proxy"); goto out; @@ -662,8 +662,8 @@ dkp_client_init (DkpClient *client) /* connect to properties interface */ client->priv->prop_proxy = dbus_g_proxy_new_for_name (client->priv->bus, - "org.freedesktop.DeviceKit.Power", - "/org/freedesktop/DeviceKit/Power", + "org.freedesktop.UPower", + "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties"); if (client->priv->prop_proxy == NULL) { g_warning ("Couldn't connect to proxy"); diff --git a/devkit-power-gobject/dkp-device.c b/devkit-power-gobject/dkp-device.c index debf90f..16ee6ac 100644 --- a/devkit-power-gobject/dkp-device.c +++ b/devkit-power-gobject/dkp-device.c @@ -126,7 +126,7 @@ dkp_device_get_device_properties (DkpDevice *device, GError **error) GHashTable *hash_table = NULL; ret = dbus_g_proxy_call (device->priv->proxy_props, "GetAll", &error_local, - G_TYPE_STRING, "org.freedesktop.DeviceKit.Power.Device", + G_TYPE_STRING, "org.freedesktop.UPower.Device", G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &hash_table, @@ -270,7 +270,7 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError } /* connect to the correct path for properties */ - proxy_props = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.DeviceKit.Power", + proxy_props = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.UPower", object_path, "org.freedesktop.DBus.Properties"); if (proxy_props == NULL) { g_set_error_literal (error, 1, 0, "Couldn't connect to proxy"); @@ -278,8 +278,8 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError } /* connect to the correct path for all the other methods */ - proxy_device = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.DeviceKit.Power", - object_path, "org.freedesktop.DeviceKit.Power.Device"); + proxy_device = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.UPower", + object_path, "org.freedesktop.UPower.Device"); if (proxy_device == NULL) { g_set_error_literal (error, 1, 0, "Couldn't connect to proxy"); goto out; diff --git a/devkit-power-gobject/dkp-wakeups.c b/devkit-power-gobject/dkp-wakeups.c index 679520b..5c5623b 100644 --- a/devkit-power-gobject/dkp-wakeups.c +++ b/devkit-power-gobject/dkp-wakeups.c @@ -183,7 +183,7 @@ dkp_wakeups_ensure_properties (DkpWakeups *wakeups) error = NULL; ret = dbus_g_proxy_call (wakeups->priv->prop_proxy, "GetAll", &error, - G_TYPE_STRING, "org.freedesktop.DeviceKit.Power.Wakeups", + G_TYPE_STRING, "org.freedesktop.UPower.Wakeups", G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID); @@ -286,8 +286,8 @@ dkp_wakeups_init (DkpWakeups *wakeups) /* connect to properties interface */ wakeups->priv->prop_proxy = dbus_g_proxy_new_for_name (wakeups->priv->bus, - "org.freedesktop.DeviceKit.Power", - "/org/freedesktop/DeviceKit/Power/Wakeups", + "org.freedesktop.UPower", + "/org/freedesktop/UPower/Wakeups", "org.freedesktop.DBus.Properties"); if (wakeups->priv->prop_proxy == NULL) { g_warning ("Couldn't connect to proxy"); @@ -296,9 +296,9 @@ dkp_wakeups_init (DkpWakeups *wakeups) /* connect to main interface */ wakeups->priv->proxy = dbus_g_proxy_new_for_name (wakeups->priv->bus, - "org.freedesktop.DeviceKit.Power", - "/org/freedesktop/DeviceKit/Power/Wakeups", - "org.freedesktop.DeviceKit.Power.Wakeups"); + "org.freedesktop.UPower", + "/org/freedesktop/UPower/Wakeups", + "org.freedesktop.UPower.Wakeups"); if (wakeups->priv->proxy == NULL) { g_warning ("Couldn't connect to proxy"); goto out; diff --git a/doc/Makefile.am b/doc/Makefile.am index 94b5b23..5c31452 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,9 +52,9 @@ content_files = \ man/devkit-power.xml \ man/devkit-power-daemon.xml \ man/DeviceKit-power.xml \ - dbus/org.freedesktop.DeviceKit.Power.ref.xml \ - dbus/org.freedesktop.DeviceKit.Power.Device.ref.xml \ - dbus/org.freedesktop.DeviceKit.Power.QoS.ref.xml \ + dbus/org.freedesktop.UPower.ref.xml \ + dbus/org.freedesktop.UPower.Device.ref.xml \ + dbus/org.freedesktop.UPower.QoS.ref.xml \ $(NULL) # Images to copy into HTML directory diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am index fd9f0c7..78c9aa5 100644 --- a/doc/dbus/Makefile.am +++ b/doc/dbus/Makefile.am @@ -1,19 +1,19 @@ -all : org.freedesktop.DeviceKit.Power.ref.xml org.freedesktop.DeviceKit.Power.Device.ref.xml org.freedesktop.DeviceKit.Power.QoS.ref.xml org.freedesktop.DeviceKit.Power.Wakeups.ref.xml +all : org.freedesktop.UPower.ref.xml org.freedesktop.UPower.Device.ref.xml org.freedesktop.UPower.QoS.ref.xml org.freedesktop.UPower.Wakeups.ref.xml -org.freedesktop.DeviceKit.Power.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl +org.freedesktop.UPower.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ -org.freedesktop.DeviceKit.Power.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl +org.freedesktop.UPower.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ -org.freedesktop.DeviceKit.Power.QoS.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.QoS.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl +org.freedesktop.UPower.QoS.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.QoS.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ -org.freedesktop.DeviceKit.Power.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.Wakeups.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl +org.freedesktop.UPower.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.Wakeups.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ diff --git a/doc/devkit-power-docs.xml b/doc/devkit-power-docs.xml index c052b6b..6a4193b 100644 --- a/doc/devkit-power-docs.xml +++ b/doc/devkit-power-docs.xml @@ -64,9 +64,9 @@ DeviceKit-power daemon. </para> </partintro> - <xi:include href="dbus/org.freedesktop.DeviceKit.Power.ref.xml"/> - <xi:include href="dbus/org.freedesktop.DeviceKit.Power.Device.ref.xml"/> - <xi:include href="dbus/org.freedesktop.DeviceKit.Power.QoS.ref.xml"/> + <xi:include href="dbus/org.freedesktop.UPower.ref.xml"/> + <xi:include href="dbus/org.freedesktop.UPower.Device.ref.xml"/> + <xi:include href="dbus/org.freedesktop.UPower.QoS.ref.xml"/> </reference> <reference id="tools-fileformats"> diff --git a/doc/man/DeviceKit-power.xml b/doc/man/DeviceKit-power.xml index f402c87..808faf9 100644 --- a/doc/man/DeviceKit-power.xml +++ b/doc/man/DeviceKit-power.xml @@ -21,7 +21,7 @@ DeviceKit-power provides an interface to enumerate power sources on the system and control system-wide power management. Any application can access - the <emphasis>org.freedesktop.DeviceKit.Power</emphasis> service + the <emphasis>org.freedesktop.UPower</emphasis> service on the system message bus. Some operations (such as suspending the system) is restricted using PolicyKit. </para> diff --git a/doc/man/devkit-power-daemon.xml b/doc/man/devkit-power-daemon.xml index 1077436..d672348 100644 --- a/doc/man/devkit-power-daemon.xml +++ b/doc/man/devkit-power-daemon.xml @@ -27,11 +27,11 @@ <refsect1><title>DESCRIPTION</title> <para> <emphasis><refentrytitle>devkit-power-daemon</refentrytitle></emphasis> provides - the <emphasis>org.freedesktop.DeviceKit.Power</emphasis> service on the + the <emphasis>org.freedesktop.UPower</emphasis> service on the system message bus. Users or administrators should never need to start this daemon as it will be automatically started by <citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry> - whenever an application calls into the <emphasis>org.freedesktop.DeviceKit.Power</emphasis> + whenever an application calls into the <emphasis>org.freedesktop.UPower</emphasis> service. </para> </refsect1> diff --git a/src/Makefile.am b/src/Makefile.am index 94d0afc..8d27526 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,26 +44,26 @@ up-marshal.h: up-marshal.list up-marshal.c: up-marshal.list echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=up_marshal --body >> $@ -up-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am - dbus-binding-tool --prefix=up_daemon --mode=glib-server --output=up-daemon-glue.h org.freedesktop.DeviceKit.Power.xml +up-daemon-glue.h: org.freedesktop.UPower.xml Makefile.am + dbus-binding-tool --prefix=up_daemon --mode=glib-server --output=up-daemon-glue.h org.freedesktop.UPower.xml -up-device-glue.h: org.freedesktop.DeviceKit.Power.Device.xml Makefile.am - dbus-binding-tool --prefix=up_device --mode=glib-server --output=up-device-glue.h org.freedesktop.DeviceKit.Power.Device.xml +up-device-glue.h: org.freedesktop.UPower.Device.xml Makefile.am + dbus-binding-tool --prefix=up_device --mode=glib-server --output=up-device-glue.h org.freedesktop.UPower.Device.xml -up-qos-glue.h: org.freedesktop.DeviceKit.Power.QoS.xml Makefile.am - dbus-binding-tool --prefix=up_qos --mode=glib-server --output=up-qos-glue.h org.freedesktop.DeviceKit.Power.QoS.xml +up-qos-glue.h: org.freedesktop.UPower.QoS.xml Makefile.am + dbus-binding-tool --prefix=up_qos --mode=glib-server --output=up-qos-glue.h org.freedesktop.UPower.QoS.xml -up-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am - dbus-binding-tool --prefix=up_wakeups --mode=glib-server --output=up-wakeups-glue.h org.freedesktop.DeviceKit.Power.Wakeups.xml +up-wakeups-glue.h: org.freedesktop.UPower.Wakeups.xml Makefile.am + dbus-binding-tool --prefix=up_wakeups --mode=glib-server --output=up-wakeups-glue.h org.freedesktop.UPower.Wakeups.xml libexec_PROGRAMS = devkit-power-daemon dbusifdir = $(datadir)/dbus-1/interfaces dbusif_DATA = \ - org.freedesktop.DeviceKit.Power.xml \ - org.freedesktop.DeviceKit.Power.Device.xml \ - org.freedesktop.DeviceKit.Power.QoS.xml \ - org.freedesktop.DeviceKit.Power.Wakeups.xml + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.Wakeups.xml devkit_power_daemon_SOURCES = \ egg-debug.c \ @@ -165,14 +165,14 @@ TESTS = up-self-test endif servicedir = $(datadir)/dbus-1/system-services -service_in_files = org.freedesktop.DeviceKit.Power.service.in +service_in_files = org.freedesktop.UPower.service.in service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ dbusconfdir = $(sysconfdir)/dbus-1/system.d -dbusconf_in_files = org.freedesktop.DeviceKit.Power.conf.in +dbusconf_in_files = org.freedesktop.UPower.conf.in dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile @@ -186,10 +186,10 @@ install-data-hook: CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - org.freedesktop.DeviceKit.Power.xml \ - org.freedesktop.DeviceKit.Power.Device.xml \ - org.freedesktop.DeviceKit.Power.QoS.xml \ - org.freedesktop.DeviceKit.Power.Wakeups.xml \ + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.Wakeups.xml \ up-marshal.list \ $(service_in_files) \ $(dbusconf_in_files) diff --git a/src/org.freedesktop.DeviceKit.Power.conf.in b/src/org.freedesktop.DeviceKit.Power.conf.in deleted file mode 100644 index 855b4b5..0000000 --- a/src/org.freedesktop.DeviceKit.Power.conf.in +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> - -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <!-- Only root can own the service --> - <policy user="root"> - <allow own="org.freedesktop.DeviceKit.Power"/> - </policy> - <policy context="default"> - - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DBus.Introspectable"/> - - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.freedesktop.DeviceKit.Power.Device" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.freedesktop.DeviceKit.Power.QoS" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.freedesktop.DeviceKit.Power.Wakeups" - send_interface="org.freedesktop.DBus.Properties"/> - - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DeviceKit.Power"/> - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DeviceKit.Power.Device"/> - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DeviceKit.Power.QoS"/> - <allow send_destination="org.freedesktop.DeviceKit.Power" - send_interface="org.freedesktop.DeviceKit.Power.Wakeups"/> - </policy> -</busconfig> diff --git a/src/org.freedesktop.DeviceKit.Power.Device.xml b/src/org.freedesktop.UPower.Device.xml index a73504d..17bc2c8 100644 --- a/src/org.freedesktop.DeviceKit.Power.Device.xml +++ b/src/org.freedesktop.UPower.Device.xml @@ -1,18 +1,18 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [ - <!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Power.Device.GeneralError"> + <!ENTITY ERROR_GENERAL "org.freedesktop.UPower.Device.GeneralError"> ]> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> - <interface name="org.freedesktop.DeviceKit.Power.Device"> + <interface name="org.freedesktop.UPower.Device"> <doc:doc> <doc:description> <doc:para> Objects implementing this interface are usually discovered through - the <doc:tt>org.freedesktop.DeviceKit.Power</doc:tt> interface on - the <doc:tt>/org/freedesktop/DeviceKit/Power</doc:tt> object on + the <doc:tt>org.freedesktop.UPower</doc:tt> interface on + the <doc:tt>/org/freedesktop/UPower</doc:tt> object on the D-Bus system bus service with the well-known - name <doc:tt>org.freedesktop.DeviceKit.Power</doc:tt> using + name <doc:tt>org.freedesktop.UPower</doc:tt> using the <doc:ref type="method" to="Power.EnumerateDevices">EnumerateDevices</doc:ref> method. @@ -22,10 +22,10 @@ <doc:code> $ dbus-send --print-reply \ --system \ - --dest=org.freedesktop.DeviceKit.Power \ - /org/freedesktop/DeviceKit/Power/devices/battery_BAT0 \ + --dest=org.freedesktop.UPower \ + /org/freedesktop/UPower/devices/battery_BAT0 \ org.freedesktop.DBus.Properties.GetAll \ - string:org.freedesktop.DeviceKit.Power.Device + string:org.freedesktop.UPower.Device method return sender=:1.386 -> dest=:1.477 reply_serial=2 array [ diff --git a/src/org.freedesktop.DeviceKit.Power.QoS.xml b/src/org.freedesktop.UPower.QoS.xml index 716eb06..0df7a14 100644 --- a/src/org.freedesktop.DeviceKit.Power.QoS.xml +++ b/src/org.freedesktop.UPower.QoS.xml @@ -1,14 +1,14 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [ - <!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Power.GeneralError"> + <!ENTITY ERROR_GENERAL "org.freedesktop.UPower.GeneralError"> ]> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> - <interface name="org.freedesktop.DeviceKit.Power.QoS"> + <interface name="org.freedesktop.UPower.QoS"> <doc:doc> <doc:description> <doc:para> - org.freedesktop.DeviceKit.Power.QoS is a DBus interface implimented + org.freedesktop.UPower.QoS is a DBus interface implimented by DeviceKit-power. It allows applications to request latencies, for example a couple of seconds for an IM application, or a few hundred microseconds for a multiplayer game. diff --git a/src/org.freedesktop.DeviceKit.Power.Wakeups.xml b/src/org.freedesktop.UPower.Wakeups.xml index 27fa662..59013e9 100644 --- a/src/org.freedesktop.DeviceKit.Power.Wakeups.xml +++ b/src/org.freedesktop.UPower.Wakeups.xml @@ -1,14 +1,14 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [ - <!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Power.GeneralError"> + <!ENTITY ERROR_GENERAL "org.freedesktop.UPower.GeneralError"> ]> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> - <interface name="org.freedesktop.DeviceKit.Power.Wakeups"> + <interface name="org.freedesktop.UPower.Wakeups"> <doc:doc> <doc:description> <doc:para> - org.freedesktop.DeviceKit.Power.Wakeups is a DBus interface implimented + org.freedesktop.UPower.Wakeups is a DBus interface implimented by DeviceKit-power. It allows applications to watch what applications and drivers are causing the wakeups on the system. diff --git a/src/org.freedesktop.UPower.conf.in b/src/org.freedesktop.UPower.conf.in new file mode 100644 index 0000000..26fbb33 --- /dev/null +++ b/src/org.freedesktop.UPower.conf.in @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> + +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Only root can own the service --> + <policy user="root"> + <allow own="org.freedesktop.UPower"/> + </policy> + <policy context="default"> + + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.DBus.Introspectable"/> + + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.DBus.Properties"/> + <allow send_destination="org.freedesktop.UPower.Device" + send_interface="org.freedesktop.DBus.Properties"/> + <allow send_destination="org.freedesktop.UPower.QoS" + send_interface="org.freedesktop.DBus.Properties"/> + <allow send_destination="org.freedesktop.UPower.Wakeups" + send_interface="org.freedesktop.DBus.Properties"/> + + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.UPower"/> + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.UPower.Device"/> + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.UPower.QoS"/> + <allow send_destination="org.freedesktop.UPower" + send_interface="org.freedesktop.UPower.Wakeups"/> + </policy> +</busconfig> diff --git a/src/org.freedesktop.DeviceKit.Power.service.in b/src/org.freedesktop.UPower.service.in index 3b3480b..c15d799 100644 --- a/src/org.freedesktop.DeviceKit.Power.service.in +++ b/src/org.freedesktop.UPower.service.in @@ -1,5 +1,5 @@ [D-BUS Service] -Name=org.freedesktop.DeviceKit.Power +Name=org.freedesktop.UPower Exec=@libexecdir@/devkit-power-daemon User=root diff --git a/src/org.freedesktop.DeviceKit.Power.xml b/src/org.freedesktop.UPower.xml index 001cf9c..ca8d63c 100644 --- a/src/org.freedesktop.DeviceKit.Power.xml +++ b/src/org.freedesktop.UPower.xml @@ -3,30 +3,30 @@ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> - <interface name="org.freedesktop.DeviceKit.Power"> + <interface name="org.freedesktop.UPower"> <doc:doc> <doc:description> <doc:para> The DeviceKit-power service is available via the system message bus. To access the service, use - the <doc:tt>org.freedesktop.DeviceKit.Power</doc:tt> interface on - the <doc:tt>/org/freedesktop/DeviceKit/Power</doc:tt> object on + the <doc:tt>org.freedesktop.UPower</doc:tt> interface on + the <doc:tt>/org/freedesktop/UPower</doc:tt> object on the D-Bus system bus service with the well-known - name <doc:tt>org.freedesktop.DeviceKit.Power</doc:tt>. + name <doc:tt>org.freedesktop.UPower</doc:tt>. </doc:para> <doc:para> <doc:example language="shell" title="simple example"> <doc:code> $ dbus-send --print-reply \ --system \ - --dest=org.freedesktop.DeviceKit.Power \ - /org/freedesktop/DeviceKit/Power \ - org.freedesktop.DeviceKit.Power.EnumerateDevices + --dest=org.freedesktop.UPower \ + /org/freedesktop/UPower \ + org.freedesktop.UPower.EnumerateDevices method return sender=:1.386 -> dest=:1.451 reply_serial=2 array [ - object path "/org/freedesktop/DeviceKit/Power/devices/line_power_AC" - object path "/org/freedesktop/DeviceKit/Power/devices/battery_BAT0" + object path "/org/freedesktop/UPower/devices/line_power_AC" + object path "/org/freedesktop/UPower/devices/battery_BAT0" ] </doc:code> </doc:example> diff --git a/src/up-daemon.c b/src/up-daemon.c index c91abba..f678c13 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -633,7 +633,7 @@ up_daemon_register_power_daemon (UpDaemon *daemon) /* register GObject */ dbus_g_connection_register_g_object (daemon->priv->connection, - "/org/freedesktop/DeviceKit/Power", + "/org/freedesktop/UPower", G_OBJECT (daemon)); /* success */ diff --git a/src/up-device.c b/src/up-device.c index 9f810d1..7dad441 100644 --- a/src/up-device.c +++ b/src/up-device.c @@ -809,7 +809,7 @@ up_device_compute_object_path (UpDevice *device) if (id[i] == ':') id[i] = 'o'; } - object_path = g_build_filename ("/org/freedesktop/DeviceKit/Power/devices", id, NULL); + object_path = g_build_filename ("/org/freedesktop/UPower/devices", id, NULL); g_free (basename); g_free (id); diff --git a/src/up-main.c b/src/up-main.c index de44357..85f1c9a 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -42,7 +42,7 @@ #include "up-qos.h" #include "up-wakeups.h" -#define DEVKIT_POWER_SERVICE_NAME "org.freedesktop.DeviceKit.Power" +#define DEVKIT_POWER_SERVICE_NAME "org.freedesktop.UPower" static GMainLoop *loop = NULL; /** diff --git a/src/up-qos.c b/src/up-qos.c index 9d75d11..4e282d7 100644 --- a/src/up-qos.c +++ b/src/up-qos.c @@ -582,7 +582,7 @@ up_qos_init (UpQos *qos) } /* register on the bus */ - dbus_g_connection_register_g_object (qos->priv->connection, "/org/freedesktop/DeviceKit/Power/Policy", G_OBJECT (qos)); + dbus_g_connection_register_g_object (qos->priv->connection, "/org/freedesktop/UPower/Policy", G_OBJECT (qos)); /* watch NOC */ qos->priv->proxy = dbus_g_proxy_new_for_name_owner (qos->priv->connection, DBUS_SERVICE_DBUS, diff --git a/src/up-wakeups.c b/src/up-wakeups.c index f649352..ebf02de 100644 --- a/src/up-wakeups.c +++ b/src/up-wakeups.c @@ -739,7 +739,7 @@ up_wakeups_init (UpWakeups *wakeups) } /* register on the bus */ - dbus_g_connection_register_g_object (wakeups->priv->connection, "/org/freedesktop/DeviceKit/Power/Wakeups", G_OBJECT (wakeups)); + dbus_g_connection_register_g_object (wakeups->priv->connection, "/org/freedesktop/UPower/Wakeups", G_OBJECT (wakeups)); } /** diff --git a/tools/Makefile.am b/tools/Makefile.am index 35d3781..554ebae 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,8 +33,8 @@ up-marshal.h: $(top_srcdir)/src/up-marshal.list up-marshal.c: $(top_srcdir)/src/up-marshal.list echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@ -up-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml Makefile.am - dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-client --output=up-daemon-glue.h $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml +up-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.UPower.xml Makefile.am + dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-client --output=up-daemon-glue.h $(top_srcdir)/src/org.freedesktop.UPower.xml bin_PROGRAMS = devkit-power |