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
=== modified file 'debian/changelog'
--- debian/changelog 2012-01-10 21:00:13 +0000
+++ debian/changelog 2012-01-12 22:38:24 +0000
@@ -14,8 +14,11 @@
14 - do not add an icon to the Unity launcher for packages that do14 - do not add an icon to the Unity launcher for packages that do
15 not have an Exec entry in their corresponding desktop file,15 not have an Exec entry in their corresponding desktop file,
16 e.g. ubuntu-restricted-extras, wine (LP: #913756)16 e.g. ubuntu-restricted-extras, wine (LP: #913756)
17 * lp:~gary-lasker/software-center/fix-lp896474:
18 - fix crash when attempting to install or remove an item
19 via the menu (LP: #896474)
1720
18 -- Gary Lasker <gary.lasker@canonical.com> Tue, 10 Jan 2012 15:56:44 -050021 -- Gary Lasker <gary.lasker@canonical.com> Thu, 12 Jan 2012 17:33:06 -0500
1922
20software-center (5.1.5.1) precise; urgency=low23software-center (5.1.5.1) precise; urgency=low
2124
2225
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py 2012-01-06 16:59:29 +0000
+++ softwarecenter/ui/gtk3/app.py 2012-01-12 22:38:24 +0000
@@ -84,7 +84,8 @@
84from softwarecenter.ui.gtk3.panes.historypane import HistoryPane84from softwarecenter.ui.gtk3.panes.historypane import HistoryPane
85from softwarecenter.ui.gtk3.panes.globalpane import GlobalPane85from softwarecenter.ui.gtk3.panes.globalpane import GlobalPane
86from softwarecenter.ui.gtk3.panes.pendingpane import PendingPane86from softwarecenter.ui.gtk3.panes.pendingpane import PendingPane
87from softwarecenter.ui.gtk3.session.appmanager import ApplicationManager87from softwarecenter.ui.gtk3.session.appmanager import (ApplicationManager,
88 get_appmanager)
88from softwarecenter.ui.gtk3.session.viewmanager import (89from softwarecenter.ui.gtk3.session.viewmanager import (
89 ViewManager, get_viewmanager)90 ViewManager, get_viewmanager)
9091
@@ -769,11 +770,11 @@
769 770
770 def on_menuitem_install_activate(self, menuitem):771 def on_menuitem_install_activate(self, menuitem):
771 app = self.active_pane.get_current_app()772 app = self.active_pane.get_current_app()
772 self.on_application_request_action(self, app, [], [], AppActions.INSTALL)773 get_appmanager().request_action(app, [], [], AppActions.INSTALL)
773774
774 def on_menuitem_remove_activate(self, menuitem):775 def on_menuitem_remove_activate(self, menuitem):
775 app = self.active_pane.get_current_app()776 app = self.active_pane.get_current_app()
776 self.on_application_request_action(self, app, [], [], AppActions.REMOVE)777 get_appmanager().request_action(app, [], [], AppActions.REMOVE)
777 778
778 def on_menuitem_close_activate(self, widget):779 def on_menuitem_close_activate(self, widget):
779 Gtk.main_quit()780 Gtk.main_quit()

Subscribers

People subscribed via source and target branches