copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better fix for joining groupchats with uppercase letters. Fixes #9198

This commit is contained in:
Yann Leboulanger 2018-08-30 12:21:43 +02:00 committed by Philipp Hörist
parent f25634bff5
commit 3305ad7710
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gajim/gtk/join_groupchat.py
View File

@ -203,7 +203,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
return return
self.room_jid = '%s@%s' % (room, server) self.room_jid = '%s@%s' % (room, server)
self.room_jid = self.room_jid.lower()
try:
self.room_jid = helpers.parse_jid(self.room_jid)
except helpers.InvalidFormat as error:
ErrorDialog(_('Invalid JID'), str(error), transient_for=self)
return
if app.in_groupchat(account, self.room_jid): if app.in_groupchat(account, self.room_jid):
# If we already in the groupchat, join_gc_room will bring # If we already in the groupchat, join_gc_room will bring
@ -223,12 +228,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self) ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self)
return return
try:
helpers.parse_jid(self.room_jid)
except helpers.InvalidFormat as error:
ErrorDialog(_('Invalid JID'), str(error), transient_for=self)
return
if not app.account_is_connected(account): if not app.account_is_connected(account):
ErrorDialog( ErrorDialog(
_('You are not connected to the server'), _('You are not connected to the server'),