Merge lp:~stolowski/unity-scope-home/fix-cancellables into lp:unity-scope-home

[Paweł Stołowski]

Don't maintain own instances of cancellables. Use cancellable from search context.

[Michal Hruby (mhr3)]

Looks good, fewer objects == better :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/90/rebuild

review: Approve (continuous-integration)

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-09-19 13:57:34 +0000
+++ src/scope.vala	2013-09-20 16:44:16 +0000
@@ -47,7 +47,6 @@
   private SmartScopes.ChannelIdMap channel_id_map = new SmartScopes.ChannelIdMap ();
   private uint metrics_timer;
   private int remote_scopes_retry_count = 0;
-  private HashTable<string, GLib.Cancellable?> search_cancel = new HashTable<string, GLib.Cancellable?> (str_hash, str_equal);
   private RemoteScopeRegistry remote_scope_registry;
   private uint category_reorder_time_ms = 0; // minimum time after which category reordering can happen (in milliseconds)
   private uint flush_delay_ms = 0; //minimum time after which results will be shown in the dash (in milliseconds)
@@ -605,18 +604,10 @@
 
     init_sss_client ();
 
+    GLib.Cancellable cancellable = scope_search.search_context.cancellable.get_gcancellable();
+
     CategoryManager.instance ().observe (scope_search.channel_id, scope_search.results_model);
 
-    GLib.Cancellable? prev_search = search_cancel.lookup (scope_search.channel_id);
-    if (prev_search != null)
-    {
-      debug ("Cancelling previous search query for channel: %s", scope_search.channel_id);
-      prev_search.cancel ();
-    }
-
-    GLib.Cancellable cancellable = new GLib.Cancellable ();
-    search_cancel.insert (scope_search.channel_id, cancellable);
-
     bool wait_for_sss_query = false;
     bool wait_for_push = false;
     bool wait_for_search = false;
@@ -1142,7 +1133,6 @@
     }
 
     debug ("All search activities finished");
-    search_cancel.remove (scope_search.channel_id);
   }
 
   public override int category_index_for_scope_id (string scope_id)