Merge lp:~stolowski/unity-lens-video/handle-cancellation-exception into lp:~unity-team/unity-lens-video/libunity7-compatible

[Paweł Stołowski]

Handle an exception when search is cancelled, so that search.finished() is always signalled.

Handle an exception when search is cancelled, so that search.finished() is always signalled.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/2/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/remote-scope.vala'
--- src/remote-scope.vala	2013-04-11 14:38:11 +0000
+++ src/remote-scope.vala	2013-04-11 15:37:35 +0000
@@ -353,7 +353,14 @@
       {
         if (at_least_one_source_is_on (active_sources))
         {
-          yield perform_search (search_string, search, active_sources, cancellable);
+          try
+          {
+            yield perform_search (search_string, search, active_sources, cancellable);
+          }
+          catch (Error e)
+          {
+            warning ("Search interrupted: %s", e.message);
+          }
         }
       }
 
@@ -381,7 +388,7 @@
 
     /* Query the server with the search string and the list of sources.
      */
-    private async void perform_search (string search_string, DeprecatedScopeSearch search, Gee.ArrayList<string> active_sources, GLib.Cancellable? cancellable)
+    private async void perform_search (string search_string, DeprecatedScopeSearch search, Gee.ArrayList<string> active_sources, GLib.Cancellable? cancellable) throws Error
     {
       search.results_model.clear ();