Ubuntu Software Center

Merge lp:~elachuni/software-center/dont-store into lp:software-center

  1. dont-store
  2. Merge into trunk
Proposed by Anthony Lenton
Status: Merged
Merged at revision: 2812
Proposed branch: lp:~elachuni/software-center/dont-store
Merge into: lp:software-center
Diff against target: 39 lines (+3/-7)
2 files modified
softwarecenter/enums.py (+1/-1)
softwarecenter/ui/gtk3/app.py (+2/-6)
To merge this branch: bzr merge lp:~elachuni/software-center/dont-store
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+96238@code.launchpad.net

Description of the change

Overview
========
A small branch to consolidate logins always report "Ubuntu Software Center"

Details
=======
There were two call sites to ussoc's login_or_register, one using "Ubuntu Software Center" as the app name, and the other using "Ubuntu Software Center Store". Besides displaying an inconsistent UI and storing two keys in the keyring when only one is needed, when you tried to review an app for the first time it would prompt you for login *twice*, once with each app name.

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Looks great! Many thanks, Anthony!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py 2012-02-14 10:33:57 +0000
+++ softwarecenter/enums.py 2012-03-06 20:59:22 +0000
@@ -23,7 +23,7 @@
23SOFTWARE_CENTER_PKGNAME = 'software-center'23SOFTWARE_CENTER_PKGNAME = 'software-center'
2424
25# name of the app in the keyring, untranslated, see bug #773214 for the rational25# name of the app in the keyring, untranslated, see bug #773214 for the rational
26SOFTWARE_CENTER_NAME_KEYRING = "Ubuntu Software Center Store"26SOFTWARE_CENTER_NAME_KEYRING = "Ubuntu Software Center"
27SOFTWARE_CENTER_SSO_DESCRIPTION = _(27SOFTWARE_CENTER_SSO_DESCRIPTION = _(
28 "To reinstall previous purchases, sign in to the "28 "To reinstall previous purchases, sign in to the "
29 "Ubuntu Single Sign-On account you used to pay for them.")29 "Ubuntu Single Sign-On account you used to pay for them.")
3030
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py 2012-02-29 17:23:24 +0000
+++ softwarecenter/ui/gtk3/app.py 2012-03-06 20:59:22 +0000
@@ -708,8 +708,8 @@
708708
709 def _create_dbus_sso(self):709 def _create_dbus_sso(self):
710 # see bug #773214 for the rationale710 # see bug #773214 for the rationale
711 #appname = _("Ubuntu Software Center Store")711 #appname = _("Ubuntu Software Center")
712 appname = "Ubuntu Software Center Store"712 appname = "Ubuntu Software Center"
713 help_text = _("To reinstall previous purchases, sign in to the "713 help_text = _("To reinstall previous purchases, sign in to the "
714 "Ubuntu Single Sign-On account you used to pay for them.")714 "Ubuntu Single Sign-On account you used to pay for them.")
715 #window = self.window_main.get_window()715 #window = self.window_main.get_window()
@@ -759,11 +759,7 @@
759 installed_purchased_packages)759 installed_purchased_packages)
760 if deauthorize:760 if deauthorize:
761 # clear the ubuntu SSO token for this account761 # clear the ubuntu SSO token for this account
762 # FIXME: this needs to be consolidated - one token is
763 # aquired for purchase in utils/submit_review.py
764 # the other one in softwarecenter/app.py
765 clear_token_from_ubuntu_sso(_("Ubuntu Software Center"))762 clear_token_from_ubuntu_sso(_("Ubuntu Software Center"))
766 clear_token_from_ubuntu_sso(_("Ubuntu Software Center Store"))
767 763
768 # uninstall the list of purchased packages764 # uninstall the list of purchased packages
769 # TODO: do we need to check for dependencies and show a removal765 # TODO: do we need to check for dependencies and show a removal