Merge lp:~didrocks/gwibber/disable-online-search-support into lp:gwibber

[Didier Roche]

Add disabling online search support (LP: #1054746)

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-09-20 04:55:42 +0000
+++ configure.ac	2012-09-27 07:14:33 +0000
@@ -130,7 +130,7 @@
 DBUSMENU_REQUIRED=0.4
 INDICATE_REQUIRED=0.5
 LIBNOTIFY_REQUIRED=0.7
-UNITY_REQUIRED=6.5.1
+UNITY_REQUIRED=6.7
 PKG_CHECK_MODULES(BASE,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED

=== modified file 'lens/src/daemon.vala'
--- lens/src/daemon.vala	2012-09-18 23:38:24 +0000
+++ lens/src/daemon.vala	2012-09-27 07:14:33 +0000
@@ -36,6 +36,7 @@
   {
     private Unity.Lens lens;
     private Unity.Scope scope;
+    private Unity.PreferencesManager preferences = Unity.PreferencesManager.get_default ();
     private Gwibber.Streams streams_service;
     private Gwibber.Service service;
     private Gwibber.Accounts accounts;
@@ -110,6 +111,11 @@
         scope.queue_search_changed (SearchType.DEFAULT);
       });
 
+      preferences.notify["remote-content-search"].connect ((obj, pspec) =>
+      {
+        scope.queue_search_changed (SearchType.DEFAULT);
+      });
+
       try
       {
         lens.export ();
@@ -248,6 +254,17 @@
 
     private async void update_global_search (LensSearch search, Cancellable cancellable)
     {
+      /**
+       * 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 ();
+        search.finished ();
+        return;
+      }
+
       var results_model = scope.global_results_model;
 
       // FIXME: no results for home screen of the dash?
@@ -264,6 +281,17 @@
 
     private async void update_scope_search  (LensSearch search, Cancellable cancellable)
     {
+      /**
+       * 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 ();
+        search.finished ();
+        return;
+      }
+
       var results_model = search.results_model;
 
       update_results_model (results_model, search.search_string, null);