Repository navigation
Conversation
…om keybindings When parsing an accelerator string like '<Print>' or '<Control>' that lacks a keysym or keycode, accelerator_parse() previously skipped unrecognized bracketed tokens and returned TRUE with combo->keysym == 0 and combo->keycode == 0. This caused meta_parse_accelerator() to treat unparseable strings as valid, preventing diagnostic warnings from being emitted. Furthermore, meta_prefs_add_keybinding() returned TRUE unconditionally even when no valid key combos were parsed. For dynamic custom keybindings without a GSettings backend, this resulted in meta_display_add_custom_keybinding() returning a valid non-zero action ID for a dead shortcut with no grab installed, failing to report META_KEYBINDING_ACTION_NONE to the caller. Fix this by: 1. Ensuring meta_parse_accelerator() returns FALSE when both keysym and keycode are 0. 2. In meta_prefs_add_keybinding(), rejecting dynamic custom keybindings when provided bindings cannot be parsed into any combo, returning FALSE so the caller can handle and report the failure. 3. Updating the warning in update_binding() so it accurately reflects both GSettings and custom runtime bindings. Fixes linuxmint#867
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When parsing an accelerator string like
<Print>or<Control>that lacks a keysym or keycode,accelerator_parse()previously skipped unrecognized bracketed tokens and returnedTRUEwithcombo->keysym == 0andcombo->keycode == 0. This causedmeta_parse_accelerator()to treat unparseable strings as valid, preventing diagnostic warnings from being emitted.Furthermore,
meta_prefs_add_keybinding()returnedTRUEunconditionally even when no valid key combos were parsed. For dynamic custom keybindings without a GSettings backend, this resulted inmeta_display_add_custom_keybinding()returning a valid non-zero action ID for a dead shortcut with no grab installed, failing to reportMETA_KEYBINDING_ACTION_NONEto the caller.Fix
meta_parse_accelerator()returnsFALSEwhen bothkeysymandkeycodeare 0.meta_prefs_add_keybinding(), rejects dynamic custom keybindings when provided bindings cannot be parsed into any combo, returningFALSEso the caller can handle and report the failure.update_binding()so it accurately reflects both GSettings and custom runtime bindings.Fixes #867