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

[Michal Hruby]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Functionally: All linked bugs confirmed fixed, and no regression detected.

Code wise: Everything looks good

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-10-03 11:59:04 +0000
+++ src/daemon.vala	2011-10-05 10:53:26 +0000
@@ -343,7 +343,8 @@
       scope.freeze_notify ();
 
       var model = scope.results_model;
-      model.clear ();
+      /* We'll clear the model once we finish waiting for the dbus-call
+       * to finish, to prevent flicker. */
 
       debug ("Searching for: %s", search.search_string);
       
@@ -356,30 +357,15 @@
       bool has_search = !Utils.search_is_invalid (search);
       
       Timer timer = new Timer ();
-      Set<string> installed_uris = new HashSet<string> ();
-      Set<string> available_uris = new HashSet<string> ();
-      var appresults = appsearcher.search (pkg_search_string, 0,
-                                           Unity.Package.SearchType.PREFIX,
-                                           has_search ?
-                                              Unity.Package.Sort.BY_RELEVANCY :
-                                              Unity.Package.Sort.BY_NAME);
-      add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Category.INSTALLED);
-      
-      timer.stop ();
-      debug ("Entry search listed %i Installed apps in %fms for query: %s",
-             appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
-      
-      /* We force a flush of the shared model's revision queue here because
-       * generally the search for Installed apps is orders of magnitude faster
-       * than the search for Most Popular and Available apps.
-       * So we can update the UI quicker */
-      (model as Dee.SharedModel).flush_revision_queue ();
-      
+
       var zg_search_string = prepare_zg_search_string (search, type_id);
 
+      /* Even though the Installed apps search is super fast, we wait here
+       * for the Most Popular search to finish, because otherwise we'll update
+       * the Installed category too soon and this will cause flicker
+       * in the Dash. (lp:868192) */
+
       try {
-        timer.start ();
         debug ("SEARCH_STRING: %s", zg_search_string);
         var results = yield zg_index.search (zg_search_string,
                                              new Zeitgeist.TimeRange.anytime(),
@@ -389,6 +375,7 @@
                                              Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
                                              null);
 
+        model.clear ();
         append_events_with_category (results, model, Category.MOST_USED);
         
         timer.stop ();
@@ -399,8 +386,24 @@
       } catch (GLib.Error e) {
         warning ("Error performing search '%s': %s",
                  search.search_string, e.message);
+        model.clear ();
       }
+
+      timer.start ();      
+      Set<string> installed_uris = new HashSet<string> ();
+      Set<string> available_uris = new HashSet<string> ();
+      var appresults = appsearcher.search (pkg_search_string, 0,
+                                           Unity.Package.SearchType.PREFIX,
+                                           has_search ?
+                                              Unity.Package.Sort.BY_RELEVANCY :
+                                              Unity.Package.Sort.BY_NAME);
+      add_pkg_search_result (appresults, installed_uris, available_uris, model,
+                             Category.INSTALLED);
       
+      timer.stop ();
+      debug ("Entry search listed %i Installed apps in %fms for query: %s",
+             appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
+
       /* We force a flush of the shared model's revision queue here because
        * generally the search for Most Used apps has a small result set,
        * while the one for Available apps may be huge. The huge result set
@@ -623,6 +626,13 @@
         string desktop_id = Path.get_basename (pkginfo.desktop_file);
         string full_path;
 
+        /* S-C uses "app_name:desktop_id.desktop", get rid of the prefix */
+        int colon_pos = desktop_id.index_of (":");
+        if (colon_pos > 0)
+        {
+          desktop_id = desktop_id[colon_pos+1:desktop_id.length];
+        }
+
         AppInfo? app = appmanager.lookup (desktop_id);
         full_path = appmanager.get_path (desktop_id);
         
@@ -791,17 +801,24 @@
             }
         
           /* Assert that we indeed have a known application as actor */
-          AppInfo? app = Utils.get_app_info_for_actor (app_uri);
-          
+          string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
+          string full_path;
+
+          var appmanager = AppInfoManager.get_instance ();
+          AppInfo? app = appmanager.lookup (desktop_id);
+
           if (app == null)
             continue;
           
           if (!app.should_show ())
-            continue;          
-          
+            continue;
+
+          full_path = appmanager.get_path (desktop_id);
+          string full_uri = full_path != null ? "file://" + full_path : app_uri;
+
           results.append (app_uri, app.get_icon().to_string(), category_id,
                           "application/x-desktop", app.get_display_name (),
-                          app.get_description (), app_uri);
+                          app.get_description (), full_uri);
         }
     }
     
 
=== modified file 'src/utils.vala'
--- src/utils.vala	2011-09-07 18:59:14 +0000
+++ src/utils.vala	2011-10-05 10:53:26 +0000
@@ -57,13 +57,12 @@
   public string get_desktop_id_for_actor (string actor)
   {
     if (actor.has_prefix("application://"))
-      return actor.substring(14).dup();
+      return actor.substring(14);
     else if (actor.has_prefix("app://"))
-      return actor.substring(6).dup();
+      return actor.substring(6);
     else if (actor.has_prefix("/"))
       {
-        var f = File.new_for_path (actor);
-        return f.get_basename ();
+        return Path.get_basename (actor);
       }
     
     /* At this point we assume that @actor is already the basename of the