Changeset 9045

Timestamp:

11/24/07 10:48:38 (12 months ago)

Author:

asterix

Message:

prevent traceback when we fill the roster. fixes #3579

Files:

• trunk/src/common/contacts.py (modified) (2 diffs)

trunk/src/common/contacts.py

@@ -433 +433 @@
                 show_list = ['not in roster', 'error', 'offline', 'invisible', 'dnd',
                         'xa', 'away', 'chat', 'online', 'requested', 'message']
-                show1 = show_list.index(contact1.show)
-                show2 = show_list.index(contact2.show)
+                # contact can be null when we fill the roster on connection
+                if not contact1:
+                        show1 = 0
+                        priority1 = 0
+                else:
+                        show1 = show_list.index(contact1.show)
+                        priority1 = contact1.priority
+                if not contact1:
+                        show2 = 0
+                        priority2 = 0
+                else:
+                        show2 = show_list.index(contact2.show)
+                        priority2 = contact2.priority
                 # If only one is offline, it's always second
                 if show1 > 2 and show2 < 3:
@@ -451 +462 @@
                 if transport1 and not transport2:
                         return -1
-                if contact1.priority > contact2.priority:
+                if priority1 > priority2:
                         return 1
-                if contact2.priority > contact1.priority:
+                if priority2 > priority1:
                         return -1
                 if show1 > show2: