Changeset 9868 for trunk/src/roster_window.py

Timestamp:

06/30/08 23:27:04 (5 months ago)

Author:

steve-e

Message:

Commit two new assert statements in roster window.

We are not absolutely sure why some things are happening. Maybe that will help tracing the strange bugs.

Files:

• trunk/src/roster_window.py (modified) (3 diffs)

trunk/src/roster_window.py

@@ -389 +389 @@
 
                 assert len(added_iters), '%s has not been added to roster!' % contact.jid
+                for titer in added_iters:
+                        assert self.model[titer][C_JID] == contact.jid and \
+                                self.model[titer][C_ACCOUNT] == account, \
+                                "Iters invalidated for %s" % contact.jid
                 return added_iters
 
@@ -425 +429 @@
                         # Remove us and empty groups from the model
                         for i in iters:
+                                assert self.model[i][C_JID] == contact.jid and \
+                                        self.model[i][C_ACCOUNT] == account, \
+                                        "Invalidated iters of %s" % contact.jid
                                 parent_i = self.model.iter_parent(i)
                                 if parent_type == 'group' and \
@@ -1160 +1167 @@
         def setup_and_draw_roster(self):
                 '''create new empty model and draw roster'''
+                self.modelfilter = None
                 #(icon, name, type, jid, account, editable, avatar_pixbuf, padlock_pixbuf)
                 self.model = gtk.TreeStore(gtk.Image, str, str, str, str, gtk.gdk.Pixbuf,