Philipp Hörist pushed to branch master at gajim / gajim


Commits:
1183863d by Philipp Hörist at 2024-12-01T10:55:41+01:00
cfix: StartChat: Don’t include account and groups in string search

- - - - -
28434a62 by Philipp Hörist at 2024-12-01T21:57:38+01:00
refactor: Settings: Remove obsolete Settings

- - - - -
d0e1e2f7 by Philipp Hörist at 2024-12-02T21:18:54+01:00
cfix: Main: Fix close on ESC

- - - - -


3 changed files:

- gajim/common/setting_values.py
- gajim/gtk/main.py
- gajim/gtk/start_chat.py


Changes:

=====================================
gajim/common/setting_values.py
=====================================
@@ -106,8 +106,6 @@ class _ACCOUNTDEFAULT:
     'groupchat_roster_width',
     'mainwin_height',
     'mainwin_width',
-    'mainwin_x_position',
-    'mainwin_y_position',
     'notification_position_x',
     'notification_position_y',
     'notification_timeout',
@@ -213,8 +211,6 @@ class _ACCOUNTDEFAULT:
     'latest_disco_addresses': '',
     'mainwin_height': 500,
     'mainwin_width': 1000,
-    'mainwin_x_position': 0,
-    'mainwin_y_position': 0,
     'action_on_close': 'hide',
     'muc_highlight_words': '',
     'muc_prefer_direct_msg': True,


=====================================
gajim/gtk/main.py
=====================================
@@ -514,9 +514,9 @@ def _on_action(
                 return None
 
         if action_name == "escape" and app.settings.get("escape_key_closes"):
-            self.emit("delete-event", Gdk.Event())
+            self.close()
 
-        if action_name == "restore-chat":
+        elif action_name == "restore-chat":
             self._chat_page.restore_chat()
 
         elif action_name == "switch-next-chat":


=====================================
gajim/gtk/start_chat.py
=====================================
@@ -971,7 +971,6 @@ def __init__(
         groupchat: bool = False,
     ) -> None:
 
-        account_label = app.get_account_label(account)
         name = name or _("Start New Chat")
 
         idle = None
@@ -1003,7 +1002,7 @@ def __init__(
         else:
             avatar_paintable = contact.get_avatar(AvatarSize.CHAT, scale)
 
-        search_string = "|".join((name, str(jid), account_label, 
*groups)).lower()
+        search_string = "|".join((name, str(jid))).lower()
 
         super().__init__(
             account=account,



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/f587032a382eecd0f1effa1a96907a91fc8daadb...d0e1e2f77c1fb37e90021486dab726bf5fe7ee20

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/f587032a382eecd0f1effa1a96907a91fc8daadb...d0e1e2f77c1fb37e90021486dab726bf5fe7ee20
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