connection.py still problematic, just adding the stuff alexey said in case his grab this to continue fixing
This commit is contained in:
parent
caad4cd972
commit
0b331139ed
|
@ -716,7 +716,7 @@ class Connection:
|
||||||
def ask_register_agent_info(self, agent):
|
def ask_register_agent_info(self, agent):
|
||||||
if not self.connection:
|
if not self.connection:
|
||||||
return None
|
return None
|
||||||
data = common.xmpp.features.getRegInfo(self.connection,agent) # FIXME: blocking
|
data = common.xmpp.features.getRegInfo(self.connection, agent) # FIXME: blocking
|
||||||
info = data.asDict()
|
info = data.asDict()
|
||||||
instructions = data.getInstructions()
|
instructions = data.getInstructions()
|
||||||
if instructions:
|
if instructions:
|
||||||
|
@ -746,10 +746,10 @@ class Connection:
|
||||||
return 0
|
return 0
|
||||||
else:
|
else:
|
||||||
gajim.log.debug(_('Connected to server'))
|
gajim.log.debug(_('Connected to server'))
|
||||||
req = c.getRegInfo(c, hostname).asDict() # FIXME! This blocks!
|
req = common.xmpp.features.getRegInfo(c, hostname).asDict() # FIXME! This blocks!
|
||||||
req['username'] = login
|
req['username'] = login
|
||||||
req['password'] = password
|
req['password'] = password
|
||||||
if not register(c, hostname,req):
|
if not common.xmpp.features.register(c, hostname,req): #FIXME: error
|
||||||
self.dispatch('ERROR', _('Error: ') + c.lastErr)
|
self.dispatch('ERROR', _('Error: ') + c.lastErr)
|
||||||
else:
|
else:
|
||||||
self.name = name
|
self.name = name
|
||||||
|
|
Loading…
Reference in New Issue