DBus Menu

Merge lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1 into lp:~ubuntu-desktop/libdbusmenu/ubuntu

  1. ubuntu-0-1
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 315 lines (+98/-14)
9 files modified
.bzrignore (+2/-0)
configure.ac (+3/-3)
debian/changelog (+16/-0)
libdbusmenu-glib/client.c (+5/-5)
libdbusmenu-glib/dbus-menu.xml (+58/-1)
libdbusmenu-glib/server.c (+3/-3)
libdbusmenu-gtk/client.c (+2/-0)
libdbusmenu-gtk/client.h (+1/-2)
libdbusmenu-gtk/menu.c (+8/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+15975@code.launchpad.net
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 '.bzrignore'
2--- .bzrignore 2009-10-01 15:21:18 +0000
3+++ .bzrignore 2009-12-10 19:00:34 +0000
4@@ -49,3 +49,5 @@
5 tests/test-gtk-reorder-server.c
6 tests/test-gtk-reorder-server
7 tests/test-gtk-reorder
8+libdbusmenu-[0-9].[0-9].[0-9].tar.gz
9+libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
10
11=== modified file 'configure.ac'
12--- configure.ac 2009-10-02 21:51:10 +0000
13+++ configure.ac 2009-12-10 19:00:34 +0000
14@@ -1,11 +1,11 @@
15
16-AC_INIT(libdbusmenu, 0.1.6, ted@canonical.com)
17+AC_INIT(libdbusmenu, 0.1.8, ted@canonical.com)
18 AC_COPYRIGHT([Copyright 2009 Canonical])
19
20 AC_PREREQ(2.53)
21
22 AM_CONFIG_HEADER(config.h)
23-AM_INIT_AUTOMAKE(libdbusmenu, 0.1.6)
24+AM_INIT_AUTOMAKE(libdbusmenu, 0.1.8)
25
26 AM_MAINTAINER_MODE
27
28@@ -66,7 +66,7 @@
29 ###########################
30
31 LIBDBUSMENU_CURRENT=0
32-LIBDBUSMENU_REVISION=6
33+LIBDBUSMENU_REVISION=8
34 LIBDBUSMENU_AGE=0
35
36 AC_SUBST(LIBDBUSMENU_CURRENT)
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2009-10-05 15:06:58 +0000
40+++ debian/changelog 2009-12-10 19:00:34 +0000
41@@ -1,3 +1,19 @@
42+libdbusmenu (0.1.8-0ubuntu1~ppa1) karmic; urgency=low
43+
44+ * Upstream release 0.1.8
45+ * Changing the name to org.ayatana
46+ * Underline fixes
47+ * Documenation of the DBus API
48+
49+ -- Ted Gould <ted@ubuntu.com> Thu, 10 Dec 2009 12:55:07 -0600
50+
51+libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
52+
53+ * Upstream release 0.1.7
54+ * Adding the GPL v3 Copying file so that we're all legal.
55+
56+ -- Ted Gould <ted@ubuntu.com> Mon, 05 Oct 2009 11:32:05 -0400
57+
58 libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low
59
60 * Upstream release 0.1.6 (LP: #442822)
61
62=== modified file 'libdbusmenu-glib/client.c'
63--- libdbusmenu-glib/client.c 2009-10-02 21:31:22 +0000
64+++ libdbusmenu-glib/client.c 2009-12-10 19:00:34 +0000
65@@ -351,7 +351,7 @@
66 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);
67 g_return_if_fail(menuitem != NULL);
68
69- org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
70+ org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
71 return;
72 }
73
74@@ -472,7 +472,7 @@
75 priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
76 priv->dbus_name,
77 priv->dbus_object,
78- "org.freedesktop.dbusmenu",
79+ "org.ayatana.dbusmenu",
80 &error);
81 if (error != NULL) {
82 g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
83@@ -647,7 +647,7 @@
84 menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)
85 {
86 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
87- org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
88+ org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
89 return;
90 }
91
92@@ -689,7 +689,7 @@
93 propdata->item = item;
94 propdata->parent = parent;
95
96- org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
97+ org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
98 } else {
99 g_warning("Unable to allocate memory to get properties for menuitem. This menuitem will never be realized.");
100 }
101@@ -829,7 +829,7 @@
102 update_layout_cb,
103 client,
104 NULL,
105- G_TYPE_STRING, "org.freedesktop.dbusmenu",
106+ G_TYPE_STRING, "org.ayatana.dbusmenu",
107 G_TYPE_STRING, "layout",
108 G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);
109
110
111=== modified file 'libdbusmenu-glib/dbus-menu.xml'
112--- libdbusmenu-glib/dbus-menu.xml 2009-09-21 20:20:45 +0000
113+++ libdbusmenu-glib/dbus-menu.xml 2009-12-10 19:00:34 +0000
114@@ -28,34 +28,91 @@
115 <http://www.gnu.org/licenses/>
116 -->
117 <node name="/">
118- <interface name="org.freedesktop.dbusmenu">
119+ <interface name="org.ayatana.dbusmenu">
120
121 <!-- Properties -->
122+<!--
123+Provides an XML representation of the menu hierarchy
124+
125+XML syntax:
126+
127+<menu id="1" revision="2"> # Root container
128+ <menu id="2" revision="2"> # First level menu, for example "File"
129+ <menu id="3" revision="2"/> ~ Second level menu, for example "Open"
130+ <menu id="4" revision="3"/>
131+ ...
132+ </menu>
133+ <menu id="5" revision="2"> # Another first level menu, say "Edit"
134+ ...
135+ </menu>
136+ ...
137+</menu>
138+-->
139 <property name="layout" type="s" access="read"/>
140
141 <!-- Functions -->
142+
143+<!--
144+Each menu item has a set of properties. Property keys are in menuitem.h:
145+
146+- visible
147+- sensitive
148+- label
149+- icon
150+- icon-data
151+- type
152+
153+"type" property is an enum which can take the following values (client.h):
154+
155+- menuitem
156+- separator
157+- imageitem
158+-->
159 <method name="GetProperty">
160 <arg type="u" name="id" direction="in" />
161 <arg type="s" name="property" direction="in" />
162 <arg type="s" name="value" direction="out" />
163 </method>
164+
165+<!--
166+Convenience method to retrieve all properties in one call (more efficient)
167+-->
168 <method name="GetProperties">
169 <arg type="u" name="id" direction="in" />
170 <arg type="a{ss}" name="properties" direction="out" />
171 </method>
172+
173+<!--
174+This is called by the display to notify the application it should trigger
175+the action associated with a specific menu id
176+-->
177 <method name="Call">
178 <arg type="u" name="id" direction="in" />
179 </method>
180
181 <!-- Signals -->
182+<!--
183+Triggered by the application to notify display that the property prop from menu id
184+as changed to value.
185+-->
186 <signal name="IdPropUpdate">
187 <arg type="u" name="id" direction="out" />
188 <arg type="s" name="prop" direction="out" />
189 <arg type="s" name="value" direction="out" />
190 </signal>
191+
192+<!--
193+Triggered by the application to notify display that all properties of menu id
194+should be considered outdated
195+-->
196 <signal name="IdUpdate">
197 <arg type="u" name="id" direction="out" />
198 </signal>
199+
200+<!--
201+Triggered by the application to notify display of a layout update, up to
202+revision
203+-->
204 <signal name="LayoutUpdate">
205 <arg type="i" name="revision" direction="out" />
206 </signal>
207
208=== modified file 'libdbusmenu-glib/server.c'
209--- libdbusmenu-glib/server.c 2009-09-21 20:01:40 +0000
210+++ libdbusmenu-glib/server.c 2009-12-10 19:00:34 +0000
211@@ -161,7 +161,7 @@
212 g_object_class_install_property (object_class, PROP_DBUS_OBJECT,
213 g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path",
214 "The object that represents this set of menus on DBus",
215- "/org/freedesktop/dbusmenu",
216+ "/org/ayatana/dbusmenu",
217 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
218 g_object_class_install_property (object_class, PROP_ROOT_NODE,
219 g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node",
220@@ -472,7 +472,7 @@
221
222 Creates a new #DbusmenuServer object with a specific object
223 path on DBus. If @object is set to NULL the default object
224- name of "/org/freedesktop/dbusmenu" will be used.
225+ name of "/org/ayatana/dbusmenu" will be used.
226
227 Return value: A brand new #DbusmenuServer
228 */
229@@ -480,7 +480,7 @@
230 dbusmenu_server_new (const gchar * object)
231 {
232 if (object == NULL) {
233- object = "/org/freedesktop/dbusmenu";
234+ object = "/org/ayatana/dbusmenu";
235 }
236
237 DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER,
238
239=== modified file 'libdbusmenu-gtk/client.c'
240--- libdbusmenu-gtk/client.c 2009-10-02 20:01:16 +0000
241+++ libdbusmenu-gtk/client.c 2009-12-10 19:00:34 +0000
242@@ -359,6 +359,7 @@
243
244 GtkMenuItem * gmi;
245 gmi = GTK_MENU_ITEM(gtk_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));
246+ gtk_menu_item_set_use_underline (gmi, TRUE);
247
248 if (gmi != NULL) {
249 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
250@@ -489,6 +490,7 @@
251
252 GtkMenuItem * gmi;
253 gmi = GTK_MENU_ITEM(gtk_image_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));
254+ gtk_menu_item_set_use_underline (gmi, TRUE);
255
256 if (gmi != NULL) {
257 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
258
259=== modified file 'libdbusmenu-gtk/client.h'
260--- libdbusmenu-gtk/client.h 2009-08-26 21:58:46 +0000
261+++ libdbusmenu-gtk/client.h 2009-12-10 19:00:34 +0000
262@@ -29,8 +29,7 @@
263 #ifndef __DBUSMENU_GTKCLIENT_H__
264 #define __DBUSMENU_GTKCLIENT_H__
265
266-#include <glib.h>
267-#include <glib-object.h>
268+#include <gtk/gtk.h>
269 #include <libdbusmenu-glib/client.h>
270
271 G_BEGIN_DECLS
272
273=== modified file 'libdbusmenu-gtk/menu.c'
274--- libdbusmenu-gtk/menu.c 2009-10-02 01:44:05 +0000
275+++ libdbusmenu-gtk/menu.c 2009-12-10 19:00:34 +0000
276@@ -213,7 +213,9 @@
277 static void
278 root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu)
279 {
280+ #ifdef MASSIVEDEBUGGING
281 g_debug("Root new child");
282+ #endif
283 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
284
285 g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu);
286@@ -240,7 +242,9 @@
287 static void
288 root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newposition, guint oldposition, DbusmenuGtkMenu * menu)
289 {
290+ #ifdef MASSIVEDEBUGGING
291 g_debug("Root child moved");
292+ #endif
293 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
294 gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), newposition);
295 return;
296@@ -250,7 +254,9 @@
297 static void
298 root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu)
299 {
300+ #ifdef MASSIVEDEBUGGING
301 g_debug("Root child deleted");
302+ #endif
303 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
304 GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child));
305 if (item != NULL) {
306@@ -268,7 +274,9 @@
307 static void
308 child_realized (DbusmenuMenuitem * child, gpointer userdata)
309 {
310+ #ifdef MASSIVEDEBUGGING
311 g_debug("Root child realized");
312+ #endif
313 g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata));
314
315 DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata);

Subscribers

People subscribed via source and target branches

to all changes: