[gnome-mag/bonobo-less: 2/6] remove freedesktop from object name and path

[Fernando Herrera de las Heras <fherrera src gnome org>]

commit 91d01b94cb9c5dc2bff688d7cbca207a25b69079
Author: Fernando Herrera <fherrera onirica com>
Date:   Fri Jun 25 18:05:32 2010 +0200

    remove freedesktop from object name and path

 magnifier/Makefile.am                              |    4 ++--
 ...r.service.in => org.gnome.Magnifier.service.in} |    2 +-
 test/mag-test.c                                    |   10 +++++-----
 xml/Magnifier.xml                                  |    4 ++--
 xml/Makefile.am                                    |    4 ++--
 ...gnome.Magnifier.xml => org.gnome.Magnifier.xml} |    8 ++++----
 ...ome.ZoomRegion.xml => org.gnome.ZoomRegion.xml} |    8 ++++----
 7 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/magnifier/Makefile.am b/magnifier/Makefile.am
index 4d75820..1c94801 100644
--- a/magnifier/Makefile.am
+++ b/magnifier/Makefile.am
@@ -35,13 +35,13 @@ INCLUDES = \
 LDADD = $(DEPS_LIBS) $(X_LIBS) $(COLORBLIND_LIBS)
 
 servicedir	= $(datadir)/dbus-1/services
-service_in_files= org.freedesktop.gnome.Magnifier.service.in
+service_in_files= org.gnome.Magnifier.service.in
 service_DATA	= $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@
 
-DISTCLEANFILES = org.freedesktop.gnome.Magnifier.service
+DISTCLEANFILES = org.gnome.Magnifier.service
 
 EXTRA_DIST = $(service_in_files)
 
diff --git a/magnifier/org.freedesktop.gnome.Magnifier.service.in b/magnifier/org.gnome.Magnifier.service.in
similarity index 51%
rename from magnifier/org.freedesktop.gnome.Magnifier.service.in
rename to magnifier/org.gnome.Magnifier.service.in
index 6fdcf0a..244d0b9 100644
--- a/magnifier/org.freedesktop.gnome.Magnifier.service.in
+++ b/magnifier/org.gnome.Magnifier.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.gnome.Magnifier
+Name=org.gnome.Magnifier
 Exec= BINDIR@/magnifier
diff --git a/test/mag-test.c b/test/mag-test.c
index 036ce75..a06c602 100644
--- a/test/mag-test.c
+++ b/test/mag-test.c
@@ -105,9 +105,9 @@ test_new_region (GDBusProxy *magnifier,
 	zoomer = g_dbus_proxy_new_sync (g_dbus_proxy_get_connection (magnifier),
 					G_DBUS_PROXY_FLAGS_NONE,
 					NULL,
-					"org.freedesktop.gnome.Magnifier.ZoomRegion",
+					"org.gnome.Magnifier.ZoomRegion",
 					zoomer_object_path,
-					"org.freedesktop.gnome.Magnifier.ZoomRegion",
+					"org.gnome.Magnifier.ZoomRegion",
 					NULL, &error);
 	g_variant_unref (result);
 	if (!zoomer) {
@@ -162,9 +162,9 @@ int main(int argc, char ** argv)
 	magnifier = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
 						   G_DBUS_PROXY_FLAGS_NONE,
 						   NULL,
-						   "org.freedesktop.gnome.Magnifier",
-						   "/org/freedesktop/gnome/Magnifier",
-						   "org.freedesktop.gnome.Magnifier",
+						   "org.gnome.Magnifier",
+						   "/org/gnome/Magnifier",
+						   "org.gnome.Magnifier",
 						   NULL, &error);
 	if (!magnifier) {
 		g_printerr ("Error creating magnifier proxy: %s\n", error->message);
diff --git a/xml/Magnifier.xml b/xml/Magnifier.xml
index c8f6458..56794e2 100755
--- a/xml/Magnifier.xml
+++ b/xml/Magnifier.xml
@@ -8,8 +8,8 @@
   Gnome Magnifier Interfaces and Subinterfaces
 </tp:docstring>
 
-<xi:include href="org.freedesktop.gnome.Magnifier.xml" />
-<xi:include href="org.freedesktop.gnome.ZoomRegion.xml" />
+<xi:include href="org.gnome.Magnifier.xml" />
+<xi:include href="org.gnome.ZoomRegion.xml" />
 
 </tp:spec>
 
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 20b0e6f..5d1b420 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,7 +1,7 @@
 XML_SPEC= \
 	Magnifier.xml \
-	org.freedesktop.gnome.Magnifier.xml \
-	org.freedesktop.gnome.ZoomRegion.xml
+	org.gnome.Magnifier.xml \
+	org.gnome.ZoomRegion.xml
 
 spec.xml: $(XML_SPEC)
 	xsltproc --xinclude $(top_srcdir)/tools/identity.xsl $< >$@
diff --git a/xml/org.freedesktop.gnome.Magnifier.xml b/xml/org.gnome.Magnifier.xml
similarity index 98%
rename from xml/org.freedesktop.gnome.Magnifier.xml
rename to xml/org.gnome.Magnifier.xml
index fa1bb2c..6874707 100755
--- a/xml/org.freedesktop.gnome.Magnifier.xml
+++ b/xml/org.gnome.Magnifier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"; name="/org/freedesktop/gnome/Magnifier">
-  <interface name="org.freedesktop.gnome.Magnifier">
+<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"; name="/org/gnome/Magnifier">
+  <interface name="org.gnome.Magnifier">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml";>
       <p>
         Properties and methods of Magnifier instance.
@@ -361,5 +361,5 @@
       </arg>
     </method>
        
-  </interface>  <!-- org.freedesktop.gnome.Magnifier -->
-</node>         <!-- /org/freedesktop/gnome/Magnifier -->
+  </interface>  <!-- org.gnome.Magnifier -->
+</node>         <!-- /org/gnome/Magnifier -->
diff --git a/xml/org.freedesktop.gnome.ZoomRegion.xml b/xml/org.gnome.ZoomRegion.xml
similarity index 98%
rename from xml/org.freedesktop.gnome.ZoomRegion.xml
rename to xml/org.gnome.ZoomRegion.xml
index 38f3aa0..68377d9 100755
--- a/xml/org.freedesktop.gnome.ZoomRegion.xml
+++ b/xml/org.gnome.ZoomRegion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"; name="/org/freedesktop/gnome/Magnifier/ZoomRegion">
+<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"; name="/org/gnome/Magnifier/ZoomRegion">
   <!-- Structures and enums for the Magnifier's ZoomRegion object -->
 
   <!-- struct Point -->
@@ -49,7 +49,7 @@
   </tp:enum>
 
   <!-- ZoomRegion object -->
-  <interface name="org.freedesktop.gnome.Magnifier.ZoomRegion">
+  <interface name="org.gnome.Magnifier.ZoomRegion">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml";>
       <p>
         Properties and methods of the Magnifier's ZoomRegion object
@@ -698,5 +698,5 @@
       </arg>
     </method>
     
-  </interface>  <!-- org.freedesktop.gnome.Magnifier.ZoomRegion -->
-</node>         <!-- /org/freedesktop/gnome/Magnifier/ZoomRegion -->
+  </interface>  <!-- org.gnome.Magnifier.ZoomRegion -->
+</node>         <!-- /org/gnome/Magnifier/ZoomRegion -->