Changeset 8955 for branches/gajim_0.11.2/src/common/connection_handlers.py

Timestamp:

11/09/07 20:30:15 (13 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:

• branches/gajim_0.11.2/src/common/connection_handlers.py (modified) (3 diffs)

branches/gajim_0.11.2/src/common/connection_handlers.py

@@ -449 +449 @@
 
                 if real_id[:3] == 'au_':
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         raise common.xmpp.NodeProcessed
 
@@ -471 +474 @@
 
                 else:
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file_props.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         if file_props.has_key('fast'):
                                 fasts = file_props['fast']
@@ -1044 +1050 @@
                                 self.dispatch('METACONTACTS', meta_list)
                         else:
-                                self.private_storage_supported = False
+                                if iq_obj.getErrorCode() not in ('403', '406', '404'):
+                                        self.private_storage_supported = False
                         # We can now continue connection by requesting the roster
                         self.connection.initRoster()