Rename the DBus service from org.freedesktop.DeviceKit.Power to org.freedesktop.UPower

13 files changed, 81 insertions, 81 deletions

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));
 }
 
 /**