Application Menu Indicator

Merge lp:~ted/indicator-appmenu/com-canonical into lp:indicator-appmenu/0.3

  1. com-canonical
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 87
Proposed branch: lp:~ted/indicator-appmenu/com-canonical
Merge into: lp:indicator-appmenu/0.3
Diff against target: 142 lines (+23/-23)
6 files modified
src/application-menu-registrar.xml (+6/-6)
src/application-menu-renderer.xml (+6/-6)
src/clean-namespaces.xslt (+1/-1)
src/dbus-shared.h (+7/-7)
src/indicator-appmenu.c (+2/-2)
tools/current-menu (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-appmenu/com-canonical
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+46226@code.launchpad.net

Description of the change

Changing from ayatana.org to canonical.com

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:47:10 +0000
@@ -1,15 +1,15 @@
1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">2<node xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
3 <dox:d><![CDATA[3 <dox:d><![CDATA[
4 @mainpage4 @mainpage
5  5  
6 An interface to register menus that are associated with a window in an application.  The6 An interface to register menus that are associated with a window in an application.  The
7 main interface is docuemented here: @ref org::ayatana::AppMenu::Registrar.7 main interface is docuemented here: @ref com::canonical::AppMenu::Registrar.
8     8     
9 The actual menus are transported using the dbusmenu protocol which is available9 The actual menus are transported using the dbusmenu protocol which is available
10 here: @ref org::ayatana::dbusmenu.10 here: @ref com::canonical::dbusmenu.
11 ]]></dox:d>11 ]]></dox:d>
12 <interface name="org.ayatana.AppMenu.Registrar">12 <interface name="com.canonical.AppMenu.Registrar">
13 <dox:d>13 <dox:d>
14 An interface to register a menu from an application's window to be displayed in another14 An interface to register a menu from an application's window to be displayed in another
15 window.  This manages that association between XWindow Window IDs and the dbus15 window.  This manages that association between XWindow Window IDs and the dbus
@@ -50,7 +50,7 @@
50 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>50 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
51 </arg>51 </arg>
52 <arg name="menuObjectPath" type="o" direction="out">52 <arg name="menuObjectPath" type="o" direction="out">
53 <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>53 <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
54 </arg>54 </arg>
55 </method>55 </method>
56 <method name="GetMenus">56 <method name="GetMenus">
@@ -70,7 +70,7 @@
70 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>70 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
71 </arg>71 </arg>
72 <arg name="menuObjectPath" type="o" direction="out">72 <arg name="menuObjectPath" type="o" direction="out">
73 <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>73 <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
74 </arg>74 </arg>
75 </signal>75 </signal>
76 <signal name="WindowUnregistered">76 <signal name="WindowUnregistered">
7777
=== 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:47:10 +0000
@@ -1,18 +1,18 @@
1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2<node name="/org/ayatana/AppMenu/Renderer" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">2<node name="/com/canonical/AppMenu/Renderer" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
3 <dox:d><![CDATA[3 <dox:d><![CDATA[
4 @mainpage4 @mainpage
5  5  
6 A representation of the process used to render a menu into something visible6 A representation of the process used to render a menu into something visible
7 to the user. Many times this will be combined with a Registrar7 to the user. Many times this will be combined with a Registrar
8 (@ref org::ayatana::AppMenu::Registrar) but that is not required. The interface8 (@ref com::canonical::AppMenu::Registrar) but that is not required. The interface
9 implemented by the Renderer is here: @ref org::ayatana::AppMenu::Registrar and9 implemented by the Renderer is here: @ref com::canonical::AppMenu::Registrar and
10 used mostly for debugging the status of and testing the renderers.10 used mostly for debugging the status of and testing the renderers.
11     11     
12 The actual menus are transported using the dbusmenu protocol which is available12 The actual menus are transported using the dbusmenu protocol which is available
13 here: @ref org::ayatana::dbusmenu.13 here: @ref com::canonical::dbusmenu.
14 ]]></dox:d>14 ]]></dox:d>
15 <interface name="org.ayatana.AppMenu.Renderer">15 <interface name="com.canonical.AppMenu.Renderer">
16 <dox:d>16 <dox:d>
17 An interface to register a menu from an application's window to be displayed in another17 An interface to register a menu from an application's window to be displayed in another
18 window.  This manages that association between XWindow Window IDs and the dbus18 window.  This manages that association between XWindow Window IDs and the dbus
@@ -24,7 +24,7 @@
24 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>24 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
25 </arg>25 </arg>
26 <arg name="menuObjectPath" type="o" direction="out">26 <arg name="menuObjectPath" type="o" direction="out">
27 <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>27 <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
28 </arg>28 </arg>
29 </method>29 </method>
30 <method name="ActivateMenuItem">30 <method name="ActivateMenuItem">
3131
=== 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:47:10 +0000
@@ -1,4 +1,4 @@
1<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">1<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
2 <xsl:template match="*|@*">2 <xsl:template match="*|@*">
3 <xsl:copy>3 <xsl:copy>
4 <xsl:apply-templates select="*|@*" />4 <xsl:apply-templates select="*|@*" />
55
=== 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:47:10 +0000
@@ -20,11 +20,11 @@
20*/20*/
2121
2222
23#define DBUS_NAME "org.ayatana.AppMenu.Registrar"23#define DBUS_NAME "com.canonical.AppMenu.Registrar"
2424
25#define REG_IFACE "org.ayatana.AppMenu.Registrar"25#define REG_IFACE "com.canonical.AppMenu.Registrar"
26#define REG_OBJECT "/org/ayatana/AppMenu/Registrar"26#define REG_OBJECT "/com/canonical/AppMenu/Registrar"
2727
28#define DEBUG_IFACE "org.ayatana.AppMenu.Renderer"28#define DEBUG_IFACE "com.canonical.AppMenu.Renderer"
29#define DEBUG_OBJECT "/org/ayatana/AppMenu/Renderer"29#define DEBUG_OBJECT "/com/canonical/AppMenu/Renderer"
3030
3131
=== 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:47:10 +0000
@@ -1338,7 +1338,7 @@
13381338
1339 if (error != NULL) {1339 if (error != NULL) {
1340 g_dbus_method_invocation_return_dbus_error(invocation,1340 g_dbus_method_invocation_return_dbus_error(invocation,
1341 "org.ayatana.AppMenu.Error",1341 "com.canonical.AppMenu.Error",
1342 error->message);1342 error->message);
1343 g_error_free(error);1343 g_error_free(error);
1344 } else {1344 } else {
@@ -1732,7 +1732,7 @@
17321732
1733 if (error != NULL) {1733 if (error != NULL) {
1734 g_dbus_method_invocation_return_dbus_error(invocation,1734 g_dbus_method_invocation_return_dbus_error(invocation,
1735 "org.ayatana.AppMenu.Error",1735 "com.canonical.AppMenu.Error",
1736 error->message);1736 error->message);
1737 g_error_free(error);1737 g_error_free(error);
1738 } else {1738 } else {
17391739
=== modified file 'tools/current-menu'
--- tools/current-menu 2010-06-02 17:50:51 +0000
+++ tools/current-menu 2011-01-14 04:47:10 +0000
@@ -1,3 +1,3 @@
1#!/bin/sh1#!/bin/sh
22
3dbus-send --session --dest=org.ayatana.WindowMenu.Registrar --print-reply /org/ayatana/AppMenu/Debug org.ayatana.AppMenu.Debug.CurrentMenu3dbus-send --session --dest=com.canonical.WindowMenu.Registrar --print-reply /com/canonical/AppMenu/Debug com.canonical.AppMenu.Debug.CurrentMenu

Subscribers

People subscribed via source and target branches