Changeset 7829 for branches/gajim_0.11/src/common/connection_handlers.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/common/connection_handlers.py (modified) (2 diffs)

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

@@ -25 +25 @@
 import sys
 
-from time import localtime, strftime, gmtime, timezone
+from time import localtime, strftime, gmtime
 from calendar import timegm
 
@@ -887 +887 @@
                 c = f.read()
                 f.close()
-                card = common.xmpp.Node(node = c)
+                try:
+                        card = common.xmpp.Node(node = c)
+                except:
+                        # We are unable to parse it. Remove it
+                        os.remove(path_to_file)
+                        return None
                 vcard = self.node_to_dict(card)
                 if vcard.has_key('PHOTO'):