keybinding settings: Fix keybinding lookup for standalone widgets.

Just the label isn't enough - some applet keybinding labels are
identical. Make the uuid and instance id available for accurate
lookups.

Author: mtwebster

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

@@ -42,7 +42,7 @@
 OPERATIONS_MAP = {'<': operator.lt, '<=': operator.le, '>': operator.gt, '>=': operator.ge, '!=': operator.ne, '=': operator.eq}
 
 class JSONSettingsHandler(object):
-    def __init__(self, filepath, notify_callback=None):
+    def __init__(self, filepath, uuid = None, instance_id = None, notify_callback=None):
         super(JSONSettingsHandler, self).__init__()
 
         self.notify_callback = notify_callback
@@ -54,6 +54,8 @@ def __init__(self, filepath, notify_callback=None):
         self.bindings = {}
         self.listeners = {}
         self.deps = {}
+        self.uuid = uuid
+        self.instance_id = instance_id
 
         self.timeout_id = 0
         self.file_monitor_id = 0
@@ -320,6 +322,7 @@ def connect_widget_handlers(self, *args):
 def json_settings_factory(subclass):
     class NewClass(globals()[subclass], JSONSettingsBackend):
         def __init__(self, key, settings, properties):
+            self.backend = "json"
             self.key = key
             self.settings = settings
 

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

@@ -938,10 +938,20 @@ def reset_bindings(self, keybinding):
         keybinding.resetDefaults()
         self._proxy_send_kb_changed(keybinding)
 
-    def find_keybinding_by_label(self, label):
-        for cat in self.main_store:
+    def lookup_gsettings_keybinding(self, schema_id, key):
+        for cat in self._static_store + self._custom_store:
+            for keybinding in cat.keybindings:
+                if keybinding.schema == schema_id and keybinding.key == key:
+                    return keybinding
+        return None
+
+    def lookup_json_keybinding(self, uuid, instance_id, key):
+        for cat in self._spice_store:
+            cat_uuid = cat.int_name.split("_")[0]
+            if cat_uuid != uuid:
+                continue
             for keybinding in cat.keybindings:
-                if keybinding.label == label:
+                if instance_id == keybinding.dbus_info["config_id"] and keybinding.key == key:
                     return keybinding
         return None
 

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

@@ -475,7 +475,12 @@ def __init__(self, label, num_bind=2, size_group=None, dep_key=None, tooltip="")
         self.num_bind = num_bind
         self.kb_table = KeybindingTable.get_default()
         self.kb_label = label
-        self.keybinding = self.kb_table.find_keybinding_by_label(self.kb_label)
+
+        if self.backend == "gsettings":
+            self.keybinding = self.kb_table.lookup_gsettings_keybinding(self.settings.props.schema_id, self.key)
+        else:
+            self.keybinding = self.kb_table.lookup_json_keybinding(self.settings.uuid, self.settings.instance_id, self.key)
+
         self.keybinding.connect("changed", self.on_kb_table_entry_changed)
 
         self.label = SettingsLabel(label)
@@ -535,6 +540,7 @@ def connect_widget_handlers(self, *args):
 def g_settings_factory(subclass):
     class NewClass(globals()[subclass], PXGSettingsBackend):
         def __init__(self, label, schema, key, *args, **kwargs):
+            self.backend = "gsettings"
             self.key = key
             if schema not in settings_objects:
                 settings_objects[schema] = Gio.Settings(schema_id=schema)

files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py

@@ -281,8 +281,9 @@ def load_instances(self):
                 if not instance_exists:
                     continue
 
-            settings = JSONSettingsHandler(os.path.join(path if item in new_items else old_path, item), self.notify_dbus)
-            settings.instance_id = instance_id
+            settings = JSONSettingsHandler(
+                os.path.join(path if item in new_items else old_path, item), self.uuid, instance_id, self.notify_dbus
+            )
             instance_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
             self.instance_stack.add_named(instance_box, instance_id)