keybindings: Have meta_accelerator_parse take a MetaKeyCombo

2015-01-06 18:59:53 -08:00
parent 3beb187cac
commit 13acf9e35d
4 changed files with 32 additions and 46 deletions
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@ -1407,7 +1407,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
  MetaKeyCombo combo;
  MetaKeyDevirtCombo devirt_combo;

-  if (!meta_parse_accelerator (accelerator, &combo.keysym, &combo.keycode, &combo.modifiers))
+  if (!meta_parse_accelerator (accelerator, &combo))
    {
      meta_topic (META_DEBUG_KEYBINDINGS,
                  "Failed to parse accelerator\n");