Philipp Hörist pushed to branch master at gajim / gajim
Commits:
977a6f77 by wurstsalat at 2022-12-03T00:31:38+01:00
imprv: MUC: Add method for aborting join
- - - - -
2 changed files:
- gajim/common/modules/muc.py
- gajim/gtk/groupchat_state.py
Changes:
=====================================
gajim/common/modules/muc.py
=====================================
@@ -374,6 +374,17 @@ def leave(self,
room.set_not_joined()
room.notify('room-left')
+ def abort_join(self, room_jid: str) -> None:
+ self._remove_rejoin_timeout(room_jid)
+
+ muc = self._mucs[room_jid]
+ self._con.get_module('Presence').send_presence(
+ muc.occupant_jid,
+ typ='unavailable',
+ caps=False)
+
+ self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED)
+
def configure_room(self, room_jid: str) -> None:
self._nbxmpp('MUC').request_config(room_jid,
callback=self._on_room_config)
=====================================
gajim/gtk/groupchat_state.py
=====================================
@@ -14,7 +14,6 @@
from __future__ import annotations
-from gi.repository import GLib
from gi.repository import Gtk
from gajim.common import app
@@ -103,7 +102,5 @@ def _on_join_clicked(self, _button: Gtk.Button) -> None:
def _on_abort_clicked(self, _button: Gtk.Button) -> None:
assert self._contact is not None
- app.window.activate_action(
- 'remove-chat',
- GLib.Variant(
- 'as', [self._contact.account, str(self._contact.jid)]))
+ client = app.get_client(self._contact.account)
+ client.get_module('MUC').abort_join(self._contact.jid)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/977a6f7795648cdc831793e7a0b406e70b4da1e6
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/977a6f7795648cdc831793e7a0b406e70b4da1e6
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
