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

show Error Dialog with full error message instead of popup when Stream Error arrives. see #4660

This commit is contained in:
Yann Leboulanger 2009-02-19 14:46:54 +00:00
parent 16fa30a1e7
commit 0724a4ffea
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/connection.py
View File

@ -625,12 +625,17 @@ class Connection(ConnectionHandlers):
if not self.retrycount and self.connected != 0:
self.disconnect(on_purpose = True)
self.dispatch('STATUS', 'offline')
sectxt = ''
pritxt = _('Could not connect to "%s"') % self._hostname
sectxt = _('Check your connection or try again later.')
if self.streamError:
sectxt = _('Server replied: %s\n') % self.streamError
self.dispatch('CONNECTION_LOST',
(_('Could not connect to "%s"') % self._hostname,
_('%sCheck your connection or try again later.') % sectxt))
# show error dialog
key = common.xmpp.NS_XMPP_STREAMS + ' ' + self.streamError
if key in common.xmpp.ERRORS:
sectxt2 = _('Server replied: %s') % common.xmpp.ERRORS[key][2]
self.dispatch('ERROR', (pritxt, '%s\n%s' % (sectxt2, sectxt)))
return
# show popup
self.dispatch('CONNECTION_LOST', (pritxt, sectxt))
def on_proxy_failure(self, reason):
log.error('Connection to proxy failed: %s' % reason)