Merge authors: Chris Coulson (chrisccoulson) Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~chrisccoulson/dbusmenu/lp720895/+merge/51594 proposed by: Chris Coulson (chrisccoulson) review: Approve - Ted Gould (ted) ------------------------------------------------------------ revno: 248 [merge] committer: Ted Gould <[email protected]> branch nick: trunk timestamp: Tue 2011-03-01 11:47:12 -0600 message: Check for valid name before building up variant. modified: libdbusmenu-gtk/menuitem.c
-- lp:dbusmenu https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk Your team ayatana-commits is subscribed to branch lp:dbusmenu. To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription
=== modified file 'libdbusmenu-gtk/menuitem.c' --- libdbusmenu-gtk/menuitem.c 2011-02-21 16:04:44 +0000 +++ libdbusmenu-gtk/menuitem.c 2011-03-01 17:45:50 +0000 @@ -177,6 +177,9 @@ 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 @@ 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);
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
