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

don't traceback on account deletion. Fixes #8960

This commit is contained in:
Yann Leboulanger 2018-03-28 11:36:14 +02:00
parent 241deac31c
commit f52e8d889c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gajim/common/connection.py
View File

@ -695,6 +695,7 @@ class Connection(CommonConnection, ConnectionHandlers):
self.privacy_rules_requested = False self.privacy_rules_requested = False
self.streamError = '' self.streamError = ''
self.secret_hmac = str(random.random())[2:].encode('utf-8') self.secret_hmac = str(random.random())[2:].encode('utf-8')
self.removing_account = False
self.sm = Smacks(self) # Stream Management self.sm = Smacks(self) # Stream Management
@ -869,6 +870,8 @@ class Connection(CommonConnection, ConnectionHandlers):
def _connection_lost(self): def _connection_lost(self):
log.debug('_connection_lost') log.debug('_connection_lost')
self.disconnect(on_purpose = False) self.disconnect(on_purpose = False)
if self.removing_account:
return
app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self,
title=_('Connection with account "%s" has been lost') % self.name, title=_('Connection with account "%s" has been lost') % self.name,
msg=_('Reconnect manually.'))) msg=_('Reconnect manually.')))
@ -2890,6 +2893,7 @@ class Connection(CommonConnection, ConnectionHandlers):
# on_remove_success as a class property as pass it as an argument # on_remove_success as a class property as pass it as an argument
def _on_unregister_account_connect(con): def _on_unregister_account_connect(con):
self.on_connect_auth = None self.on_connect_auth = None
self.removing_account = True
if app.account_is_connected(self.name): if app.account_is_connected(self.name):
hostname = app.config.get_per('accounts', self.name, 'hostname') hostname = app.config.get_per('accounts', self.name, 'hostname')
iq = nbxmpp.Iq(typ='set', to=hostname) iq = nbxmpp.Iq(typ='set', to=hostname)
@ -2908,6 +2912,7 @@ class Connection(CommonConnection, ConnectionHandlers):
con.SendAndWaitForResponse(iq) con.SendAndWaitForResponse(iq)
return return
on_remove_success(False) on_remove_success(False)
self.removing_account = False
if self.connected == 0: if self.connected == 0:
self.on_connect_auth = _on_unregister_account_connect self.on_connect_auth = _on_unregister_account_connect
self.connect_and_auth() self.connect_and_auth()