ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00772
[Merge] lp:~ted/dbusmenu/bug510887 into lp:dbusmenu
Ted Gould has proposed merging lp:~ted/dbusmenu/bug510887 into lp:dbusmenu.
Requested reviews:
DBus Menu Team (dbusmenu-team)
Removes the revision field from the XML file sent for the menu layout.
--
https://code.launchpad.net/~ted/dbusmenu/bug510887/+merge/17857
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2009-12-21 22:15:45 +0000
+++ libdbusmenu-glib/menuitem.c 2010-01-21 23:28:13 +0000
@@ -1060,12 +1060,17 @@
{
g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+ guint id = 0;
+ if (!dbusmenu_menuitem_get_root(mi)) {
+ id = dbusmenu_menuitem_get_id(mi);
+ }
+
GList * children = dbusmenu_menuitem_get_children(mi);
/* TODO: Only put revision info in the root node. Save some bandwidth. */
if (children == NULL) {
- g_ptr_array_add(array, g_strdup_printf("<menu id=\"%d\" revision=\"%d\" />", dbusmenu_menuitem_get_id(mi), revision));
+ g_ptr_array_add(array, g_strdup_printf("<menu id=\"%d\" revision=\"%d\" />", id, revision));
} else {
- g_ptr_array_add(array, g_strdup_printf("<menu id=\"%d\" revision=\"%d\">", dbusmenu_menuitem_get_id(mi), revision));
+ g_ptr_array_add(array, g_strdup_printf("<menu id=\"%d\" revision=\"%d\">", id, revision));
for ( ; children != NULL; children = children->next) {
dbusmenu_menuitem_buildxml(DBUSMENU_MENUITEM(children->data), array, revision);
}
Follow ups