Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a3d17c6d by Philipp Hörist at 2022-10-27T22:40:32+02:00
fix: StartChat: Don’t use jid argument for global dialog
The jid attribute indicates that this is a dialog which can be
opened per jid, which we dont want here.
- - - - -
2 changed files:
- gajim/gtk/application.py
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/gtk/application.py
=====================================
@@ -630,7 +630,7 @@ def _on_new_chat_action(_action: Gio.SimpleAction,
jid, initial_message = param.get_strv()
open_window('StartChatDialog',
- jid=jid or None,
+ initial_jid=jid or None,
initial_message=initial_message or None)
@staticmethod
@@ -740,7 +740,7 @@ def _on_join_support_chat(_action: Gio.SimpleAction,
app.interface.show_add_join_groupchat(
accounts[0], GAJIM_SUPPORT_JID)
return
- open_window('StartChatDialog', jid=GAJIM_SUPPORT_JID)
+ open_window('StartChatDialog', initial_jid=GAJIM_SUPPORT_JID)
@staticmethod
def _on_faq_action(_action: Gio.SimpleAction,
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -69,7 +69,7 @@ class Search(IntEnum):
class StartChatDialog(Gtk.ApplicationWindow):
def __init__(self,
- jid: Optional[str] = None,
+ initial_jid: Optional[str] = None,
initial_message: Optional[str] = None
) -> None:
@@ -143,9 +143,9 @@ def __init__(self,
self._load_contacts(rows)
self._initial_message: dict[str, Optional[str]] = {}
- if jid is not None:
- self._initial_message[jid] = initial_message
- self._ui.search_entry.set_text(jid)
+ if initial_jid is not None:
+ self._initial_message[initial_jid] = initial_message
+ self._ui.search_entry.set_text(initial_jid)
self.select_first_row()
self._ui.connect_signals(self)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3d17c6d23b936aed077ce9a63350115…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3d17c6d23b936aed077ce9a63350115…
You're receiving this email because of your account on dev.gajim.org.
Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
c5eafea2 by wurstsalat at 2022-10-27T20:24:53+02:00
fix: Try leaving group chat only if account is online
Fixes #11247
- - - - -
1 changed file:
- gajim/gtk/chat_page.py
Changes:
=====================================
gajim/gtk/chat_page.py
=====================================
@@ -317,7 +317,7 @@ def _on_chat_removed(self,
if self._chat_control.is_loaded(account, jid):
self._chat_control.clear()
- if type_ == 'groupchat':
+ if type_ == 'groupchat' and app.account_is_connected(account):
client = app.get_client(account)
client.get_module('MUC').leave(jid)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5eafea2c3cb3068d522919ee87d20a2…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5eafea2c3cb3068d522919ee87d20a2…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
241206c5 by Philipp Hörist at 2022-10-26T21:36:20+02:00
imprv: ExceptionDialog: Close dialog with ESC
- - - - -
1 changed file:
- gajim/gtk/exception.py
Changes:
=====================================
gajim/gtk/exception.py
=====================================
@@ -126,12 +126,17 @@ def __init__(self,
buffer_ = self._ui.exception_view.get_buffer()
buffer_.set_text(self._issue_text)
+ self.connect('key-press-event', self._on_key_press)
self._ui.connect_signals(self)
self.show_all()
if self._sentry_available:
self._ui.user_feedback_entry.grab_focus()
+ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None:
+ if event.keyval == Gdk.KEY_Escape:
+ self.destroy()
+
def _on_report_clicked(self, _button: Gtk.Button) -> None:
if self._sentry_available and determine_proxy() is not None:
# sentry-sdk supports a http-proxy arg but for now only use
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/241206c5a0effbe5065dc0acb26adb30…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/241206c5a0effbe5065dc0acb26adb30…
You're receiving this email because of your account on dev.gajim.org.