Merge lp:~kiwinote/software-center/bug960260 into lp:software-center

[Kiwinote]

sorry, messed up the fix for bug 959530 earlier today - this branch will restore normal behaviour

[Michael Vogt (mvo)]

Thanks! That looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 13:19:27 +0000
+++ debian/changelog	2012-03-20 16:39:21 +0000
@@ -1,3 +1,10 @@
+software-center (5.1.14) UNRELEASED; urgency=low
+
+  * softwarecenter/ui/gtk3/apptreeview.py:
+    - fix UnboundLocalError in expand_path() (LP: #960260)
+
+ -- Kiwinote <[e-mail]>  Tue, 20 Mar 2012 16:30:53 +0000
+
 software-center (5.1.13) precise; urgency=low
 
   [ Anthony Lenton ]

=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-20 10:00:06 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-20 16:39:21 +0000
@@ -143,9 +143,7 @@
         self.expanded_path = path
 
         if old is not None:
-            res = self.get_visible_range()
-            if res:
-                start, end = res
+            start, end = self.get_visible_range() or (None, None)
             if (start and start.compare(old) != -1) or \
                (end and end.compare(old) != 1):
                 self._needs_collapse.append(old)