From a8b425c5868c73739f60997ebc2013df3b3d6d4b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 13 Jan 2011 09:53:15 -0600
Subject: Ayatana purge

---
 libdbusmenu-glib/clean-namespaces.xslt | 2 +-
 libdbusmenu-glib/client.c              | 2 +-
 libdbusmenu-glib/dbus-menu.xml         | 6 +++---
 libdbusmenu-glib/server.c              | 8 ++++----
 tools/dbusmenu-bench                   | 2 +-
 tools/dbusmenu-dumper.c                | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libdbusmenu-glib/clean-namespaces.xslt b/libdbusmenu-glib/clean-namespaces.xslt
index 8344a71..8c0c521 100644
--- a/libdbusmenu-glib/clean-namespaces.xslt
+++ b/libdbusmenu-glib/clean-namespaces.xslt
@@ -1,4 +1,4 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
 	<xsl:template match="*|@*">
 		<xsl:copy>
 			<xsl:apply-templates select="*|@*" />
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index a15469b..58d6360 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -122,7 +122,7 @@ struct _event_data_t {
 
 
 #define DBUSMENU_CLIENT_GET_PRIVATE(o) (DBUSMENU_CLIENT(o)->priv)
-#define DBUSMENU_INTERFACE  "org.ayatana.dbusmenu"
+#define DBUSMENU_INTERFACE  "com.canonical.dbusmenu"
 
 /* GObject Stuff */
 static void dbusmenu_client_class_init (DbusmenuClientClass *klass);
diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index 9e8013c..042a24c 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -28,15 +28,15 @@ You should have received a copy of both the GNU Lesser General Public
 License version 3 and version 2.1 along with this program.  If not, see 
 <http://www.gnu.org/licenses/>
 -->
-<node name="/" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+<node name="/" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
     <dox:d><![CDATA[
     @mainpage
 
     The goal of DBusMenu is to expose menus on DBus.
     
-    Main interface is documented here: @ref org::ayatana::dbusmenu
+    Main interface is documented here: @ref com::canonical::dbusmenu
     ]]></dox:d>
-	<interface name="org.ayatana.dbusmenu">
+	<interface name="com.canonical.dbusmenu">
 		<dox:d><![CDATA[
 		A DBus interface to expose menus on DBus.
 
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index d1d82bd..373cc05 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -41,7 +41,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 static void layout_update_signal (DbusmenuServer * server);
 
 #define DBUSMENU_VERSION_NUMBER    2
-#define DBUSMENU_INTERFACE         "org.ayatana.dbusmenu"
+#define DBUSMENU_INTERFACE         "com.canonical.dbusmenu"
 
 /* Privates, I'll show you mine... */
 struct _DbusmenuServerPrivate
@@ -273,7 +273,7 @@ dbusmenu_server_class_init (DbusmenuServerClass *class)
 	g_object_class_install_property (object_class, PROP_DBUS_OBJECT,
 	                                 g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path",
 	                                              "The object that represents this set of menus on DBus",
-	                                              "/org/ayatana/dbusmenu",
+	                                              "/com/canonical/dbusmenu",
 	                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 	g_object_class_install_property (object_class, PROP_ROOT_NODE,
 	                                 g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node",
@@ -1095,7 +1095,7 @@ bus_about_to_show (DbusmenuServer * server, GVariant * params, GDBusMethodInvoca
 
 	Creates a new #DbusmenuServer object with a specific object
 	path on DBus.  If @object is set to NULL the default object
-	name of "/org/ayatana/dbusmenu" will be used.
+	name of "/com/canonical/dbusmenu" will be used.
 
 	Return value: A brand new #DbusmenuServer
 */
@@ -1103,7 +1103,7 @@ DbusmenuServer *
 dbusmenu_server_new (const gchar * object)
 {
 	if (object == NULL) {
-		object = "/org/ayatana/dbusmenu";
+		object = "/com/canonical/dbusmenu";
 	}
 
 	DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER,
diff --git a/tools/dbusmenu-bench b/tools/dbusmenu-bench
index 4b58da8..dcf5f6f 100755
--- a/tools/dbusmenu-bench
+++ b/tools/dbusmenu-bench
@@ -35,7 +35,7 @@ from xml.etree import ElementTree as ET
 
 import dbus
 
-DBUS_INTERFACE = "org.ayatana.dbusmenu"
+DBUS_INTERFACE = "com.canonical.dbusmenu"
 DBUS_SERVICE = "org.dbusmenu.test"
 DBUS_PATH = "/MenuBar"
 
diff --git a/tools/dbusmenu-dumper.c b/tools/dbusmenu-dumper.c
index 4580e4c..bd986e8 100644
--- a/tools/dbusmenu-dumper.c
+++ b/tools/dbusmenu-dumper.c
@@ -257,9 +257,9 @@ init_dbus_vars_from_window(Window window)
 	proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
 	                                       G_DBUS_PROXY_FLAGS_NONE,
 	                                       NULL,
-	                                       "org.ayatana.AppMenu.Registrar",
-	                                       "/org/ayatana/AppMenu/Registrar",
-	                                       "org.ayatana.AppMenu.Registrar",
+	                                       "com.canonical.AppMenu.Registrar",
+	                                       "/com/canonical/AppMenu/Registrar",
+	                                       "com.canonical.AppMenu.Registrar",
 	                                       NULL,
 	                                       &error);
 	if (error != NULL) {
-- 
cgit v1.2.3