diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-25 11:51:22 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-25 11:51:22 -0600 |
| commit | 2616c60f4f762915138bcfe30b86bdb4dc9ba10d (patch) | |
| tree | 773072d58d09417c0104e6784c4355e3c10b0553 | |
| parent | 39e9a74d4ab667db2b492d1c0b98e2d72b7469b0 (diff) | |
| parent | 32def89e3191d994a43d222c1e81c746922b688d (diff) | |
| download | libdbusmenu-2616c60f4f762915138bcfe30b86bdb4dc9ba10d.tar.gz libdbusmenu-2616c60f4f762915138bcfe30b86bdb4dc9ba10d.tar.bz2 libdbusmenu-2616c60f4f762915138bcfe30b86bdb4dc9ba10d.zip | |
* Upstream Merge
* Work with GtkMenu's as well
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3a368e8..4bc600d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.93-0ubuntu2~ted3) UNRELEASED; urgency=low + + * Upstream Merge + * Work with GtkMenu's as well + + -- Ted Gould <ted@ubuntu.com> Tue, 25 Jan 2011 11:51:01 -0600 + libdbusmenu (0.3.93-0ubuntu2~ted2) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 52bd8a8..d26f8fb 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -106,7 +106,7 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse) { if (GTK_IS_CONTAINER (widget)) { - gboolean increment = GTK_IS_MENU_BAR (widget) || GTK_IS_MENU_ITEM (widget); + gboolean increment = GTK_IS_MENU_SHELL (widget) || GTK_IS_MENU_ITEM (widget); if (increment) recurse->count++; |