Ubuntu Software Center

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

  1. lp1047494
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 3209
Proposed branch: lp:~mvo/software-center/lp1047494
Merge into: lp:software-center
Diff against target: 49 lines (+3/-8)
1 file modified
softwarecenter/ui/gtk3/views/appdetailsview.py (+3/-8)
To merge this branch: bzr merge lp:~mvo/software-center/lp1047494
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+127299@code.launchpad.net

Description of the change

Small branch that fixes the crash #1047494 and also remove duplication of "self.app=" in and the different spellings for self.app_details vs self.appdetails.

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Thanks for this branch, Michael! This should do the trick, and the added bit of cleanup of ugly code is very nice.

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/views/appdetailsview.py'
2--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-09-20 01:26:42 +0000
3+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-10-01 14:53:46 +0000
4@@ -816,8 +816,6 @@
5 self.cache.connect("cache-ready", self._on_cache_ready)
6 self.connect("destroy", self._on_destroy)
7 self.datadir = softwarecenter.paths.datadir
8- self.app = None
9- self.appdetails = None
10 self.addons_to_install = []
11 self.addons_to_remove = []
12 self.properties_helper = AppPropertiesHelper(
13@@ -999,7 +997,7 @@
14 # the reviews become ready
15 # (we only check for pkgname currently to avoid breaking on
16 # software-center totem)
17- if self.app.pkgname != app.pkgname:
18+ if self.app is None or self.app.pkgname != app.pkgname:
19 return
20
21 # Start fetching relaxed reviews if we retrieved no data
22@@ -1735,9 +1733,6 @@
23 force = True
24 self.pkg_state = self.app_details.pkg_state
25
26- # for compat with the base class
27- self.appdetails = self.app_details
28-
29 # update content
30 # layout page
31 if same_app and not force:
32@@ -1795,7 +1790,7 @@
33 #parent_xid = get_parent_xid(self)
34 self.reviews.new_review.disable()
35 self.review_loader.spawn_write_new_review_ui(
36- self.app, version, self.appdetails.icon, origin,
37+ self.app, version, self.app_details.icon, origin,
38 parent_xid, self.datadir)
39
40 def _review_report_abuse(self, review_id):
41@@ -1814,7 +1809,7 @@
42 parent_xid = ''
43 #parent_xid = get_parent_xid(self)
44 self.review_loader.spawn_modify_review_ui(
45- parent_xid, self.appdetails.icon, self.datadir, review_id)
46+ parent_xid, self.app_details.icon, self.datadir, review_id)
47
48 def _review_delete(self, review_id):
49 parent_xid = ''

Subscribers

People subscribed via source and target branches