diff options
author | Ted Gould <ted@gould.cx> | 2010-04-15 01:15:42 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-04-15 01:15:42 -0500 |
commit | d40baa2d6e30001d423658ce3ac173449f932310 (patch) | |
tree | a72a3e8bc4852f80ab380fa72f4e6d0bf685d96f /libdbusmenu-glib/server.c | |
parent | 00a7938319d15cb6484b8e7dc897d854816772bf (diff) | |
parent | e4a3d964d9c5b57fe1f3488459545212891732b0 (diff) | |
download | libdbusmenu-d40baa2d6e30001d423658ce3ac173449f932310.tar.gz libdbusmenu-d40baa2d6e30001d423658ce3ac173449f932310.tar.bz2 libdbusmenu-d40baa2d6e30001d423658ce3ac173449f932310.zip |
Changing the GTK layer to look at the realized location instead of the absolute location in the menu ordering.
Diffstat (limited to 'libdbusmenu-glib/server.c')
-rw-r--r-- | libdbusmenu-glib/server.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index d87c024..02c9c57 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -404,6 +404,16 @@ _dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revis } } else { DbusmenuMenuitem * item = dbusmenu_menuitem_find_id(priv->root, parent); + if (item == NULL) { + if (error != NULL) { + g_set_error(error, + error_quark(), + INVALID_MENUITEM_ID, + "The ID supplied %d does not refer to a menu item we have", + parent); + } + return FALSE; + } dbusmenu_menuitem_buildxml(item, xmlarray); } g_ptr_array_add(xmlarray, NULL); |