ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/dbusmenu/ubuntu-com/+merge/46133
  proposed by: Ted Gould (ted)
------------------------------------------------------------
revno: 179 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2011-01-13 09:57:24 -0600
message:
  Changing namespace from ayatana.org to canonical.com
modified:
  libdbusmenu-glib/clean-namespaces.xslt
  libdbusmenu-glib/client.c
  libdbusmenu-glib/dbus-menu.xml
  libdbusmenu-glib/server.c
  tools/dbusmenu-bench
  tools/dbusmenu-dumper.c


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription

=== modified file 'libdbusmenu-glib/clean-namespaces.xslt'
--- libdbusmenu-glib/clean-namespaces.xslt	2010-11-16 21:14:33 +0000
+++ libdbusmenu-glib/clean-namespaces.xslt	2011-01-13 15:53:15 +0000
@@ -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="*|@*" />

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2010-12-02 02:13:48 +0000
+++ libdbusmenu-glib/client.c	2011-01-13 15:53:15 +0000
@@ -122,7 +122,7 @@
 
 
 #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);

=== modified file 'libdbusmenu-glib/dbus-menu.xml'
--- libdbusmenu-glib/dbus-menu.xml	2010-07-20 13:18:22 +0000
+++ libdbusmenu-glib/dbus-menu.xml	2011-01-13 15:53:15 +0000
@@ -28,15 +28,15 @@
 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.
 

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2010-12-13 13:45:05 +0000
+++ libdbusmenu-glib/server.c	2011-01-13 15:53:15 +0000
@@ -41,7 +41,7 @@
 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 @@
 	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 @@
 
 	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 @@
 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,

=== modified file 'tools/dbusmenu-bench'
--- tools/dbusmenu-bench	2010-02-04 20:03:36 +0000
+++ tools/dbusmenu-bench	2011-01-13 15:53:15 +0000
@@ -35,7 +35,7 @@
 
 import dbus
 
-DBUS_INTERFACE = "org.ayatana.dbusmenu"
+DBUS_INTERFACE = "com.canonical.dbusmenu"
 DBUS_SERVICE = "org.dbusmenu.test"
 DBUS_PATH = "/MenuBar"
 

=== modified file 'tools/dbusmenu-dumper.c'
--- tools/dbusmenu-dumper.c	2010-11-17 17:12:28 +0000
+++ tools/dbusmenu-dumper.c	2011-01-13 15:53:15 +0000
@@ -257,9 +257,9 @@
 	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) {