Ted Gould has proposed merging lp:~ted/indicator-appmenu/com-canonical into lp:indicator-appmenu.
Requested reviews: Indicator Applet Developers (indicator-applet-developers) For more details, see: https://code.launchpad.net/~ted/indicator-appmenu/com-canonical/+merge/46226 Changing from ayatana.org to canonical.com -- https://code.launchpad.net/~ted/indicator-appmenu/com-canonical/+merge/46226 Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.
=== modified file 'src/application-menu-registrar.xml' --- src/application-menu-registrar.xml 2010-07-20 21:45:24 +0000 +++ src/application-menu-registrar.xml 2011-01-14 04:46:53 +0000 @@ -1,15 +1,15 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> -<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd";> +<node xmlns:dox="http://www.canonical.com/dbus/dox.dtd";> <dox:d><![CDATA[ @mainpage  An interface to register menus that are associated with a window in an application. The - main interface is docuemented here: @ref org::ayatana::AppMenu::Registrar. + main interface is docuemented here: @ref com::canonical::AppMenu::Registrar.     The actual menus are transported using the dbusmenu protocol which is available - here: @ref org::ayatana::dbusmenu. + here: @ref com::canonical::dbusmenu. ]]></dox:d> - <interface name="org.ayatana.AppMenu.Registrar"> + <interface name="com.canonical.AppMenu.Registrar"> <dox:d> An interface to register a menu from an application's window to be displayed in another window. This manages that association between XWindow Window IDs and the dbus @@ -50,7 +50,7 @@ <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d> </arg> <arg name="menuObjectPath" type="o" direction="out"> - <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d> + <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d> </arg> </method> <method name="GetMenus"> @@ -70,7 +70,7 @@ <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d> </arg> <arg name="menuObjectPath" type="o" direction="out"> - <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d> + <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d> </arg> </signal> <signal name="WindowUnregistered"> === modified file 'src/application-menu-renderer.xml' --- src/application-menu-renderer.xml 2011-01-12 21:01:59 +0000 +++ src/application-menu-renderer.xml 2011-01-14 04:46:53 +0000 @@ -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";> -<node name="/org/ayatana/AppMenu/Renderer" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd";> +<node name="/com/canonical/AppMenu/Renderer" xmlns:dox="http://www.canonical.com/dbus/dox.dtd";> <dox:d><![CDATA[ @mainpage  A representation of the process used to render a menu into something visible to the user. Many times this will be combined with a Registrar - (@ref org::ayatana::AppMenu::Registrar) but that is not required. The interface - implemented by the Renderer is here: @ref org::ayatana::AppMenu::Registrar and + (@ref com::canonical::AppMenu::Registrar) but that is not required. The interface + implemented by the Renderer is here: @ref com::canonical::AppMenu::Registrar and used mostly for debugging the status of and testing the renderers.     The actual menus are transported using the dbusmenu protocol which is available - here: @ref org::ayatana::dbusmenu. + here: @ref com::canonical::dbusmenu. ]]></dox:d> - <interface name="org.ayatana.AppMenu.Renderer"> + <interface name="com.canonical.AppMenu.Renderer"> <dox:d> An interface to register a menu from an application's window to be displayed in another window. This manages that association between XWindow Window IDs and the dbus @@ -24,7 +24,7 @@ <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d> </arg> <arg name="menuObjectPath" type="o" direction="out"> - <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d> + <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d> </arg> </method> <method name="ActivateMenuItem"> === modified file 'src/clean-namespaces.xslt' --- src/clean-namespaces.xslt 2011-01-12 21:01:59 +0000 +++ src/clean-namespaces.xslt 2011-01-14 04:46:53 +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 'src/dbus-shared.h' --- src/dbus-shared.h 2010-07-15 18:30:23 +0000 +++ src/dbus-shared.h 2011-01-14 04:46:53 +0000 @@ -20,11 +20,11 @@ */ -#define DBUS_NAME "org.ayatana.AppMenu.Registrar" - -#define REG_IFACE "org.ayatana.AppMenu.Registrar" -#define REG_OBJECT "/org/ayatana/AppMenu/Registrar" - -#define DEBUG_IFACE "org.ayatana.AppMenu.Renderer" -#define DEBUG_OBJECT "/org/ayatana/AppMenu/Renderer" +#define DBUS_NAME "com.canonical.AppMenu.Registrar" + +#define REG_IFACE "com.canonical.AppMenu.Registrar" +#define REG_OBJECT "/com/canonical/AppMenu/Registrar" + +#define DEBUG_IFACE "com.canonical.AppMenu.Renderer" +#define DEBUG_OBJECT "/com/canonical/AppMenu/Renderer" === modified file 'src/indicator-appmenu.c' --- src/indicator-appmenu.c 2011-01-12 23:59:56 +0000 +++ src/indicator-appmenu.c 2011-01-14 04:46:53 +0000 @@ -1338,7 +1338,7 @@ if (error != NULL) { g_dbus_method_invocation_return_dbus_error(invocation, - "org.ayatana.AppMenu.Error", + "com.canonical.AppMenu.Error", error->message); g_error_free(error); } else { @@ -1732,7 +1732,7 @@ if (error != NULL) { g_dbus_method_invocation_return_dbus_error(invocation, - "org.ayatana.AppMenu.Error", + "com.canonical.AppMenu.Error", error->message); g_error_free(error); } else { === modified file 'tools/current-menu' --- tools/current-menu 2010-06-02 17:50:51 +0000 +++ tools/current-menu 2011-01-14 04:46:53 +0000 @@ -1,3 +1,3 @@ #!/bin/sh -dbus-send --session --dest=org.ayatana.WindowMenu.Registrar --print-reply /org/ayatana/AppMenu/Debug org.ayatana.AppMenu.Debug.CurrentMenu +dbus-send --session --dest=com.canonical.WindowMenu.Registrar --print-reply /com/canonical/AppMenu/Debug com.canonical.AppMenu.Debug.CurrentMenu
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
