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


Commits:
aa7d1be9 by Philipp Hörist at 2025-06-08T22:16:38+02:00
cfix: Alert: Omit response id from callback args in certain situations

- - - - -


1 changed file:

- gajim/gtk/alert.py


Changes:

=====================================
gajim/gtk/alert.py
=====================================
@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+from typing import Any
 from typing import cast
 from typing import Literal
 from typing import overload
@@ -136,10 +137,15 @@ def _emit_response(self, response_id: str) -> None:
 
         widget = cast(ExtraWidgetT, self.get_extra_child())
 
+        args: list[Any] = []
+        # Add the response_id as callback arg only if we emit more than one 
response
+        if self._emit_responses is None or len(self._emit_responses) != 1:
+            args.append(response_id)
+
         if widget is not None:
-            self._callback(response_id, widget.get_value())
-        else:
-            self._callback(response_id)
+            args.append(widget.get_value())
+
+        self._callback(*args)
 
     def _on_response(self, _dialog: Adw.AlertDialog, response_id: str) -> None:
         self._emit_response(response_id)
@@ -169,6 +175,12 @@ def __init__(
             parent=parent,
         )
 
+    def _emit_response(self, response_id: str) -> None:
+        if self._callback is None:
+            return
+
+        self._callback()
+
 
 class ConfirmationAlertDialog(_BaseAlertDialog):
     @overload



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/aa7d1be90d42116beb21482d5dc46d458b5295f2

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/aa7d1be90d42116beb21482d5dc46d458b5295f2
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