Author: asterix Date: 2007-03-28 16:20:50 +0200 (Wed, 28 Mar 2007) New Revision: 8032

Modified: trunk/src/common/connection.py trunk/src/roster_window.py Log: cleanup connection.connect(). fixes #3061

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-26 20:31:24 UTC (rev 8031) +++ trunk/src/common/connection.py 2007-03-28 14:20:50 UTC (rev 8032) @@ -292,16 +292,13 @@ def connect(self, data = None): ''' Start a connection to the Jabber server. Returns connection, and connection type ('tls', 'ssl', 'tcp', '') - data MUST contain name, hostname, resource, usessl, proxy, - use_custom_host, custom_host (if use_custom_host), custom_port (if - use_custom_host), ''' + data MUST contain hostname, usessl, proxy, use_custom_host, + custom_host (if use_custom_host), custom_port (if use_custom_host)''' if self.connection: return self.connection, ''

if data: - name = data['name'] hostname = data['hostname'] - resource = data['resource'] usessl = data['usessl'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] @@ -311,9 +308,7 @@ custom_h = data['custom_host'] custom_p = data['custom_port'] else: - name = gajim.config.get_per('accounts', self.name, 'name') hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') @@ -324,7 +319,7 @@ custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') custom_p = gajim.config.get_per('accounts', self.name, 'custom_port')

- #create connection if it doesn't already exist + # create connection if it doesn't already exist self.connected = 1 if p and p in gajim.config.get_per('proxies'): proxy = {'host': gajim.config.get_per('proxies', p, 'host')} @@ -448,8 +443,6 @@ self._register_handlers(con, con_type)

name = gajim.config.get_per('accounts', self.name, 'name') - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') self.connection = con

fpr_good = self._check_fingerprint(con, con_type) @@ -470,7 +463,7 @@ if fpr_good == True: log.info("Fingerprint found and matched for %s.", hostname)

- con.auth(name, self.password, resource, 1, self.__on_auth) + con.auth(name, self.password, self.server_resource, 1, self.__on_auth)

return True

@@ -971,6 +964,7 @@ if self.connection: return self._hostname = config['hostname'] + self.server_resource = config['resource'] self.new_account_info = config self.name = name self.on_connect_success = self._on_new_account

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-26 20:31:24 UTC (rev 8031) +++ trunk/src/roster_window.py 2007-03-28 14:20:50 UTC (rev 8032) @@ -1327,8 +1327,7 @@ contact = gajim.contacts.create_contact(jid = jid, name = account_name, show = connection.get_status(), sub = '', status = connection.status, - resource = gajim.config.get_per('accounts', connection.name, - 'resource'), + resource = connection.server_resource, priority = connection.priority, keyID = gajim.config.get_per('accounts', connection.name, 'keyid')) @@ -2663,7 +2662,7 @@ gajim.connections[account].unsubscribe(contact.jid, remove_auth) for c in gajim.contacts.get_contact(account, contact.jid): self.remove_contact(c, account) - gajim.contacts.remove_jid(account, c.jid) + gajim.contacts.remove_jid(account, contact.jid) # redraw group rows for contact numbers for group in c.groups: self.draw_group(group, account)