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


Commits:
572d279f by wurstsalat at 2021-09-11T00:08:34+02:00
GroupchatJoin: Fix joining a chat

- - - - -


1 changed file:

- gajim/gtk/groupchat_join.py


Changes:

=====================================
gajim/gtk/groupchat_join.py
=====================================
@@ -12,6 +12,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import Pango
@@ -29,6 +31,8 @@
 from .groupchat_nick import NickChooser
 from .util import ensure_not_destroyed
 
+log = logging.getLogger('gajim.gui.groupchat_join')
+
 
 class GroupchatJoin(Gtk.ApplicationWindow):
     def __init__(self, account, jid):
@@ -86,8 +90,8 @@ def __init__(self, account, jid):
         self.add(self._main_box)
         self.show_all()
 
-        con = app.connections[self.account]
-        con.get_module('Discovery').disco_muc(
+        client = app.get_client(self.account)
+        client.get_module('Discovery').disco_muc(
             jid,
             allow_redirect=True,
             request_vcard=True,
@@ -103,7 +107,7 @@ def _disco_info_received(self, task):
         try:
             result = task.finish()
         except StanzaError as error:
-            self._log.info('Disco %s failed: %s', error.jid, error.get_text())
+            log.info('Disco %s failed: %s', error.jid, error.get_text())
             self._set_error(error)
             return
 
@@ -137,8 +141,9 @@ def _set_error_from_code(self, error_code):
 
     def _on_join(self, *args):
         nickname = self._nick_chooser.get_text()
-        app.interface.show_or_join_groupchat(
-            self.account, self.jid, nick=nickname)
+
+        app.interface.show_add_join_groupchat(
+            self.account, self.jid, nickname=nickname)
         self.destroy()
 
     def _on_destroy(self, *args):



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

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/572d279f51552be25b9c200640b1b027cc01d7f0
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to