diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-03 13:48:56 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-03 13:48:56 -0600 |
| commit | df8c5e53a6fddcd80e2ea52174f9242c2c17eba4 (patch) | |
| tree | 26fe9c9337b8c8eead223035698ce164da8c5ac6 /libdbusmenu-gtk/menuitem.c | |
| parent | bf0ec7cdc8c37f4ec7668f18b0be10942564957b (diff) | |
| parent | a66d4b41bfd368a4ac3c25be748cf64203147007 (diff) | |
| download | libdbusmenu-df8c5e53a6fddcd80e2ea52174f9242c2c17eba4.tar.gz libdbusmenu-df8c5e53a6fddcd80e2ea52174f9242c2c17eba4.tar.bz2 libdbusmenu-df8c5e53a6fddcd80e2ea52174f9242c2c17eba4.zip | |
* New upstream release.
* GTK application menus are not correctly displayed (LP: #726678)
* Fix LP: #723873 - ensure that changing a menuitem property to a
default value gets propagated properly in the client
* Fix some crashes by disconnecting more signals when a menuitem is
deleted. LP: #725980 and LP: #726153
* Making sure to grab the variant and dispose of it in handle_event.
* Change the destroy prototype to fix GIR warnings
* Fix emitting property changes to use tuples
* Track the icon theme directories
* Handle cases where passed in property names could be in the
properties hash table
* Making property names match DBus protocol recommendations
* Restricting GIR scanner to exported interfaces
* Use the library i18n libraries instead of the app ones
* Make GetLayout use the parent parameter
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); |