Merge lp:~anthonywong/ubuntu/trusty/unity-china-music-scope/lp1370353 into lp:ubuntu/trusty/unity-china-music-scope

Proposed by Anthony Wong
Status: Merged
Approved by: Didier Roche
Approved revision: 7
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~anthonywong/ubuntu/trusty/unity-china-music-scope/lp1370353
Merge into: lp:ubuntu/trusty/unity-china-music-scope
Diff against target: 84 lines (+65/-0)
3 files modified
debian/changelog (+6/-0)
debian/patches/0001-honour-privacy.diff (+58/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~anthonywong/ubuntu/trusty/unity-china-music-scope/lp1370353
Reviewer Review Type Date Requested Status
Didier Roche Approve
Review via email: mp+245933@code.launchpad.net
To post a comment you must log in.
Didier Roche (didrocks) wrote :

The backport looks good to me and the bug follow the SRU process, good work!
Waiting in trusty SRU queue now.

review: Approve
Sebastien Bacher (seb128) wrote :

setting as merged since it has been uploaded (so it gets out of the sponsoring queue)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file '.pc/applied-patches'
2=== modified file 'debian/changelog'
3--- debian/changelog 2014-02-22 00:42:17 +0000
4+++ debian/changelog 2015-01-09 09:30:06 +0000
5@@ -1,3 +1,9 @@
6+unity-china-music-scope (1.0.5-0ubuntu2) trusty-proposed; urgency=medium
7+
8+ * Honour online search privacy setting. (LP: #1370353)
9+
10+ -- Anthony Wong <anthony.wong@ubuntu.com> Fri, 09 Jan 2015 17:09:43 +0800
11+
12 unity-china-music-scope (1.0.5-0ubuntu1) trusty; urgency=low
13
14 * New upstream release (LP: #1282933)
15
16=== added directory 'debian/patches'
17=== added file 'debian/patches/0001-honour-privacy.diff'
18--- debian/patches/0001-honour-privacy.diff 1970-01-01 00:00:00 +0000
19+++ debian/patches/0001-honour-privacy.diff 2015-01-09 09:30:06 +0000
20@@ -0,0 +1,58 @@
21+Description: Do not return search result when online search is disabled
22+Author: Anthony Wong <anthony.wong@ubuntu.com>
23+Origin: upstream
24+Bug: https://bugs.launchpad.net/ubuntukylin/+bug/1370353
25+Applied-Upstream: 1.0.7
26+---
27+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
28+--- a/src/musicbaidu-daemon.vala
29++++ b/src/musicbaidu-daemon.vala
30+@@ -51,15 +51,16 @@
31+ {
32+ private MusicBaiduCollection collection;
33+ private Unity.MusicPreview? music_preview;
34++/*add by sj*/
35++ private PreferencesManager preferences = PreferencesManager.get_default ();
36+
37+ public MusicBaiduScopeProxy ()
38+ {
39+ base ();
40+
41+-
42+ scope = new Unity.DeprecatedScope ("/com/canonical/unity/scope/musicbaidu", "musicbaidu.scope");
43+
44+- scope.search_in_global = true;
45++ scope.search_in_global = false;
46+ scope.search_hint = _("Search Music Collection");
47+ scope.visible = true;
48+
49+@@ -70,6 +71,10 @@
50+ base.initialize ();
51+
52+ collection = new MusicBaiduCollection ();
53++/*add by sj*/
54++ preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
55++
56++
57+
58+ try
59+ {
60+@@ -180,6 +185,18 @@
61+ if (is_search_empty (search))
62+ return;
63+
64++/*add by sj*/
65++ /**
66++ * only perform the request if the user has not disabled
67++ * online/commercial suggestions. That will hide the category as well.
68++ */
69++ if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
70++ {
71++ search.results_model.clear ();
72++ return;
73++ }
74++
75++
76+ try
77+ {
78+ debug ("model has %u rows before search", search.results_model.get_n_rows ());
79
80=== added file 'debian/patches/series'
81--- debian/patches/series 1970-01-01 00:00:00 +0000
82+++ debian/patches/series 2015-01-09 09:30:06 +0000
83@@ -0,0 +1,1 @@
84+0001-honour-privacy.diff

Subscribers

People subscribed via source and target branches

to all changes: