Philipp Hörist pushed to branch master at gajim / gajim

Commits: aa3cc79e by Philipp Hörist at 2019-08-19T21:08:14Z Always show appropriate error message

- - - - -

3 changed files:

- gajim/common/modules/iq.py - gajim/common/modules/muc.py - gajim/groupchat_control.py

Changes:

===================================== gajim/common/modules/iq.py ===================================== @@ -18,6 +18,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler

from gajim.common import app +from gajim.common.helpers import to_user_string from gajim.common.nec import NetworkEvent from gajim.common.file_props import FilesProp from gajim.common.modules.base import BaseModule @@ -51,7 +52,7 @@ class Iq(BaseModule): conn=self._con, jid=properties.jid.getBare(), file_props=file_props, - error_msg=properties.error.get_text())) + error_msg=to_user_string(properties.error))) self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed

===================================== gajim/common/modules/muc.py ===================================== @@ -350,7 +350,7 @@ class MUC(BaseModule): NetworkEvent('muc-captcha-error', account=self._account, room_jid=room_jid, - error_text=properties.error.get_text())) + error_text=to_user_string(properties.error))) self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED)

===================================== gajim/groupchat_control.py ===================================== @@ -57,6 +57,7 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import event_filter +from gajim.common.helpers import to_user_string from gajim.common import ged from gajim.common.i18n import _ from gajim.common import contacts @@ -1945,13 +1946,13 @@ class GroupchatControl(ChatControlBase):

@event_filter(['account', 'room_jid']) def _on_muc_join_failed(self, event): - self.xml.error_label.set_text(event.error.get_text()) + self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') self.autorejoin = False

@event_filter(['account', 'room_jid']) def _on_presence_error(self, event): - error_message = event.properties.error.get_text() + error_message = to_user_string(event.properties.error) self.add_info_message('Error: %s' % error_message)

def add_contact_to_roster(self, nick):

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aa3cc79e300040827e3816611d1a95ce75b...