Merge lp:~didrocks/unity-lens-video/add-disabling-remote-search into lp:unity-lens-video/remote-videos-scope-trunk

[Didier Roche]

add conditional search activation to the remote lens (LP: #1054746)

add conditional search activation to the remote lens (LP: #1054746)

[David Callé (davidc3)]

Effective way to disable search and results. Looks and works fine.

[David Callé (davidc3)]

review: Approve

[lp:~didrocks/unity-lens-video/add-disabling-remote-search]

59. By Didier Roche on 2012-09-26

listen to preference change and pend a new search once done. Remove an info message

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-09-25 10:40:35 +0000
+++ src/unity-scope-video-remote	2012-09-26 13:13:21 +0000
@@ -83,9 +83,9 @@
         self.scope.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
         self.scope.connect("notify::active", self.on_lens_active)
-        self.scope.connect("filters-changed", self.on_filtering_changed)
+        self.scope.connect("filters-changed", self.on_filtering_or_preference_changed)
         self.scope.props.sources.connect("notify::filtering",
-            self.on_filtering_changed)
+            self.on_filtering_or_preference_changed)
         self.scope.connect ("activate-uri", self.on_activate_uri)
         self.scope.connect('preview-uri', self.on_preview_uri)
         self.session = Soup.SessionAsync()
@@ -93,6 +93,8 @@
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
         self.query_list_of_sources()
         self.update_recommendations()
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_filtering_or_preference_changed)
         self.scope.export()
 
     def update_recommendations(self):
@@ -147,8 +149,8 @@
             dt = RETRY_INTERVAL
         GLib.timeout_add_seconds(dt, self.query_list_of_sources)
 
-    def on_filtering_changed(self, *_):
-        """Run another search when a filter change is notified."""
+    def on_filtering_or_preference_changed(self, *_):
+        """Run another search when a filter or preference change is notified."""
         self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
     def on_lens_active(self, *_):
@@ -182,8 +184,15 @@
         # note search_string is a utf-8 encoded string, now:
         print "Remote scope search changed to %r" % search_string
         model = search.props.results_model
+        # Clear results details map
         model.clear()
-        # Clear results details map
+
+        # only perform the request if the user has not disabled
+        # online/commercial suggestions. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            search.finished()
+            return
+
         # Create a list of activated sources
         sources = [source for source in self.sources_list
                    if self.source_activated(source)]