Changeset 6261

Timestamp:

05/01/06 20:29:12 (2 years ago)

Author:

asterix

Message:

be sure that transport is really removed before we start to remove its contacts.

Location:

trunk/src

Files:

• common/connection_handlers.py (modified) (2 diffs)
• common/connection.py (modified) (1 diff)
• gajim.py (modified) (2 diffs)
• roster_window.py (modified) (1 diff)

trunk/src/common/connection_handlers.py

@@ -41 +41 @@
 VCARD_PUBLISHED = 'vcard_published'
 VCARD_ARRIVED = 'vcard_arrived'
+AGENT_REMOVED = 'agent_removed'
 HAS_IDLE = True
 try:
@@ -948 +949 @@
                                 elif jid == our_jid:
                                         self.dispatch('MYVCARD', {'jid': jid})
+                elif self.awaiting_answers[id][0] == AGENT_REMOVED:
+                        jid = self.awaiting_answers[id][1]
+                        self.dispatch('AGENT_REMOVED', jid)
                 del self.awaiting_answers[id]
         

trunk/src/common/connection.py

@@ -745 +745 @@
                 iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent)
                 iq.getTag('query').setTag('remove')
+                id = self.connection.getAnID()
+                iq.setID(id)
+                self.awaiting_answers[id] = (AGENT_REMOVED, agent)
                 self.connection.send(iq)
                 self.connection.getRoster().delItem(agent)

trunk/src/gajim.py

@@ -730 +730 @@
                         return
 
+        def handle_event_agent_removed(self, account, agent):
+                # remove transport's contacts from treeview
+                jid_list = gajim.contacts.get_jid_list(account)
+                for jid in jid_list:
+                        if jid.endswith('@' + agent):
+                                c = gajim.contacts.get_first_contact_from_jid(account, jid)
+                                gajim.log.debug(
+                                        'Removing contact %s due to unregistered transport %s'\
+                                        % (jid, agent))
+                                gajim.connections[account].unsubscribe(c.jid)
+                                # Transport contacts can't have 2 resources
+                                if c.jid in gajim.to_be_removed[account]:
+                                        # This way we'll really remove it
+                                        gajim.to_be_removed[account].remove(c.jid)
+                                gajim.contacts.remove_jid(account, c.jid)
+                                self.roster.remove_contact(c, account)
+
         def handle_event_register_agent_info(self, account, array):
                 #('REGISTER_AGENT_INFO', account, (agent, infos, is_form))
@@ -1624 +1641 @@
                         'AGENT_ERROR_INFO': self.handle_event_agent_info_error,
                         'AGENT_ERROR_ITEMS': self.handle_event_agent_items_error,
+                        'AGENT_REMOVED': self.handle_event_agent_removed,
                         'REGISTER_AGENT_INFO': self.handle_event_register_agent_info,
                         'AGENT_INFO_ITEMS': self.handle_event_agent_info_items,

trunk/src/roster_window.py

@@ -1143 +1143 @@
                         # remove transport from treeview
                         self.remove_contact(contact, account)
-                        # remove transport's contacts from treeview
-                        jid_list = gajim.contacts.get_jid_list(account)
-                        for jid in jid_list:
-                                if jid.endswith('@' + contact.jid):
-                                        c = gajim.contacts.get_first_contact_from_jid(account, jid)
-                                        gajim.log.debug(
-                                                'Removing contact %s due to unregistered transport %s'\
-                                                % (jid, contact.jid))
-                                        gajim.connections[account].unsubscribe(c.jid)
-                                        # Transport contacts can't have 2 resources
-                                        gajim.contacts.remove_jid(account, c.jid)
-                                        self.remove_contact(c, account)
                         gajim.contacts.remove_jid(account, contact.jid)
                         gajim.contacts.remove_contact(account, contact)