Daniel Brötzmann pushed to branch master at gajim / gajim


Commits:
6069d5a6 by wurstsalat at 2023-12-03T13:07:20+01:00
fix: Servers: Remove defunct servers from server list

- - - - -
25466559 by wurstsalat at 2023-12-03T13:12:58+01:00
fix: Shortcuts: Fix focus issues with Ctrl+ shortcuts for Windows and Linux

- - - - -


2 changed files:

- gajim/data/other/servers.json
- gajim/gtk/main.py


Changes:

=====================================
gajim/data/other/servers.json
=====================================
@@ -1,12 +1,9 @@
 [
     "0nl1ne.at",
-    "creep.im",
     "deshalbfrei.org",
     "draugr.de",
     "jabber.ccc.de",
     "jabber.cz",
-    "jabber.meta.net.nz",
-    "jabber.no",
     "jabber.sk",
     "jabberes.org",
     "jabbim.com",


=====================================
gajim/gtk/main.py
=====================================
@@ -256,21 +256,19 @@ def _on_key_press_event(
         _window: MainWindow,
         event: Gdk.EventKey
     ) -> bool:
-
+        # Filter out modifier not used for shortcuts like Numlock (MOD2)
         modifier = event.get_state() & Gtk.accelerator_get_default_mod_mask()
+        accel_name = Gtk.accelerator_name(event.keyval, modifier)
 
-        if not modifier:
-            if event.keyval in (
-                Gdk.KEY_Control_L,
-                Gdk.KEY_Control_R,
-                Gdk.KEY_Alt_L,
-                Gdk.KEY_Alt_R,
-            ):
-                return False
+        log.warning('Captured key pressed: %s', accel_name)
 
-        if modifier == Gdk.ModifierType.CONTROL_MASK:
-            if event.keyval == Gdk.KEY_C:
-                return False
+        if event.keyval in (
+            Gdk.KEY_Control_L,
+            Gdk.KEY_Control_R,
+            Gdk.KEY_Alt_L,
+            Gdk.KEY_Alt_R,
+        ):
+            return False
 
         focused_widget = self.get_focus()
         if (isinstance(focused_widget, Gtk.TextView)



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/d75f5720aa25ae1e32e6ecdff116afd74ff62bad...25466559bd811c15626714cc69928fabf0b241d4

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/d75f5720aa25ae1e32e6ecdff116afd74ff62bad...25466559bd811c15626714cc69928fabf0b241d4
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to