GNOME Bugzilla – Bug 700346
Switch to a new setting for the input source switch shortcut
Last modified: 2013-05-24 21:43:17 UTC
Mutter is going to use a different setting for this. The first patch is basically a revert of both commits that introduced and then re-worked the input-source-switcher setting. I think this doesn't break either string or UI freeze since it re-uses some strings, removes a bunch of others and then adds strings from xkeyboard-config (through GnomeXkbInfo).
Created attachment 244249 [details] [review] Remove the input-source-switcher setting Mutter now has a special modifiers-only shortcut used by gnome-shell to switch input sources which no longer uses this setting. This reverts commit ae3014ba3e10f37baff039bf969d6c075b303e67. This reverts commit 77b7569c3ddb83db9cb866f7f9d87e6f6d1dd5ad.
Created attachment 244250 [details] [review] keyboard: Add the XKB option for the input source switch shortcut Mutter now uses the "grp" XKB option to implement a special modifiers-only shortcut use by gnome-shell to switch input sources.
Created attachment 244251 [details] [review] region: Show the XKB option for the input source switch shortcut Mutter now uses the "grp" XKB option to implement a special modifiers-only shortcut use by gnome-shell to switch input sources.
Created attachment 244418 [details] [review] Keep using existing translations for input source switching shortcuts -- This allows us to keep using the existing translations removed in the first patch. Obviously this patch is only meant for the stable branch.
Review of attachment 244250 [details] [review]: Looks fine otherwise. ::: panels/keyboard/cc-keyboard-option.c @@ +99,3 @@ }; +static const gchar *xkb_option_grp_whitelist[] = { Do we really need to prefix everything with "grp:"? Could that list come from somewhere else, a shared header with mutter for example?
Review of attachment 244251 [details] [review]: Looks good.
Review of attachment 244418 [details] [review]: I don't think that's useful for master, but definitely required for gnome-3-8.
(In reply to comment #5) > Review of attachment 244250 [details] [review]: > > Looks fine otherwise. > > ::: panels/keyboard/cc-keyboard-option.c > @@ +99,3 @@ > }; > > +static const gchar *xkb_option_grp_whitelist[] = { > > Do we really need to prefix everything with "grp:"? We do because "grp:" is part of the option value id. > Could that list come from somewhere else, a shared header with mutter for > example? Besides introducing a mutter dependency here it wouldn't be much useful for mutter itself since mutter has to handle subsets of this list differently anyway. See reload_iso_next_group_combos() in https://bug697002.bugzilla-attachments.gnome.org/attachment.cgi?id=244113 . I've added the following comment to this patch though: /* This list must be kept in sync with what mutter is able to * handle. */
Attachment 244249 [details] pushed as e016bce - Remove the input-source-switcher setting Attachment 244250 [details] pushed as 739b260 - keyboard: Add the XKB option for the input source switch shortcut Attachment 244251 [details] pushed as 4e8c058 - region: Show the XKB option for the input source switch shortcut Attachment 244418 [details] pushed as a34b94b - Keep using existing translations for input source switching shortcuts