aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/parser.c
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-09-20 08:52:46 -0700
committerKen VanDine <ken.vandine@canonical.com>2011-09-20 08:52:46 -0700
commit19c94937db3760924a02a4bda4e122a5919d12c2 (patch)
tree00cefd028c54e349afec0593e158bb94512ad038 /libdbusmenu-gtk/parser.c
parent78dac37f516e78b8677b48484961f56035a5a8bb (diff)
parent70c33b0c4c7ce124ac203020f2f3b0a392727577 (diff)
downloadlibdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.tar.gz
libdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.tar.bz2
libdbusmenu-19c94937db3760924a02a4bda4e122a5919d12c2.zip
New upstream release.
∘ Protect functions from NULL submenus (LP: #803667) ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, LP: #713690, LP: #643871, LP: #713685)
Diffstat (limited to 'libdbusmenu-gtk/parser.c')
-rw-r--r--libdbusmenu-gtk/parser.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 3243c81..e988c62 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -283,6 +283,9 @@ toggle_widget_visibility (GtkWidget * widget)
static void
watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu)
{
+ g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+ g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+
ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
pdata->shell = menu;