diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-26 16:54:28 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-26 16:54:28 -0600 |
| commit | 561675e2d7430f15c69f43e1a192e91501b447c1 (patch) | |
| tree | ef982b4adba7fdddf9671e6c5bb7ac62b4cf13a7 | |
| parent | c5ba38c183260e6c91ef0a0d0db6a0edcda423e2 (diff) | |
| parent | c6da3667cae61d1606eb66e6b7be01c2cbf9cbff (diff) | |
| download | libdbusmenu-561675e2d7430f15c69f43e1a192e91501b447c1.tar.gz libdbusmenu-561675e2d7430f15c69f43e1a192e91501b447c1.tar.bz2 libdbusmenu-561675e2d7430f15c69f43e1a192e91501b447c1.zip | |
* Upstream Merge
* Only activate on menu bars
| -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 1c7e0bf..9690cc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.93-0ubuntu2~ted10) UNRELEASED; urgency=low + + * Upstream Merge + * Only activate on menu bars + + -- Ted Gould <ted@ubuntu.com> Wed, 26 Jan 2011 16:54:09 -0600 + libdbusmenu (0.3.93-0ubuntu2~ted9) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 46d214a..9b132ce 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -119,7 +119,7 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse) * * Note that this will not force menuitems in submenus to be updated as well. */ - if (recurse->parent == NULL) { + if (recurse->parent == NULL && GTK_IS_MENU_BAR(widget)) { GList *children = gtk_container_get_children (GTK_CONTAINER (widget)); for (; children != NULL; children = children->next) { |