Merge lp:~mhr3/unity-lens-applications/fix-986191 into lp:unity-lens-applications

[Michal Hruby]

Don't linger if Zeitgeist fails to start

A bug in libzeitgeist causes that if zeitgeist fails to start, async methods linger indefinitely, which means the lens is just waiting for zeitgeist to returns either results or an error, but none of these happens, and the lens appears non functional.

Reset the flag which causes us to wait for zeitgeist results immediately, so only the first search will fail - successive searches will then work properly.

[Gord Allott (gordallott)]

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-04-18 22:50:48 +0000
+++ src/daemon.vala	2012-04-23 14:04:22 +0000
@@ -211,6 +211,9 @@
     {
       if (popularities_dirty)
       {
+        popularities_dirty = false;
+        // we're not passing the cancellable, cause cancelling this search
+        // shouldn't cancel getting most popular apps
         yield update_popularities ();
         if (cancellable.is_cancelled ()) return;
       }
@@ -435,7 +438,6 @@
       {
         warning ("%s", err.message);
       }
-      popularities_dirty = false;
     }
 
     private async void update_scope_search (Unity.LensSearch search,