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

Proposed by Kiwinote
Status: Merged
Merged at revision: 2899
Proposed branch: lp:~kiwinote/software-center/bug959530
Merge into: lp:software-center
Diff against target: 38 lines (+9/-7)
2 files modified
debian/changelog (+6/-6)
softwarecenter/ui/gtk3/widgets/apptreeview.py (+3/-1)
To merge this branch: bzr merge lp:~kiwinote/software-center/bug959530
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+98377@code.launchpad.net

Description of the change

this branch adapts s-c to the new gtk api as recently changed by http://git.gnome.org/browse/pygobject/commit/?id=8ca828825a2c47080055c5f986979aac8da9a93f

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-20 09:06:01 +0000
3+++ debian/changelog 2012-03-20 10:02:23 +0000
4@@ -85,13 +85,13 @@
5 opt-in panel
6
7 [ Kiwinote ]
8- * lp:~kiwinote/software-center/less-is-more:
9- - This branch clears out most of the unused code/files
10- that can be found in the sc codebase
11- * lp:~kiwinote/software-center/less-is-more2:
12- - this removes unused code from the tree
13+ * lp:~kiwinote/software-center/less-is-more,
14+ lp:~kiwinote/software-center/less-is-more2:
15+ - clean out a bunch of unused code / files
16+ * software-center/ui/gtk3/widgets/apptreeview.py:
17+ - play catchup with Gtk overrides (LP: #959530)
18
19- -- Gary Lasker <gary.lasker@canonical.com> Mon, 19 Mar 2012 17:15:23 -0400
20+ -- Kiwinote <kiwinote@gmail.com> Tue, 20 Mar 2012 09:56:52 +0000
21
22 software-center (5.1.12) precise; urgency=low
23
24
25=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
26--- softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-03-13 17:13:27 +0000
27+++ softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-03-20 10:02:23 +0000
28@@ -143,7 +143,9 @@
29 self.expanded_path = path
30
31 if old is not None:
32- ok, start, end = self.get_visible_range()
33+ res = self.get_visible_range()
34+ if res:
35+ start, end = res
36 if (start and start.compare(old) != -1) or \
37 (end and end.compare(old) != 1):
38 self._needs_collapse.append(old)

Subscribers

People subscribed via source and target branches