Philipp Hörist pushed to branch master at gajim / gajim
Commits:
86f5953e by Annika Sommer at 2017-11-18T18:10:10+01:00
MUC: Improve error messages
Distinguish between 'item-not-found' and
'remote-server-not-found'
Fixes #8749
- - - - -
54f4c36f by Philipp Hörist at 2017-11-18T18:18:41+01:00
Merge branch 'master' into 'master'
Fix #8749: Misleading error message when joining a room
Closes #8749
See merge request gajim/gajim!150
- - - - -
1 changed file:
- gajim/gui_interface.py
Changes:
=====================================
gajim/gui_interface.py
=====================================
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -326,8 +326,13 @@ class Interface:
obj.room_jid)
elif (obj.errcode == '404') or (obj.errcon in ('item-not-found',
'remote-server-not-found')):
+ # remote server does not exist
+ if (obj.errcon == 'remote-server-not-found'):
+ self.handle_gc_error(gc_control, _('Unable to join group
chat'),
+ _('Remote server <b>%s</b> does not exist.') %
obj.room_jid)
# group chat does not exist
- self.handle_gc_error(gc_control, _('Unable to join group
chat'),
+ else:
+ self.handle_gc_error(gc_control, _('Unable to join group
chat'),
_('Group chat <b>%s</b> does not exist.') % obj.room_jid)
elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'):
self.handle_gc_error(gc_control, _('Unable to join group
chat'),
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c1c2a92efccbc89e625e27ff5129bb4984a705d3...54f4c36fe3ade18b267eb7169982d2911c0765d7
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c1c2a92efccbc89e625e27ff5129bb4984a705d3...54f4c36fe3ade18b267eb7169982d2911c0765d7
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
