aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/menuitem.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-03 13:43:13 -0600
committerTed Gould <ted@gould.cx>2011-03-03 13:43:13 -0600
commita66d4b41bfd368a4ac3c25be748cf64203147007 (patch)
tree78fd15b8f9d3513d4947079a214e610ee93ceb89 /libdbusmenu-gtk/menuitem.c
parentf8fed10917f0f2ebba16d2d6628fad2d2d46c04e (diff)
parent5debce23eeb45e440a2e3be9f67c6eb2e2a78e31 (diff)
downloadlibdbusmenu-a66d4b41bfd368a4ac3c25be748cf64203147007.tar.gz
libdbusmenu-a66d4b41bfd368a4ac3c25be748cf64203147007.tar.bz2
libdbusmenu-a66d4b41bfd368a4ac3c25be748cf64203147007.zip
Import upstream version 0.3.100
Diffstat (limited to 'libdbusmenu-gtk/menuitem.c')
-rw-r--r--libdbusmenu-gtk/menuitem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 508b43f..370dbf2 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -177,6 +177,9 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
g_return_val_if_fail(gtk_accelerator_valid(key, modifier), FALSE);
+ const gchar * keyname = gdk_keyval_name(key);
+ g_return_val_if_fail(keyname != NULL, FALSE);
+
GVariantBuilder builder;
g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
@@ -193,7 +196,6 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_SUPER);
}
- const gchar * keyname = gdk_keyval_name(key);
g_variant_builder_add(&builder, "s", keyname);
GVariant * inside = g_variant_builder_end(&builder);