Ubuntu Software Center

Merge lp:~mvo/software-center/lp927262 into lp:software-center

  1. lp927262
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 2984
Proposed branch: lp:~mvo/software-center/lp927262
Merge into: lp:software-center
Diff against target: 46 lines (+10/-4)
3 files modified
softwarecenter/ui/gtk3/panes/availablepane.py (+3/-1)
softwarecenter/ui/gtk3/views/appdetailsview.py (+3/-1)
softwarecenter/ui/gtk3/views/appview.py (+4/-2)
To merge this branch: bzr merge lp:~mvo/software-center/lp927262
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+102485@code.launchpad.net

Description of the change

This fixes bug #927262 when get_vadjustment() returns None

To post a comment you must log in.
lp:~mvo/software-center/lp927262 updated
2983. By Michael Vogt

ensure to check if get_vadjustment() returned valid values

Revision history for this message
Gary Lasker (gary-lasker) wrote :

Should do the trick! Thank you, mvo!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
2--- softwarecenter/ui/gtk3/panes/availablepane.py 2012-04-13 11:30:48 +0000
3+++ softwarecenter/ui/gtk3/panes/availablepane.py 2012-04-18 10:37:20 +0000
4@@ -542,7 +542,9 @@
5 self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE
6
7 vm = get_viewmanager()
8- self.app_view.tree_view_scroll.get_vadjustment().set_value(0.0)
9+ adj = self.app_view.tree_view_scroll.get_vadjustment()
10+ if adj:
11+ adj.set_value(0.0)
12
13 # yeah for special cases - as discussed on irc, mpt
14 # wants this to return to the category screen *if*
15
16=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
17--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-03-27 14:40:22 +0000
18+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-04-18 10:37:20 +0000
19@@ -1913,7 +1913,9 @@
20 self.pkg_statusbar.progress.set_fraction(progress / 100.0)
21 if progress >= 100:
22 self.pkg_statusbar.progress.set_fraction(1)
23- self.adjustment_value = self.get_vadjustment().get_value()
24+ adj = self.get_vadjustment()
25+ if adj:
26+ self.adjustment_value = adj.get_value()
27
28 def get_app_icon_details(self):
29 """ helper for unity dbus support to provide details about the
30
31=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
32--- softwarecenter/ui/gtk3/views/appview.py 2012-04-12 12:26:04 +0000
33+++ softwarecenter/ui/gtk3/views/appview.py 2012-04-18 10:37:20 +0000
34@@ -200,8 +200,10 @@
35 model.set_from_matches(matches)
36 self.set_model(model)
37
38- self.tree_view_scroll.get_vadjustment().set_lower(self.vadj)
39- self.tree_view_scroll.get_vadjustment().set_value(self.vadj)
40+ adj = self.tree_view_scroll.get_vadjustment()
41+ if adj:
42+ adj.set_lower(self.vadj)
43+ adj.set_value(self.vadj)
44
45 def reset_default_sort_mode(self):
46 """ force the appview to reset to the default sort method without

Subscribers

People subscribed via source and target branches