Ubuntu Software Center

Merge lp:~roignac/software-center/bug-805969 into lp:software-center

  1. bug-805969
  2. Merge into trunk
Proposed by Vadim Rutkovsky
Status: Merged
Merged at revision: 1968
Proposed branch: lp:~roignac/software-center/bug-805969
Merge into: lp:software-center
Diff against target: 47 lines (+5/-5)
1 file modified
softwarecenter/ui/gtk/app.py (+5/-5)
To merge this branch: bzr merge lp:~roignac/software-center/bug-805969
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+68610@code.launchpad.net

Description of the change

The fix for incorrect imports for backend and db modules - fixes 'Reinstall Previous Purchases' menu item

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/ui/gtk/app.py'
--- softwarecenter/ui/gtk/app.py 2011-07-18 22:42:21 +0000
+++ softwarecenter/ui/gtk/app.py 2011-07-20 21:34:28 +0000
@@ -567,7 +567,7 @@
567567
568 def _available_for_me_result(self, scagent, result_list):568 def _available_for_me_result(self, scagent, result_list):
569 #print "available_for_me_result", result_list569 #print "available_for_me_result", result_list
570 from db.update import add_from_purchased_but_needs_reinstall_data570 from softwarecenter.db.update import add_from_purchased_but_needs_reinstall_data
571 available_for_me_query = add_from_purchased_but_needs_reinstall_data(571 available_for_me_query = add_from_purchased_but_needs_reinstall_data(
572 result_list, self.db, self.cache)572 result_list, self.db, self.cache)
573 self.available_pane.on_previous_purchases_activated(available_for_me_query) 573 self.available_pane.on_previous_purchases_activated(available_for_me_query)
@@ -683,7 +683,7 @@
683 return False683 return False
684684
685 def on_menuitem_launchpad_private_ppas_activate(self, menuitem):685 def on_menuitem_launchpad_private_ppas_activate(self, menuitem):
686 from backend.launchpad import GLaunchpad686 from softwarecenter.backend.launchpad import GLaunchpad
687 self.glaunchpad = GLaunchpad()687 self.glaunchpad = GLaunchpad()
688 self.glaunchpad.connect("login-successful", self._on_lp_login)688 self.glaunchpad.connect("login-successful", self._on_lp_login)
689 from view.logindialog import LoginDialog689 from view.logindialog import LoginDialog
@@ -692,7 +692,7 @@
692692
693 def _create_buildin_sso_if_needed(self):693 def _create_buildin_sso_if_needed(self):
694 if not self.sso:694 if not self.sso:
695 from backend.restfulclient import UbuntuSSOlogin695 from softwarecenter.backend.restfulclient import UbuntuSSOlogin
696 self.sso = UbuntuSSOlogin()696 self.sso = UbuntuSSOlogin()
697 self.sso.connect("login-successful", self._on_sso_login)697 self.sso.connect("login-successful", self._on_sso_login)
698 def _login_via_buildin_sso(self):698 def _login_via_buildin_sso(self):
@@ -706,7 +706,7 @@
706706
707 def _create_dbus_sso_if_needed(self):707 def _create_dbus_sso_if_needed(self):
708 if not self.sso:708 if not self.sso:
709 from backend.login_sso import get_sso_backend709 from softwarecenter.backend.login_sso import get_sso_backend
710 appname = SOFTWARE_CENTER_NAME_KEYRING710 appname = SOFTWARE_CENTER_NAME_KEYRING
711 login_text = SOFTWARE_CENTER_SSO_DESCRIPTION711 login_text = SOFTWARE_CENTER_SSO_DESCRIPTION
712 self.sso = get_sso_backend(self.window_main.window.xid,712 self.sso = get_sso_backend(self.window_main.window.xid,
@@ -719,7 +719,7 @@
719719
720 def _create_scagent_if_needed(self):720 def _create_scagent_if_needed(self):
721 if not self.scagent:721 if not self.scagent:
722 from backend.scagent import SoftwareCenterAgent722 from softwarecenter.backend.scagent import SoftwareCenterAgent
723 self.scagent = SoftwareCenterAgent(xid=self.window_main.window.xid)723 self.scagent = SoftwareCenterAgent(xid=self.window_main.window.xid)
724 self.scagent.connect("available-for-me", self._available_for_me_result)724 self.scagent.connect("available-for-me", self._available_for_me_result)
725 725