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

Proposed by Anthony Lenton on 2012-03-06
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) 2012-03-06 Approve on 2012-03-07
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.
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
1=== modified file 'softwarecenter/enums.py'
2--- softwarecenter/enums.py 2012-02-14 10:33:57 +0000
3+++ softwarecenter/enums.py 2012-03-06 20:59:22 +0000
4@@ -23,7 +23,7 @@
5 SOFTWARE_CENTER_PKGNAME = 'software-center'
6
7 # name of the app in the keyring, untranslated, see bug #773214 for the rational
8-SOFTWARE_CENTER_NAME_KEYRING = "Ubuntu Software Center Store"
9+SOFTWARE_CENTER_NAME_KEYRING = "Ubuntu Software Center"
10 SOFTWARE_CENTER_SSO_DESCRIPTION = _(
11 "To reinstall previous purchases, sign in to the "
12 "Ubuntu Single Sign-On account you used to pay for them.")
13
14=== modified file 'softwarecenter/ui/gtk3/app.py'
15--- softwarecenter/ui/gtk3/app.py 2012-02-29 17:23:24 +0000
16+++ softwarecenter/ui/gtk3/app.py 2012-03-06 20:59:22 +0000
17@@ -708,8 +708,8 @@
18
19 def _create_dbus_sso(self):
20 # see bug #773214 for the rationale
21- #appname = _("Ubuntu Software Center Store")
22- appname = "Ubuntu Software Center Store"
23+ #appname = _("Ubuntu Software Center")
24+ appname = "Ubuntu Software Center"
25 help_text = _("To reinstall previous purchases, sign in to the "
26 "Ubuntu Single Sign-On account you used to pay for them.")
27 #window = self.window_main.get_window()
28@@ -759,11 +759,7 @@
29 installed_purchased_packages)
30 if deauthorize:
31 # clear the ubuntu SSO token for this account
32- # FIXME: this needs to be consolidated - one token is
33- # aquired for purchase in utils/submit_review.py
34- # the other one in softwarecenter/app.py
35 clear_token_from_ubuntu_sso(_("Ubuntu Software Center"))
36- clear_token_from_ubuntu_sso(_("Ubuntu Software Center Store"))
37
38 # uninstall the list of purchased packages
39 # TODO: do we need to check for dependencies and show a removal