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

connect_and_init doesn't call init_roster anymore 

fix the unregister_account bug
This commit is contained in:
Yann Leboulanger 2005-12-10 13:58:09 +00:00
parent 0db94027c9
commit 8252529260
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection.py
View File

@ -1726,7 +1726,6 @@ class Connection:
if hasattr(con, 'Resource'): if hasattr(con, 'Resource'):
self.server_resource = con.Resource self.server_resource = con.Resource
if auth: if auth:
con.initRoster()
self.last_io = time.time() self.last_io = time.time()
self.connected = 2 self.connected = 2
return con # return connection return con # return connection
@ -1822,6 +1821,8 @@ class Connection:
def connect_and_init(self, show, msg, signed): def connect_and_init(self, show, msg, signed):
self.continue_connect_info = [show, msg, signed] self.continue_connect_info = [show, msg, signed]
self.connection = self.connect_and_auth() self.connection = self.connect_and_auth()
if self.connection:
self.connection.initRoster()
def change_status(self, show, msg, sync = False, auto = False): def change_status(self, show, msg, sync = False, auto = False):
if sync: if sync:
@ -2333,7 +2334,7 @@ class Connection:
hostname = gajim.config.get_per('accounts', self.name, 'hostname') hostname = gajim.config.get_per('accounts', self.name, 'hostname')
iq = common.xmpp.Iq(typ = 'set', to = hostname) iq = common.xmpp.Iq(typ = 'set', to = hostname)
q = iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove') q = iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove')
self.to_be_sent.append(iq) self.connection.send(iq)
def send_invite(self, room, to, reason=''): def send_invite(self, room, to, reason=''):
'''sends invitation''' '''sends invitation'''