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

[Gary Lasker]

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

[lp:~gary-lasker/software-center/fix-lp896474]

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)

[Michael Vogt (mvo)]

Thanks for this fix!

review: Approve

=== 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 @@
     - do not add an icon to the Unity launcher for packages that do
       not have an Exec entry in their corresponding desktop file,
       e.g. ubuntu-restricted-extras, wine (LP: #913756)
+  * lp:~gary-lasker/software-center/fix-lp896474:
+    - fix crash when attempting to install or remove an item
+      via the menu (LP: #896474) 
 
- -- Gary Lasker <[e-mail]>  Tue, 10 Jan 2012 15:56:44 -0500
+ -- Gary Lasker <[e-mail]>  Thu, 12 Jan 2012 17:33:06 -0500
 
 software-center (5.1.5.1) precise; urgency=low
 
 
=== 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 @@
 from softwarecenter.ui.gtk3.panes.historypane import HistoryPane
 from softwarecenter.ui.gtk3.panes.globalpane import GlobalPane
 from softwarecenter.ui.gtk3.panes.pendingpane import PendingPane
-from softwarecenter.ui.gtk3.session.appmanager import ApplicationManager
+from softwarecenter.ui.gtk3.session.appmanager import (ApplicationManager,
+                                                       get_appmanager)
 from softwarecenter.ui.gtk3.session.viewmanager import (
     ViewManager, get_viewmanager)
 
@@ -769,11 +770,11 @@
         
     def on_menuitem_install_activate(self, menuitem):
         app = self.active_pane.get_current_app()
-        self.on_application_request_action(self, app, [], [], AppActions.INSTALL)
+        get_appmanager().request_action(app, [], [], AppActions.INSTALL)
 
     def on_menuitem_remove_activate(self, menuitem):
         app = self.active_pane.get_current_app()
-        self.on_application_request_action(self, app, [], [], AppActions.REMOVE)
+        get_appmanager().request_action(app, [], [], AppActions.REMOVE)
         
     def on_menuitem_close_activate(self, widget):
         Gtk.main_quit()