Merge lp:~didrocks/unity-lens-wikipedia/disable-online-search-support into lp:unity-lens-wikipedia

[Didier Roche]

Add online search disable support.

=== modified file 'src/unity-lens-wikipedia'
--- src/unity-lens-wikipedia	2012-06-09 20:20:01 +0000
+++ src/unity-lens-wikipedia	2012-09-27 07:38:22 +0000
@@ -48,15 +48,27 @@
         locale.setlocale(locale.LC_MESSAGES, '')
         loc = locale.getlocale(locale.LC_MESSAGES)[0].split("_")[0]
         self.wiki = ["http://%s.wikipedia.org" % (loc)]
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self._on_preference_changed)
         self._lens.export ();
         self._scope.export ();
 
+    def _on_preference_changed (self, *_):
+        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
     def on_search_changed (self, scope, search, search_type, *_):
+        model = search.props.results_model
+        model.clear ()
+
+        # 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
+
         if search_type is Unity.SearchType.DEFAULT:
             search_string = search.props.search_string.strip ()
             print "Search changed to \"%s\"" % search_string
-            model = search.props.results_model
-            model.clear ()
             self.update_results_model(model, search_string)
             search.set_reply_hint ("no-results-hint", GLib.Variant.new_string("Sorry, there are no articles that match your search."))
         search.finished ()