Merge lp:~gary-lasker/software-center/for-purchase-menu-fix into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2631
Proposed branch: lp:~gary-lasker/software-center/for-purchase-menu-fix
Merge into: lp:software-center
Diff against target: 30 lines (+7/-2)
2 files modified
debian/changelog (+6/-1)
softwarecenter/backend/channel_impl/aptchannels.py (+1/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/for-purchase-menu-fix
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+87548@code.launchpad.net

Description of the change

Small fix to restore the correct text for the "For Purchase" item in the toolbar menus (it was being displayed as "Unknown"). Fix for bug 911964.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Good catch! Thanks Gary.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-04 23:28:43 +0000
3+++ debian/changelog 2012-01-04 23:48:32 +0000
4@@ -19,7 +19,12 @@
5 delays some computations and adds a cheaper way for getting the
6 appcount
7
8- -- Gary Lasker <gary.lasker@canonical.com> Wed, 04 Jan 2012 18:26:26 -0500
9+ [ Gary Lasker ]
10+ * softwarecenter/backend/channel_impl/aptchannels.py:
11+ - display the correct label text for the For Purchase menu item
12+ in the toolbar (LP: #911964)
13+
14+ -- Gary Lasker <gary.lasker@canonical.com> Wed, 04 Jan 2012 18:37:19 -0500
15
16 software-center (5.1.4) precise; urgency=low
17
18
19=== modified file 'softwarecenter/backend/channel_impl/aptchannels.py'
20--- softwarecenter/backend/channel_impl/aptchannels.py 2012-01-04 09:13:58 +0000
21+++ softwarecenter/backend/channel_impl/aptchannels.py 2012-01-04 23:48:32 +0000
22@@ -258,7 +258,7 @@
23
24 # create a "magic" channel to display items available for purchase
25 for_purchase_query = xapian.Query("AH" + AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME)
26- for_purchase_channel = SoftwareChannel("For Purchase", None, None,
27+ for_purchase_channel = SoftwareChannel("For Purchase", "software-center-agent", None,
28 channel_icon=None, # FIXME: need an icon
29 channel_query=for_purchase_query,
30 installed_only=installed_only)

Subscribers

People subscribed via source and target branches