keyboard: Always fetch the full XkbInfo store except when adding

a layout.

This adapts Cinnamon's use of CinnamonDesktop.XkbInfo to
linuxmint/cinnamon-desktop@2bb17da29eb, which stops us relying
on a setting to load a full XkbInfo model.

This setting will still be used directly in the Add Layout dialog,
but it would cause problems if the user added an 'extra' layout,
then later un-set the 'show-all-sources' toggle. Cinnamon would
consider it an invalid layout.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-settings/bin/AddKeyboardLayout.py

@@ -103,7 +103,11 @@ def _reload_all_engines(self):
         self.layouts_store.clear()
 
         self.used_ids = set(self.original_used_ids)
-        self.xkb_info = CinnamonDesktop.XkbInfo()
+
+        if self.input_source_settings.get_boolean(SHOW_ALL_SOURCES_KEY):
+            self.xkb_info = CinnamonDesktop.XkbInfo.new_with_extras()
+        else:
+            self.xkb_info = CinnamonDesktop.XkbInfo.new()
 
         self._load_layouts()
 

files/usr/share/cinnamon/cinnamon-settings/bin/InputSources.py

@@ -275,7 +275,7 @@ def __init__(self):
             print(e.message)
             self._proxy = None
 
-        self.xkb_info = CinnamonDesktop.XkbInfo()
+        self.xkb_info = CinnamonDesktop.XkbInfo.new_with_extras()
 
         self._ibus = IBus.Bus.new()
         if not self._ibus.is_connected():

js/ui/keyboardManager.js

@@ -30,7 +30,7 @@ let _xkbInfo = null;
 
 function getXkbInfo() {
     if (_xkbInfo == null)
-        _xkbInfo = new CinnamonDesktop.XkbInfo();
+        _xkbInfo = CinnamonDesktop.XkbInfo.new_with_extras();
     return _xkbInfo;
 }
 
@@ -499,7 +499,7 @@ var InputSourceManager = class {
         this._ibusManager.connect('property-updated', this._ibusPropertyUpdated.bind(this));
         this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this));
 
-        global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this));
+        global.display.connect('modifiers-accelerator-activated', () => this._modifiersSwitcher(false));
 
         this._sourcesPerWindow = false;
         this._focusWindowNotifyId = 0;