diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-07 10:24:32 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-07 10:24:32 -0500 |
| commit | f0ab3958e1f7c9b817a5556120ba5c8a12ecbd1c (patch) | |
| tree | 9a756d43787ffc01f60b651b10b30205ef28c55a /libdbusmenu-glib/menuitem.c | |
| parent | 269670511328aada39a23bd982a1ca3a44de9cfe (diff) | |
| parent | 4f43bbc76e738ecb3b03d848b447ac9dfe64faa3 (diff) | |
| download | libdbusmenu-f0ab3958e1f7c9b817a5556120ba5c8a12ecbd1c.tar.gz libdbusmenu-f0ab3958e1f7c9b817a5556120ba5c8a12ecbd1c.tar.bz2 libdbusmenu-f0ab3958e1f7c9b817a5556120ba5c8a12ecbd1c.zip | |
Import upstream version 0.4.2
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 70b5fd2..bdaf49f 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -446,7 +446,7 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp { g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); - if (dbusmenu_menuitem_get_children(mi) == NULL) { + if (dbusmenu_menuitem_get_children(mi) == NULL && g_strcmp0(DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU, dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) != 0) { g_warning("About to Show called on an item wihtout submenus. We're ignoring it."); } else { gboolean dummy; |