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
=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py 2012-04-13 11:30:48 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py 2012-04-18 10:37:20 +0000
@@ -542,7 +542,9 @@
542 self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE542 self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE
543543
544 vm = get_viewmanager()544 vm = get_viewmanager()
545 self.app_view.tree_view_scroll.get_vadjustment().set_value(0.0)545 adj = self.app_view.tree_view_scroll.get_vadjustment()
546 if adj:
547 adj.set_value(0.0)
546548
547 # yeah for special cases - as discussed on irc, mpt549 # yeah for special cases - as discussed on irc, mpt
548 # wants this to return to the category screen *if*550 # wants this to return to the category screen *if*
549551
=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-03-27 14:40:22 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-04-18 10:37:20 +0000
@@ -1913,7 +1913,9 @@
1913 self.pkg_statusbar.progress.set_fraction(progress / 100.0)1913 self.pkg_statusbar.progress.set_fraction(progress / 100.0)
1914 if progress >= 100:1914 if progress >= 100:
1915 self.pkg_statusbar.progress.set_fraction(1)1915 self.pkg_statusbar.progress.set_fraction(1)
1916 self.adjustment_value = self.get_vadjustment().get_value()1916 adj = self.get_vadjustment()
1917 if adj:
1918 self.adjustment_value = adj.get_value()
19171919
1918 def get_app_icon_details(self):1920 def get_app_icon_details(self):
1919 """ helper for unity dbus support to provide details about the1921 """ helper for unity dbus support to provide details about the
19201922
=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
--- softwarecenter/ui/gtk3/views/appview.py 2012-04-12 12:26:04 +0000
+++ softwarecenter/ui/gtk3/views/appview.py 2012-04-18 10:37:20 +0000
@@ -200,8 +200,10 @@
200 model.set_from_matches(matches)200 model.set_from_matches(matches)
201 self.set_model(model)201 self.set_model(model)
202202
203 self.tree_view_scroll.get_vadjustment().set_lower(self.vadj)203 adj = self.tree_view_scroll.get_vadjustment()
204 self.tree_view_scroll.get_vadjustment().set_value(self.vadj)204 if adj:
205 adj.set_lower(self.vadj)
206 adj.set_value(self.vadj)
205207
206 def reset_default_sort_mode(self):208 def reset_default_sort_mode(self):
207 """ force the appview to reset to the default sort method without209 """ force the appview to reset to the default sort method without

Subscribers

People subscribed via source and target branches