Merge lp:~gary-lasker/software-center/fix-lp896474 into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2650
Proposed branch: lp:~gary-lasker/software-center/fix-lp896474
Merge into: lp:software-center
Diff against target: 44 lines (+8/-4)
2 files modified
debian/changelog (+4/-1)
softwarecenter/ui/gtk3/app.py (+4/-3)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-lp896474
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+88436@code.launchpad.net

Description of the change

A very simple fix for the install/remove menu items that were broken a while back when we did the big ApplicationManager refactor.

To post a comment you must log in.
2650. By Gary Lasker on 2012-01-12

* lp:~gary-lasker/software-center/fix-lp896474:
  - fix crash when attempting to install or remove an item
    via the menu (LP: #896474)

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for this fix!

review: Approve

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-01-10 21:00:13 +0000
3+++ debian/changelog 2012-01-12 22:38:24 +0000
4@@ -14,8 +14,11 @@
5 - do not add an icon to the Unity launcher for packages that do
6 not have an Exec entry in their corresponding desktop file,
7 e.g. ubuntu-restricted-extras, wine (LP: #913756)
8+ * lp:~gary-lasker/software-center/fix-lp896474:
9+ - fix crash when attempting to install or remove an item
10+ via the menu (LP: #896474)
11
12- -- Gary Lasker <gary.lasker@canonical.com> Tue, 10 Jan 2012 15:56:44 -0500
13+ -- Gary Lasker <gary.lasker@canonical.com> Thu, 12 Jan 2012 17:33:06 -0500
14
15 software-center (5.1.5.1) precise; urgency=low
16
17
18=== modified file 'softwarecenter/ui/gtk3/app.py'
19--- softwarecenter/ui/gtk3/app.py 2012-01-06 16:59:29 +0000
20+++ softwarecenter/ui/gtk3/app.py 2012-01-12 22:38:24 +0000
21@@ -84,7 +84,8 @@
22 from softwarecenter.ui.gtk3.panes.historypane import HistoryPane
23 from softwarecenter.ui.gtk3.panes.globalpane import GlobalPane
24 from softwarecenter.ui.gtk3.panes.pendingpane import PendingPane
25-from softwarecenter.ui.gtk3.session.appmanager import ApplicationManager
26+from softwarecenter.ui.gtk3.session.appmanager import (ApplicationManager,
27+ get_appmanager)
28 from softwarecenter.ui.gtk3.session.viewmanager import (
29 ViewManager, get_viewmanager)
30
31@@ -769,11 +770,11 @@
32
33 def on_menuitem_install_activate(self, menuitem):
34 app = self.active_pane.get_current_app()
35- self.on_application_request_action(self, app, [], [], AppActions.INSTALL)
36+ get_appmanager().request_action(app, [], [], AppActions.INSTALL)
37
38 def on_menuitem_remove_activate(self, menuitem):
39 app = self.active_pane.get_current_app()
40- self.on_application_request_action(self, app, [], [], AppActions.REMOVE)
41+ get_appmanager().request_action(app, [], [], AppActions.REMOVE)
42
43 def on_menuitem_close_activate(self, widget):
44 Gtk.main_quit()

Subscribers

People subscribed via source and target branches