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

[Anthony Wong]

[Didier Roche-Tolomelli (didrocks)]

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)]

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

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2014-02-22 00:42:17 +0000
+++ debian/changelog	2015-01-09 09:30:06 +0000
@@ -1,3 +1,9 @@
+unity-china-music-scope (1.0.5-0ubuntu2) trusty-proposed; urgency=medium
+
+  *  Honour online search privacy setting. (LP: #1370353)
+
+ -- Anthony Wong <[e-mail]>  Fri, 09 Jan 2015 17:09:43 +0800
+
 unity-china-music-scope (1.0.5-0ubuntu1) trusty; urgency=low
 
   * New upstream release (LP: #1282933)

=== added directory 'debian/patches'
=== added file 'debian/patches/0001-honour-privacy.diff'
--- debian/patches/0001-honour-privacy.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-honour-privacy.diff	2015-01-09 09:30:06 +0000
@@ -0,0 +1,58 @@
+Description: Do not return search result when online search is disabled
+Author: Anthony Wong <[e-mail]>
+Origin: upstream
+Bug: https://bugs.launchpad.net/ubuntukylin/+bug/1370353
+Applied-Upstream: 1.0.7
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/musicbaidu-daemon.vala
++++ b/src/musicbaidu-daemon.vala
+@@ -51,15 +51,16 @@
+ {
+     private MusicBaiduCollection collection;
+     private Unity.MusicPreview? music_preview;
++/*add by sj*/
++    private PreferencesManager preferences = PreferencesManager.get_default ();
+ 
+     public MusicBaiduScopeProxy ()
+     {
+         base ();
+ 
+-
+         scope = new Unity.DeprecatedScope ("/com/canonical/unity/scope/musicbaidu", "musicbaidu.scope");
+ 
+-        scope.search_in_global = true;
++        scope.search_in_global = false;
+         scope.search_hint = _("Search Music Collection");
+         scope.visible = true;
+ 
+@@ -70,6 +71,10 @@
+         base.initialize ();
+ 
+         collection = new MusicBaiduCollection ();
++/*add by sj*/
++      preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
++
++
+ 
+         try
+         {
+@@ -180,6 +185,18 @@
+         if (is_search_empty (search))
+             return;
+ 
++/*add by sj*/
++      /**
++       * only perform the request if the user has not disabled
++       * online/commercial suggestions. That will hide the category as well.
++       */
++      if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
++      {
++        search.results_model.clear ();
++        return;
++      }
++
++
+         try
+         {
+             debug ("model has %u rows before search", search.results_model.get_n_rows ());

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2015-01-09 09:30:06 +0000
@@ -0,0 +1,1 @@
+0001-honour-privacy.diff