Changeset 9869 for trunk/src/roster_window.py

Timestamp:

07/01/08 00:23:07 (5 months ago)

Author:

steve-e

Message:

Fix really bad modelfilter bug that may have caused segfaults.

This also fixes the problem of showing the wrong icon when expanding metacontacts.

Example:
We have the groups A, B, C in our child model
But only A and C are visible (and therefore in modelfilter)

Imagine we have a childIter_G pointing to group B
Getting its path in the childmodel, will give us (lets say) 2
2 means now the second group/row in the CHILD model
We now pass this to the tree and tell him "Expand row 2"
The tree itself is looking at the 2nd row of modelfilter: "Hey modelfilter, expand row number 2"

For modelfilter row number 2 is C and NOT B

Files:

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

trunk/src/roster_window.py

@@ -907 +907 @@
                         accounts = [account]
 
-                path = self.model.get_path(child_iter)
                 if account in self.collapsed_rows and \
                 self.model.iter_has_child(child_iter):
@@ -1058 +1057 @@
                         # We are the big brother and have a visible family
                         for child_iter in child_iters:
-                                path = self.model.get_path(child_iter)
+                                child_path = self.model.get_path(child_iter)
+                                path = self.modelfilter.convert_child_path_to_path(child_path)
 
                                 if not self.tree.row_expanded(path) and icon_name != 'event':