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