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
1=== modified file 'src/application-menu-registrar.xml'
2--- src/application-menu-registrar.xml 2010-07-20 21:45:24 +0000
3+++ src/application-menu-registrar.xml 2011-01-14 04:47:10 +0000
4@@ -1,15 +1,15 @@
5 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
6-<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
7+<node xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
8 <dox:d><![CDATA[
9 @mainpage
10  
11 An interface to register menus that are associated with a window in an application.  The
12- main interface is docuemented here: @ref org::ayatana::AppMenu::Registrar.
13+ main interface is docuemented here: @ref com::canonical::AppMenu::Registrar.
14     
15 The actual menus are transported using the dbusmenu protocol which is available
16- here: @ref org::ayatana::dbusmenu.
17+ here: @ref com::canonical::dbusmenu.
18 ]]></dox:d>
19- <interface name="org.ayatana.AppMenu.Registrar">
20+ <interface name="com.canonical.AppMenu.Registrar">
21 <dox:d>
22 An interface to register a menu from an application's window to be displayed in another
23 window.  This manages that association between XWindow Window IDs and the dbus
24@@ -50,7 +50,7 @@
25 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
26 </arg>
27 <arg name="menuObjectPath" type="o" direction="out">
28- <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>
29+ <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
30 </arg>
31 </method>
32 <method name="GetMenus">
33@@ -70,7 +70,7 @@
34 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
35 </arg>
36 <arg name="menuObjectPath" type="o" direction="out">
37- <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>
38+ <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
39 </arg>
40 </signal>
41 <signal name="WindowUnregistered">
42
43=== modified file 'src/application-menu-renderer.xml'
44--- src/application-menu-renderer.xml 2011-01-12 21:01:59 +0000
45+++ src/application-menu-renderer.xml 2011-01-14 04:47:10 +0000
46@@ -1,18 +1,18 @@
47 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
48-<node name="/org/ayatana/AppMenu/Renderer" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
49+<node name="/com/canonical/AppMenu/Renderer" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
50 <dox:d><![CDATA[
51 @mainpage
52  
53 A representation of the process used to render a menu into something visible
54 to the user. Many times this will be combined with a Registrar
55- (@ref org::ayatana::AppMenu::Registrar) but that is not required. The interface
56- implemented by the Renderer is here: @ref org::ayatana::AppMenu::Registrar and
57+ (@ref com::canonical::AppMenu::Registrar) but that is not required. The interface
58+ implemented by the Renderer is here: @ref com::canonical::AppMenu::Registrar and
59 used mostly for debugging the status of and testing the renderers.
60     
61 The actual menus are transported using the dbusmenu protocol which is available
62- here: @ref org::ayatana::dbusmenu.
63+ here: @ref com::canonical::dbusmenu.
64 ]]></dox:d>
65- <interface name="org.ayatana.AppMenu.Renderer">
66+ <interface name="com.canonical.AppMenu.Renderer">
67 <dox:d>
68 An interface to register a menu from an application's window to be displayed in another
69 window.  This manages that association between XWindow Window IDs and the dbus
70@@ -24,7 +24,7 @@
71 <dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
72 </arg>
73 <arg name="menuObjectPath" type="o" direction="out">
74- <dox:d>The path to the object which implements the org.ayatana.dbusmenu interface.</dox:d>
75+ <dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
76 </arg>
77 </method>
78 <method name="ActivateMenuItem">
79
80=== modified file 'src/clean-namespaces.xslt'
81--- src/clean-namespaces.xslt 2011-01-12 21:01:59 +0000
82+++ src/clean-namespaces.xslt 2011-01-14 04:47:10 +0000
83@@ -1,4 +1,4 @@
84-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
85+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.canonical.com/dbus/dox.dtd">
86 <xsl:template match="*|@*">
87 <xsl:copy>
88 <xsl:apply-templates select="*|@*" />
89
90=== modified file 'src/dbus-shared.h'
91--- src/dbus-shared.h 2010-07-15 18:30:23 +0000
92+++ src/dbus-shared.h 2011-01-14 04:47:10 +0000
93@@ -20,11 +20,11 @@
94 */
95
96
97-#define DBUS_NAME "org.ayatana.AppMenu.Registrar"
98-
99-#define REG_IFACE "org.ayatana.AppMenu.Registrar"
100-#define REG_OBJECT "/org/ayatana/AppMenu/Registrar"
101-
102-#define DEBUG_IFACE "org.ayatana.AppMenu.Renderer"
103-#define DEBUG_OBJECT "/org/ayatana/AppMenu/Renderer"
104+#define DBUS_NAME "com.canonical.AppMenu.Registrar"
105+
106+#define REG_IFACE "com.canonical.AppMenu.Registrar"
107+#define REG_OBJECT "/com/canonical/AppMenu/Registrar"
108+
109+#define DEBUG_IFACE "com.canonical.AppMenu.Renderer"
110+#define DEBUG_OBJECT "/com/canonical/AppMenu/Renderer"
111
112
113=== modified file 'src/indicator-appmenu.c'
114--- src/indicator-appmenu.c 2011-01-12 23:59:56 +0000
115+++ src/indicator-appmenu.c 2011-01-14 04:47:10 +0000
116@@ -1338,7 +1338,7 @@
117
118 if (error != NULL) {
119 g_dbus_method_invocation_return_dbus_error(invocation,
120- "org.ayatana.AppMenu.Error",
121+ "com.canonical.AppMenu.Error",
122 error->message);
123 g_error_free(error);
124 } else {
125@@ -1732,7 +1732,7 @@
126
127 if (error != NULL) {
128 g_dbus_method_invocation_return_dbus_error(invocation,
129- "org.ayatana.AppMenu.Error",
130+ "com.canonical.AppMenu.Error",
131 error->message);
132 g_error_free(error);
133 } else {
134
135=== modified file 'tools/current-menu'
136--- tools/current-menu 2010-06-02 17:50:51 +0000
137+++ tools/current-menu 2011-01-14 04:47:10 +0000
138@@ -1,3 +1,3 @@
139 #!/bin/sh
140
141-dbus-send --session --dest=org.ayatana.WindowMenu.Registrar --print-reply /org/ayatana/AppMenu/Debug org.ayatana.AppMenu.Debug.CurrentMenu
142+dbus-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