Merge lp:~mvo/software-center/lp959612 into lp:software-center/5.2

Proposed by Michael Vogt on 2012-05-11
Status: Merged
Merged at revision: 3006
Proposed branch: lp:~mvo/software-center/lp959612
Merge into: lp:software-center/5.2
Diff against target: 27 lines (+1/-5)
2 files modified
softwarecenter/ui/gtk3/panes/availablepane.py (+0/-5)
softwarecenter/ui/gtk3/panes/installedpane.py (+1/-0)
To merge this branch: bzr merge lp:~mvo/software-center/lp959612
Reviewer Review Type Date Requested Status
Gary Lasker (community) 2012-05-11 Approve on 2012-05-14
Dave Morley (community) testing the code did as expected Approve on 2012-05-11
Review via email: mp+105472@code.launchpad.net

Description of the change

This branch fixes bug #955912. To reproduce:

1. open stock software-center
2. click on "installed" very quickly while the main page is still loading
3. verify that there is a traceback (note that this does not happen always, just most of the time)

4. use the fixed branch and the problem should be gone

I also removed unneeded code that displays the lobby page again when its finished loading to avoid a
jump back to the lobby.

To post a comment you must log in.
Dave Morley (davmor2) wrote :

Confirmed this code is now functioning as expexted for me, no trace back no transfer back to the lobby page either

review: Approve (testing the code did as expected)
Gary Lasker (gary-lasker) wrote :

Looks good, you found the right spot for @wait_for_apt_cache_ready! Very nice!

Thanks, I will merge this now.

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-23 13:59:12 +0000
3+++ softwarecenter/ui/gtk3/panes/availablepane.py 2012-05-11 12:23:17 +0000
4@@ -236,11 +236,6 @@
5 # again (LP: #851671)
6 self.view_initialized = True
7
8- vm = get_viewmanager()
9- vm.display_page(
10- self, AvailablePane.Pages.LOBBY,
11- self.state, self.display_lobby_page)
12-
13 if window is not None:
14 window.set_cursor(None)
15
16
17=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
18--- softwarecenter/ui/gtk3/panes/installedpane.py 2012-04-10 08:36:45 +0000
19+++ softwarecenter/ui/gtk3/panes/installedpane.py 2012-05-11 12:23:17 +0000
20@@ -704,6 +704,7 @@
21 self.emit("app-list-changed", len(model))
22 self.searchentry.show()
23
24+ @wait_for_apt_cache_ready
25 def display_overview_page(self, page, view_state):
26 LOG.debug("view_state: %s" % view_state)
27 if self.current_hostid:

Subscribers

People subscribed via source and target branches