Merge lp:~mardy/unity-scope-gdrive/lp1054746 into lp:unity-scope-gdrive

[Alberto Mardegan]

Do not make any online queries if remote searches have been disabled.

[David King (amigadave)]

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Looking good, approved!

review: Approve

=== modified file 'unity-scope-gdocs'
--- unity-scope-gdocs	2012-09-26 08:07:31 +0000
+++ unity-scope-gdocs	2012-09-27 09:08:22 +0000
@@ -41,6 +41,9 @@
   def __init__ (self):
     self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdocs")
     self._scope.search_in_global = True;
+    self._preferences = Unity.PreferencesManager.get_default()
+    self._preferences.connect ("notify::remote-content-search",
+            self._on_filters_or_preferences_changed);
 
     self._gdocs_accounts = []
     self._account_manager = Accounts.Manager.new_for_service_type("documents")
@@ -55,7 +58,7 @@
     # Though it's possible to connect to a more-specific changed signal on each
     # Fitler, as we re-do the search anyway, this catch-all signal is perfect for
     # us.
-    self._scope.connect ("filters-changed", self._on_filters_changed);
+    self._scope.connect ("filters-changed", self._on_filters_or_preferences_changed);
     self._scope.export()
 
   def _on_enabled_event (self, account_manager, account_id):
@@ -75,6 +78,12 @@
   def _on_search_changed (self, scope, search, search_type, cancellable):
     search_string = search.props.search_string
     results = search.props.results_model
+    results.clear()
+
+    if self._preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+      search.emit("finished")
+      return
+
     if search_type == Unity.SearchType.GLOBAL:
       is_global = True
     else:
@@ -82,13 +91,12 @@
 
     print("Search changed to: '%s'" % search_string)
 
-    results.clear()
     for gdocs_account in self._gdocs_accounts:
       gdocs_account.update_results_model (search_string, results, is_global)
     search.emit("finished")
   
-  def _on_filters_changed (self, scope, param_spec=None):
-    scope.queue_search_changed(Unity.SearchType.DEFAULT)
+  def _on_filters_or_preferences_changed (self, *_):
+    self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
   
 
 class SignOnAuthorizer(GObject.Object, GData.Authorizer):