aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/parser.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-09-20 00:03:25 -0500
committerTed Gould <ted@gould.cx>2011-09-20 00:03:25 -0500
commitfe5eed009fa38e9855fc3260967fcdaffe9d2ef0 (patch)
treef9c0327c928a40bc0c85209c6eb478b296adf4fe /libdbusmenu-gtk/parser.c
parent0fca4c859e42bf3cafc6fa449dac3122996ed0c6 (diff)
parentc808cc90d518f9b010d937a13a8db0e8018fa9fd (diff)
downloadlibdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.gz
libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.bz2
libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.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;