diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-02 16:53:34 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-02 16:53:34 -0600 |
| commit | da9a1f784d3c1e8a75f832f60c3f86764810858c (patch) | |
| tree | e979710140fd56b2a708809cc529459bbaeabfdf /libdbusmenu-gtk/menuitem.c | |
| parent | 08409e83ad0cc9beeb27f3f4dce9b98a43138576 (diff) | |
| parent | 05298620b764d60b942567d09b970342924099f9 (diff) | |
| download | libdbusmenu-da9a1f784d3c1e8a75f832f60c3f86764810858c.tar.gz libdbusmenu-da9a1f784d3c1e8a75f832f60c3f86764810858c.tar.bz2 libdbusmenu-da9a1f784d3c1e8a75f832f60c3f86764810858c.zip | |
Sync up to trunk
Diffstat (limited to 'libdbusmenu-gtk/menuitem.c')
| -rw-r--r-- | libdbusmenu-gtk/menuitem.c | 4 |
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); |