Fix conflicting keybindings on Gnome 43 #537
Conversation
…d signature" This reverts commit 1ac33b4.
| @@ -242,7 +242,7 @@ function keystrToKeycombo(keystr) { | |||
| keystr = keystr.replace('Above_Tab', 'a'); | |||
| aboveTab = true; | |||
| } | |||
| let [ok, key, mask] = Gtk.accelerator_parse(keystr); | |||
| let [key, mask] = Gtk.accelerator_parse(keystr); | |||
There was a problem hiding this comment.
Thanks @Lythenas!
This should be the only change (revert) needed to fix gnome 43, 42 keybind regressions.
|
Thanks @Lythenas! Unfortunately this PR also adds code that was never in versions prior to Gnome 44 (and never intended to be in previous versions) - and was only implemented as a temporary workaround since keybind clash detection in Gnome 44 was broken at the time (since fixed). The only line/reversion needed in this PR is this line. Closing this PR in favour of #539 since that one will implement a fix that is backwards compatible and works in Gnome 44, 43, 42. Note: I'm also planning on adding changes in #539 to develop branch - hopefully bringing us closer to |
… earlier) keybind clash detection (#539) See #537 #538 PR's which reverts changes that were backported to Gnome 43/42. This PR is a replacement for these individual reverts PRs. This PR implements a fix which first checks the number elements returned from Gtk.accelerator_parse (whether 2 or 3) and assigns them correctly. This is a much better/robust fix that means that this should now work regardless of what gnome version is used. Fixes #533, #536. The issue was caused by Gtk.accelerator_parse result changing in Gnome 44. There is confusion about when this change occurred, e.g. [GJS porting guide](https://gjs.guide/extensions/upgrading/gnome-shell-40.html#gtk-accelerator-parse) suggests this change occurred in Gnome 40, however actually testing in Fedora 37 (and purportedly in other Gnome 43, 42) versions it's still returning 2 elements instead of 3. This PR addresses both cases.
Revert the one commit that fixed conflicting keybindings on Gnome 44 from #515
Fixes #533
Notes regarding testing: You need to relogin after you enable conflicting keybindings. They don't seem to be picked up without relogin if you reset your keybindings in the Gnome settings.