Merge lp:~stolowski/unity-lens-applications/unity-lens-applications.formatting-fixes into lp:unity-lens-applications

[Paweł Stołowski]

Formatting fixes

Formatting fixes.

[Michal Hruby (mhr3)]

549 {
550 - case Category.INSTALLED:
551 + case Category.INSTALLED:
552 case Category.APPLICATIONS:

Haha, gotcha! :)

Overall looking good, but the branch still mixes curly braces on newline and not, don't we want to fix that as well?

[Michal Hruby (mhr3)]

Missed that this is ready. +1

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~stolowski/unity-lens-applications/unity-lens-applications.previews has not yet been merged into lp:unity-lens-applications.

[lp:~stolowski/unity-lens-applications/unity-lens-applications.formatting-fixes]

315. By Paweł Stołowski on 2012-08-21

Merged trunk.

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-08-16 08:30:47 +0000
+++ src/daemon.vala	2012-08-21 12:26:20 +0000
@@ -42,17 +42,17 @@
      * the Xapian index from the Software Center */
     private Unity.Package.Searcher? pkgsearcher;
     public Unity.Package.Searcher appsearcher;
-    
+
     /* Read the app ratings dumped by the Software Center */
     private Unity.Ratings.Database? ratings;
 
     private Unity.Lens lens;
     private Unity.Scope scope;
-    
+
     /* Support aptd dbus interface; created when application install/remove was requested by preview action */
-	private AptdProxy aptdclient;
-	private AptdTransactionProxy aptd_transaction;
-    
+    private AptdProxy aptdclient;
+    private AptdTransactionProxy aptd_transaction;
+
     /* Maps demangled names to mangled names expected by S-C xapian DB (e.g. kde4-KCharSelect.desktop -> kde4__KCharSelect.desktop).
        There are very few apps that need this and we only store mappings when needed, so it takes very little memory.
      */
@@ -83,14 +83,14 @@
 
     private Gee.List<string> image_extensions;
     private HashTable<string,Icon> file_icon_cache;
-    
+
     /* Monitor the favorite apps in the launcher, so we can filter them
      * out of the results for Recent Apps */
     private Unity.LauncherFavorites favorite_apps;
     private AppWatcher app_watcher;
 
     private PtrArray zg_templates;
-    
+
     /* Gnome menu structure - also used to check whether apps are installed */
     private uint app_menu_changed_reindex_timeout = 0;
     private GMenu.Tree app_menu = null;
@@ -118,7 +118,7 @@
       monitor.events_inserted.connect (mark_dirty);
       monitor.events_deleted.connect (mark_dirty);
       log.install_monitor (monitor);
-      
+
       popularity_map = new HashMap<string, int> ();
       popularities_dirty = true;
       // refresh the popularities every now and then
@@ -134,17 +134,17 @@
 
       pkgsearcher = new Unity.Package.Searcher ();
       if (pkgsearcher == null)
-        {
-          critical ("Failed to load Software Center index. 'Apps Available for Download' will not be listed");
-        }
-      
+      {
+        critical ("Failed to load Software Center index. 'Apps Available for Download' will not be listed");
+      }
+
       try {
         ratings = new Unity.Ratings.Database ();
       } catch (FileError e) {
         warning (e.message);
         ratings = null;
       }
-      
+
       /* Image file extensions in order of popularity */
       image_extensions = new Gee.ArrayList<string> ();
       image_extensions.add ("png");
@@ -182,7 +182,7 @@
       {
         dispatch_search (lens_search, search_type, cancellable);
       });
-      
+
       /* Re-do the search if the filters changed */
       scope.filters_changed.connect (() =>
       {
@@ -200,10 +200,10 @@
 
       /* Listen for changes in the installed applications */
       AppInfoManager.get_default().changed.connect (mark_dirty);
-      
+
       /* Now start the RunEntry */
       runner = new Unity.ApplicationsLens.Runner (this);
-      
+
       try {
         uri_regex = new Regex ("^[a-z]+:.+$");
         mountable_regex = new Regex ("((ftp|ssh|sftp|smb|dav)://).+");
@@ -211,7 +211,7 @@
         uri_regex = null;
         critical ("Failed to compile URI regex. URL launching will be disabled");
       }
-      
+
       favorite_apps = Unity.LauncherFavorites.get_default ();
       favorite_apps.changed.connect(mark_dirty);
 
@@ -220,7 +220,7 @@
 
       aptdclient = new AptdProxy ();
       launcherservice = new LauncherProxy ();
-      
+
       lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
       lens.search_hint = _("Search Applications");
       lens.visible = true;
@@ -280,9 +280,9 @@
       var cat = new Unity.Category (_("Recently Used"),
                                     new FileIcon (icon_dir.get_child ("group-recent.svg")));
       categories.append (cat);
-      
+
       cat = new Unity.Category (_("Recent Apps"),
-                                    new FileIcon (icon_dir.get_child ("group-apps.svg")));
+                                new FileIcon (icon_dir.get_child ("group-apps.svg")));
       categories.append (cat);
 
       cat = new Unity.Category (_("Installed"),
@@ -292,11 +292,11 @@
       cat = new Unity.Category (_("Apps Available for Download"),
                                 new FileIcon (icon_dir.get_child ("group-downloads.svg")));
       categories.append (cat);
-      
+
       cat = new Unity.Category (_("Applications"),
                                 new FileIcon (icon_dir.get_child ("group-apps.svg")));
       categories.append (cat);
-      
+
       lens.categories = categories;
     }
 
@@ -308,7 +308,7 @@
       {
         var filter = new CheckOptionFilter ("type", _("Type"));
         filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
-        
+
         filter.add_option ("accessories", _("Accessories"));
         filter.add_option ("education", _("Education"));
         filter.add_option ("game", _("Games"));
@@ -348,38 +348,37 @@
         return usc_apps_option.active;
       return true;
     }
-  
+
     /* Load xdg menu info and build a Xapian index over it.
      * Do throttled re-index if the menu changes */
     private bool build_app_menu_index ()
-    {            
+    {
       if (app_menu == null)
-        {
-          debug ("Building initial application menu");
+      {
+        debug ("Building initial application menu");
         
-          /* We need INCLUDE_NODISPLAY to employ proper de-duping between
-           * the Installed and Availabale categorys. If a NoDisplay app is installed,
-           * eg. Evince, it wont otherwise be in the menu index, only in the
-           * S-C index - thus show up in the Available category */
-          app_menu = GMenu.Tree.lookup ("unity-lens-applications.menu",
-                                        GMenu.TreeFlags.INCLUDE_NODISPLAY);
-          
-          app_menu.add_monitor ((menu) => {
+        /* We need INCLUDE_NODISPLAY to employ proper de-duping between
+         * the Installed and Availabale categorys. If a NoDisplay app is installed,
+         * eg. Evince, it wont otherwise be in the menu index, only in the
+         * S-C index - thus show up in the Available category */
+        app_menu = GMenu.Tree.lookup ("unity-lens-applications.menu",
+                                      GMenu.TreeFlags.INCLUDE_NODISPLAY);
+
+        app_menu.add_monitor ((menu) => {
             /* Reschedule the timeout if we already have one. The menu tree triggers
              * many change events during app installation. This way we wait the full
              * delay *after* the last change event has triggered */
             if (app_menu_changed_reindex_timeout != 0)
               Source.remove (app_menu_changed_reindex_timeout);
-            
-            app_menu_changed_reindex_timeout =
-                                  Timeout.add_seconds (5, build_app_menu_index_and_result_models);
+
+            app_menu_changed_reindex_timeout = Timeout.add_seconds (5, build_app_menu_index_and_result_models);
           });
-        }
-      
+      }
+
       debug ("Indexing application menu");
       appsearcher = new Unity.Package.Searcher.for_menu (app_menu);
       app_menu_changed_reindex_timeout = 0;
-      
+
       return false;
     }
 
@@ -390,7 +389,7 @@
     private bool build_app_menu_index_and_result_models ()
     {
       build_app_menu_index ();
-      
+
       mark_dirty ();
 
       return false;
@@ -418,15 +417,15 @@
                                              OptionsFilter? options)
     {
       string s = search_string.strip ();
-      
+
       if (!s.has_suffix ("*") && s != "")
         s = s + "*";
-      
+
       if (s != "")
         s = @"app:($s)";
       else
         return extract_type_query (options);
-      
+
       if (options == null || !options.filtering)
         return s;
       else
@@ -475,13 +474,13 @@
        * to finish, to prevent flicker. */
 
       debug ("Searching for: %s", search.search_string);
-      
+
       var filter = scope.get_filter ("type") as OptionsFilter;
 
       string pkg_search_string = prepare_pkg_search_string (search, filter);
 
       bool has_search = !Utils.is_search_empty (search);
-      
+
       Timer timer = new Timer ();
 
       var transaction = new Dee.Transaction (model);
@@ -540,8 +539,7 @@
           // no need to bother
           return;
         } catch (GLib.Error e) {
-          warning ("Error performing search '%s': %s",
-                   search.search_string, e.message);
+          warning ("Error performing search '%s': %s", search.search_string, e.message);
         }
       }
 
@@ -583,7 +581,7 @@
 
       search.finished ();
     }
-    
+
     private async void update_global_search (Unity.LensSearch search,
                                              Cancellable cancellable)
     {
@@ -591,17 +589,17 @@
        * In global search, with a non-empty search string, we collate all
        * hits under one Applications category
        */
-      
+
       if (Utils.is_search_empty (search))
-        {
-          yield update_global_without_search (search, cancellable);
-          return;
-        }
-      
+      {
+        yield update_global_without_search (search, cancellable);
+        return;
+      }
+
       var model = search.results_model;
-    
+
       model.clear ();
-      
+
       var search_string = prepare_pkg_search_string (search, null);
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
@@ -612,18 +610,18 @@
       resort_pkg_search_results (appresults);
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
                              Category.APPLICATIONS);
-      
+
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, search_string);
-      
+
       /* Allow new searches once we enter an idle again.
        * We don't do it directly from here as that could mean we start
        * changing the model even before we had flushed out current changes
        */
       search.finished ();
     }
-    
+
     private async void update_global_without_search (Unity.LensSearch search,
                                                      Cancellable cancellable)
     {
@@ -631,8 +629,8 @@
        * In global search, with an empty search string, we show just Recent Apps
        * Excluding apps with icons in the launcher (be they running or faves)
        */
-      var model = search.results_model;      
-      
+      var model = search.results_model;
+
       Timer timer = new Timer ();
 
       if (local_apps_active () && display_recent_apps)
@@ -705,37 +703,37 @@
 
       return result == null ? "NOT category:XYZ" : "(%s)".printf (result);
     }
-    
+
     private string prepare_pkg_search_string (Unity.LensSearch search,
                                               OptionsFilter? options)
     {
       if (Utils.is_search_empty (search))
-        {
-          if (options == null || !options.filtering)
-            return "type:Application";
-          else
-            return "type:Application AND " + extract_type_query (options);
-        }
+      {
+        if (options == null || !options.filtering)
+          return "type:Application";
+        else
+          return "type:Application AND " + extract_type_query (options);
+      }
       else
-        {
-          var s = search.search_string;
-
-          s = s.strip ();
-          
-          /* The Xapian query parser seems to handle hyphens in a special way,
-           * namely that it forces the joined tokens into a phrase query
-           * no matter if it appears as the last word in a query and we have
-           * the PARTIAL flag set on the query parser. This makes 'd-f' not
-           * match 'd-feet' etc. */
-          s = s.delimit ("-", ' ');
-
-          if (options == null || !options.filtering)
-            return "type:Application AND " + s;
-          else
-            return "type:Application AND %s AND %s".printf (extract_type_query (options), s);
-        }
+      {
+        var s = search.search_string;
+
+        s = s.strip ();
+
+        /* The Xapian query parser seems to handle hyphens in a special way,
+         * namely that it forces the joined tokens into a phrase query
+         * no matter if it appears as the last word in a query and we have
+         * the PARTIAL flag set on the query parser. This makes 'd-f' not
+         * match 'd-feet' etc. */
+        s = s.delimit ("-", ' ');
+
+        if (options == null || !options.filtering)
+          return "type:Application AND " + s;
+        else
+          return "type:Application AND %s AND %s".printf (extract_type_query (options), s);
+      }
     }
-    
+
     /**
      * Find app icon in DATADIR/app-install/icons based on preview_installable_icon_file
      * obtained from S-C data provider.
@@ -761,68 +759,68 @@
     {
       string desktop_id = Path.get_basename (pkginfo.desktop_file);
       bool installed = AppInfoManager.get_default().lookup (desktop_id) != null;
-      
+
       /* If the app is already installed we should be able to pull the
        * icon from the theme */
       if (installed)
         return new ThemedIcon (pkginfo.icon);
-      
+
       /* App is not installed - we need to find the right icon in the bowels
        * of the software center */
       if (pkginfo.icon.has_prefix ("/"))
-        {
-          return new FileIcon (File.new_for_path (pkginfo.icon));
-        }
+      {
+        return new FileIcon (File.new_for_path (pkginfo.icon));
+      }
       else
-        {
-          Icon icon = file_icon_cache.lookup (pkginfo.icon);
-          
-          if (icon != null)
-            return icon;
-          
-          /* If the icon name contains a . it probably already have a
-           * type postfix - so test icon name directly */
-          string path;
-          if ("." in pkginfo.icon)
-            {
-              path = @"$(Config.DATADIR)/app-install/icons/$(pkginfo.icon)";
-              if (FileUtils.test (path, FileTest.EXISTS))
-                {
-                  icon = new FileIcon (File.new_for_path (path));
-                  file_icon_cache.insert (pkginfo.icon, icon);
-                  return icon;
-                }
-              /* Try also software center cache dir */
-              path = Path.build_filename (Environment.get_user_cache_dir (),
-                                          "software-center",
-                                          "icons",
-                                          pkginfo.icon);
-              if (FileUtils.test (path, FileTest.EXISTS))
-                {
-                  icon = new FileIcon (File.new_for_path (path));
-                  file_icon_cache.insert (pkginfo.icon, icon);
-                  return icon;
-                }
-            }
-          
-          /* Now try appending all the image extensions we know */
-          foreach (var ext in image_extensions)
-          {
-            path = @"$(Config.DATADIR)/app-install/icons/$(pkginfo.icon).$(ext)";
-            if (FileUtils.test (path, FileTest.EXISTS))
-              {
-                /* Got it! Cache the icon path and return the icon */
-                icon = new FileIcon (File.new_for_path (path));
-                file_icon_cache.insert (pkginfo.icon, icon);
-                return icon;
-              }
-          }
-        }
-      
+      {
+        Icon icon = file_icon_cache.lookup (pkginfo.icon);
+
+        if (icon != null)
+          return icon;
+
+        /* If the icon name contains a . it probably already have a
+         * type postfix - so test icon name directly */
+        string path;
+        if ("." in pkginfo.icon)
+        {
+          path = @"$(Config.DATADIR)/app-install/icons/$(pkginfo.icon)";
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (pkginfo.icon, icon);
+            return icon;
+          }
+          /* Try also software center cache dir */
+          path = Path.build_filename (Environment.get_user_cache_dir (),
+                                      "software-center",
+                                      "icons",
+                                      pkginfo.icon);
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (pkginfo.icon, icon);
+            return icon;
+          }
+        }
+
+        /* Now try appending all the image extensions we know */
+        foreach (var ext in image_extensions)
+        {
+          path = @"$(Config.DATADIR)/app-install/icons/$(pkginfo.icon).$(ext)";
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            /* Got it! Cache the icon path and return the icon */
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (pkginfo.icon, icon);
+            return icon;
+          }
+        }
+      }
+
       /* Cache the fact that we couldn't find this icon */
       var icon = new ThemedIcon ("applications-other");
       file_icon_cache.insert (pkginfo.icon, icon);
-      
+
       return icon;
     }
 
@@ -879,7 +877,7 @@
         return rel_b - rel_a; // we want higher relevancy first
       });
     }
-    
+
     private void add_pkg_search_result (Unity.Package.SearchResult results,
                                         Set<string> installed_uris,
                                         Set<string> available_uris,
@@ -893,23 +891,23 @@
 
       foreach (var pkginfo in results.results)
       {
-      	if (pkginfo.desktop_file == null)
+        if (pkginfo.desktop_file == null)
           continue;
-        
+
         string desktop_id = extract_desktop_id (pkginfo.desktop_file,
-          category == Category.AVAILABLE);
+                                                category == Category.AVAILABLE);
         string full_path;
 
         AppInfo? app = appmanager.lookup (desktop_id);
         full_path = appmanager.get_path (desktop_id);
-        
+
         /* De-dupe by 'application://foo.desktop' URI. Also note that we need
          * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
          * show up from alternate sources */
         string uri = @"application://$(desktop_id)";
         if (uri in installed_uris || uri in available_uris)
           continue;
-        
+
         /* Extract basic metadata and register de-dupe keys */
         string display_name;
         string comment;
@@ -929,52 +927,52 @@
           default:
             warning (@"Illegal category for package search $(category)");
             continue;
-        } 
-        
+        }
+
         /* We can only chuck out NoDisplay and OnlyShowIn app infos after
          * we have registered a de-dupe key for them - which is done in the
          * switch block above) */
         if (app != null && !app.should_show ())
           continue;
-                
+
         if (category == Category.AVAILABLE)
+        {
+          /* If we have an available item, which is not a dupe, but is
+           * installed anyway, we weed it out here, because it's probably
+           * left out from the Installed section because of some rule in the
+           * .menu file */
+          if (app != null)
+            continue;
+
+          /* Filter by app rating in Software Center if enabled */
+          if (ratings != null && ratings_filter.rating > 0.00001)
           {
-            /* If we have an available item, which is not a dupe, but is
-             * installed anyway, we weed it out here, because it's probably
-             * left out from the Installed section because of some rule in the
-             * .menu file */
-            if (app != null)
+            Unity.Ratings.Result result;
+            if (ratings.query (pkginfo.package_name, out result))
+            {
+              if (result.average_rating < ratings_filter.rating * 5 - 0.2)
+                continue;
+            }
+            else
               continue;
-            
-            /* Filter by app rating in Software Center if enabled */
-            if (ratings != null && ratings_filter.rating > 0.00001)
-              {
-                Unity.Ratings.Result result;
-                if (ratings.query (pkginfo.package_name, out result))
-                  {
-                    if (result.average_rating < ratings_filter.rating * 5 - 0.2)
-                      continue;
-                  }
-                else
-                  continue;
-              }
-            
-            /* Apps that are not installed, ie. in the Available category
-             * use the 'unity-install://pkgname/Full App Name' URI scheme,
-             * but only use that after we've de-duped the results.
-             * But only change the URI *after* we've de-duped the results! */
-            uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
-            available_uris.add (uri);            
           }
-        
+
+          /* Apps that are not installed, ie. in the Available category
+           * use the 'unity-install://pkgname/Full App Name' URI scheme,
+           * but only use that after we've de-duped the results.
+           * But only change the URI *after* we've de-duped the results! */
+          uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
+          available_uris.add (uri);            
+        }
+
         Icon icon = find_pkg_icon (pkginfo);
-        
+
         model.append (uri, icon.to_string (),
                       category,"application/x-desktop",
                       display_name != null ? display_name : "",
                       comment != null ? comment : "", 
-		      full_path != null ? "file://" + full_path : "");
-        
+                      full_path != null ? "file://" + full_path : "");
+
         /* Stop if we added the number of items requested */
         n_added++;
         if (max_add > 0 && n_added >= max_add)
@@ -1089,7 +1087,7 @@
         }
 
         var pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
-      
+
         if (pkginfo != null && pkginfo.package_name != null)
         {
           try
@@ -1132,7 +1130,7 @@
     public Unity.Preview preview (string uri)
     {
       Unity.ApplicationPreview? preview = null;
-      
+
       string pkgname = "";
       string appname = "";
 
@@ -1166,7 +1164,7 @@
             appname = parts[1];
           }
         }
-      
+
         if (pkgname != "")
         {
           try {
@@ -1259,7 +1257,7 @@
               uninstall_action.activated.connect (app_preview_uninstall);
               preview.add_action (uninstall_action);
             }
-            
+
             preview_installable_desktop_file = sc_data_provider.desktop_file;
             preview_installable_icon_file = sc_data_provider.icon;
           }
@@ -1300,79 +1298,79 @@
       string[] args;
       string exec_or_dir = null;
       if (uri.has_prefix ("unity-install://"))
-        {
-          unowned string pkg = uri.offset (16); // strip off "unity-install://" prefix
-          debug ("Installing: %s", pkg);
-          args = new string[2];
-          args[0] = "software-center";
-          args[1] = pkg;
-        }
+      {
+        unowned string pkg = uri.offset (16); // strip off "unity-install://" prefix
+        debug ("Installing: %s", pkg);
+        args = new string[2];
+        args[0] = "software-center";
+        args[1] = pkg;
+      }
       else if (uri.has_prefix ("unity-runner://"))
-        {
-          string orig;
-          orig = uri.offset (15);
-          if (orig.has_prefix("\\\\"))
-            orig = orig.replace ("\\\\","smb://");
-          if (uri_regex != null && uri_regex.match (orig)) {
-            try {
-              /* this code ensures that a file manager will be used
-               * if uri it's a remote location that should be mounted */
-              if (mountable_regex.match (orig)) {
-                var muris = new GLib.List<string>();
-                muris.prepend (orig);
-                var file_manager = AppInfo.get_default_for_type("inode/directory", true);
-                file_manager.launch_uris(muris,null);
-              } else {
+      {
+        string orig;
+        orig = uri.offset (15);
+        if (orig.has_prefix("\\\\"))
+          orig = orig.replace ("\\\\","smb://");
+        if (uri_regex != null && uri_regex.match (orig)) {
+          try {
+            /* this code ensures that a file manager will be used
+             * if uri it's a remote location that should be mounted */
+            if (mountable_regex.match (orig)) {
+              var muris = new GLib.List<string>();
+              muris.prepend (orig);
+              var file_manager = AppInfo.get_default_for_type("inode/directory", true);
+              file_manager.launch_uris(muris,null);
+            } else {
               AppInfo.launch_default_for_uri (orig, null);
-              }
-            } catch (GLib.Error error) {
-              warning ("Failed to launch URI %s", orig);
-              return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
             }
-            return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-
-          } else {
-            exec_or_dir = Utils.subst_tilde (orig);
-            args = exec_or_dir.split (" ", 0);
-            for (int i = 0; i < args.length; i++)
-              args[i] = Utils.subst_tilde (args[i]);
+          } catch (GLib.Error error) {
+            warning ("Failed to launch URI %s", orig);
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
           }
-          this.runner.add_history (orig);
+          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+
+        } else {
+          exec_or_dir = Utils.subst_tilde (orig);
+          args = exec_or_dir.split (" ", 0);
+          for (int i = 0; i < args.length; i++)
+            args[i] = Utils.subst_tilde (args[i]);
         }
+        this.runner.add_history (orig);
+      }
       else
-        {
-          /* Activation of standard application:// uris */
-
-          /* Make sure fresh install learns quickly */
-          if (popularity_map.size <= 5) popularities_dirty = true;
-
-          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-        }
+      {
+        /* Activation of standard application:// uris */
+
+        /* Make sure fresh install learns quickly */
+        if (popularity_map.size <= 5) popularities_dirty = true;
+
+        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+      }
 
       if ((exec_or_dir != null) && FileUtils.test (exec_or_dir, FileTest.IS_DIR))
       {
         try {
-            AppInfo.launch_default_for_uri ("file://" + exec_or_dir, null);
+          AppInfo.launch_default_for_uri ("file://" + exec_or_dir, null);
         } catch (GLib.Error err) {
-            warning ("Failed to open current folder '%s' in file manager: %s",
-                     exec_or_dir, err.message);
-            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+          warning ("Failed to open current folder '%s' in file manager: %s",
+                   exec_or_dir, err.message);
+          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
         }
       }
       else
       {
-          try {
-            unowned string home_dir = GLib.Environment.get_home_dir ();
-            Process.spawn_async (home_dir, args, null, SpawnFlags.SEARCH_PATH, null, null);
-          } catch (SpawnError e) {
-            warning ("Failed to spawn software-center or direct URI activation '%s': %s",
-                     uri, e.message);
-            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-          }
+        try {
+          unowned string home_dir = GLib.Environment.get_home_dir ();
+          Process.spawn_async (home_dir, args, null, SpawnFlags.SEARCH_PATH, null, null);
+        } catch (SpawnError e) {
+          warning ("Failed to spawn software-center or direct URI activation '%s': %s",
+                   uri, e.message);
+          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+        }
       }
 
       return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-      
+
     }
 
     /* Appends the subject URIs from a set of Zeitgeist.Events to our Dee.Model
@@ -1390,7 +1388,7 @@
         string? app_uri = null;
         if (ev.num_subjects () > 0)
           app_uri = ev.get_subject (0).get_uri ();
-        
+
         if (app_uri == null)
         {
           warning ("Unexpected event without subject");
@@ -1399,7 +1397,7 @@
 
         /* Assert that we indeed have a known application as actor */
         string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
-        
+
         /* Discard Recently Used apps that are in the launcher */
         if ((category_id == Category.RECENT ||
              category_id == Category.RECENT_APPS) &&
@@ -1413,7 +1411,7 @@
 
         if (app == null)
           continue;
-        
+
         if (!app.should_show ())
           continue;
 
@@ -1437,7 +1435,7 @@
                         app.get_description (), full_uri);
       }
     }
-    
+
   } /* END: class Daemon */
 
 } /* namespace */

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2012-07-26 14:07:49 +0000
+++ src/unity-package-search.cc	2012-08-21 12:26:20 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Canonical Ltd
-   *
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
@@ -58,7 +58,7 @@
 
 extern "C"
 {
-extern gchar* unity_applications_lens_utils_preprocess_string (const gchar* input);
+  extern gchar* unity_applications_lens_utils_preprocess_string (const gchar* input);
 }
 
 struct _UnityPackageSearcher
@@ -74,7 +74,7 @@
 class LocaleKeyMaker : public Xapian::KeyMaker
 {
   private:
-    Xapian::valueno value;
+  Xapian::valueno value;
 
   public:
 
@@ -102,7 +102,7 @@
   // Activate Xapian CJK support
   setenv("XAPIAN_CJK_NGRAM", "1", 1);
 
-        Xapian::Database db = *searcher->db;
+  Xapian::Database db = *searcher->db;
 
   // Start an enquire session
   Xapian::Enquire *enquire = new Xapian::Enquire (db);
@@ -113,18 +113,18 @@
   searcher->sorter = new LocaleKeyMaker (XAPIAN_VALUE_APPNAME);
   enquire->set_sort_by_key (searcher->sorter, FALSE);
 
-    // Create query parser
-    Xapian::QueryParser *query_parser = new Xapian::QueryParser ();
-    query_parser->add_prefix ("section", "AE");
-    query_parser->add_prefix ("type", "AT");
-    query_parser->add_prefix ("category", "AC");
-    query_parser->add_prefix ("name", "AA");
-    query_parser->add_prefix ("pkgname", "AP");
-    query_parser->add_prefix ("exec", "XX");
-    query_parser->add_prefix ("keyword", "KW");
-    query_parser->set_default_op (Xapian::Query::OP_AND);
-    query_parser->set_database (db);
-    searcher->query_parser = query_parser;
+  // Create query parser
+  Xapian::QueryParser *query_parser = new Xapian::QueryParser ();
+  query_parser->add_prefix ("section", "AE");
+  query_parser->add_prefix ("type", "AT");
+  query_parser->add_prefix ("category", "AC");
+  query_parser->add_prefix ("name", "AA");
+  query_parser->add_prefix ("pkgname", "AP");
+  query_parser->add_prefix ("exec", "XX");
+  query_parser->add_prefix ("keyword", "KW");
+  query_parser->set_default_op (Xapian::Query::OP_AND);
+  query_parser->set_database (db);
+  searcher->query_parser = query_parser;
 
   // Init random number generator from 32 lowest bits of system time
   searcher->random = g_rand_new_with_seed (g_get_monotonic_time ());
@@ -144,111 +144,105 @@
   gchar                *dum1, *dum2, *dum3;
   gint                  i, len;
 
-        g_return_if_fail (db != NULL);
-        g_return_if_fail (indexer != NULL);
-        g_return_if_fail (item != NULL);
-
-        switch (gmenu_tree_item_get_type (item))
-        {
-          case GMENU_TREE_ITEM_INVALID:
-            return;
-          case GMENU_TREE_ITEM_DIRECTORY:
-            /* Recurse into directory */
-            iter = gmenu_tree_directory_get_contents (GMENU_TREE_DIRECTORY (item));
-            for (; iter != NULL; iter = iter->next)
-              {
-                index_menu_item (db, indexer, GMENU_TREE_ITEM (iter->data));
-              }
-            break;
-          case GMENU_TREE_ITEM_ENTRY:
-            /* Add this entry to the index */
-            entry = GMENU_TREE_ENTRY (item);
-
-            /* Store relevant values */
-            if (gmenu_tree_entry_get_display_name (entry))
-              doc.add_value (XAPIAN_VALUE_APPNAME,
-                           gmenu_tree_entry_get_display_name (entry));
-          if (gmenu_tree_entry_get_icon (entry))
-        doc.add_value (XAPIAN_VALUE_ICON,
-                       gmenu_tree_entry_get_icon (entry));
+  g_return_if_fail (db != NULL);
+  g_return_if_fail (indexer != NULL);
+  g_return_if_fail (item != NULL);
+
+  switch (gmenu_tree_item_get_type (item))
+  {
+    case GMENU_TREE_ITEM_INVALID:
+      return;
+    case GMENU_TREE_ITEM_DIRECTORY:
+      /* Recurse into directory */
+      iter = gmenu_tree_directory_get_contents (GMENU_TREE_DIRECTORY (item));
+      for (; iter != NULL; iter = iter->next)
+      {
+        index_menu_item (db, indexer, GMENU_TREE_ITEM (iter->data));
+      }
+      break;
+    case GMENU_TREE_ITEM_ENTRY:
+      /* Add this entry to the index */
+      entry = GMENU_TREE_ENTRY (item);
+
+      /* Store relevant values */
+      if (gmenu_tree_entry_get_display_name (entry))
+        doc.add_value (XAPIAN_VALUE_APPNAME, gmenu_tree_entry_get_display_name (entry));
+      if (gmenu_tree_entry_get_icon (entry))
+        doc.add_value (XAPIAN_VALUE_ICON, gmenu_tree_entry_get_icon (entry));
       if (gmenu_tree_entry_get_desktop_file_id (entry))
-        doc.add_value (XAPIAN_VALUE_DESKTOP_FILE,
-                       gmenu_tree_entry_get_desktop_file_id (entry));
-
-            /* Index full text data */
-            indexer->set_document(doc);
+        doc.add_value (XAPIAN_VALUE_DESKTOP_FILE, gmenu_tree_entry_get_desktop_file_id (entry));
+      
+      /* Index full text data */
+      indexer->set_document(doc);
       if (gmenu_tree_entry_get_display_name (entry))
       {
-        dum1 = unity_applications_lens_utils_preprocess_string (
-            gmenu_tree_entry_get_display_name (entry));
+        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_display_name (entry));
         indexer->index_text(dum1, 5);
         g_free (dum1);
       }
       if (gmenu_tree_entry_get_name (entry))
       {
-        dum1 = unity_applications_lens_utils_preprocess_string (
-            gmenu_tree_entry_get_name (entry));
+        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_name (entry));
         indexer->index_text(dum1, 5);
         g_free (dum1);
       }
       if (gmenu_tree_entry_get_comment (entry))
       {
-        dum1 = unity_applications_lens_utils_preprocess_string (
-            gmenu_tree_entry_get_comment (entry));
-        indexer->index_text (dum1, 0);
-        g_free (dum1);
-      }
-
-            /* Index the XDG categories */
-            appman = unity_app_info_manager_get_default ();
-            cats = unity_app_info_manager_get_categories (appman, // const return
-                                                          gmenu_tree_entry_get_desktop_file_id (entry),
-                                                          &len);
-
-            /* Note: Wine apps and app launchers created with Alacarte commonly
-             * don't have any category metadata, so they'll only show up under
-             * All Applications */
-            for (i = 0; i < len; i++)
-              {
-                dum1 = g_ascii_strdown (cats[i], -1);
-                dum2 = g_strconcat ("AC", dum1, NULL);
-                doc.add_term (dum2);
-                g_free (dum1);
-                g_free (dum2);
-              }
-
-            /* Index Keywords*/
-            keywords = unity_app_info_manager_get_keywords (appman, // const return
-                                                            gmenu_tree_entry_get_desktop_file_id (entry),
-                                                            &len);
-            for (i = 0; i < len; i++)
-              {
-          dum1 = unity_applications_lens_utils_preprocess_string (keywords[i]);
-                indexer->index_text (dum1, 0);
-                indexer->index_text (dum1, 0, "KW");
-          g_free (dum1);
-              }
-
-
-            g_object_unref (appman);
-
-            /* Always assume Type=Application for items in a menu... */
-            doc.add_term ("ATapplication");
-
-            /* Index application names */
-            dum1 = (gchar *) gmenu_tree_entry_get_display_name (entry); // const
-            dum2 = g_strconcat ("AA", dum1, NULL);
+        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_comment (entry));
+        indexer->index_text (dum1, 0);
+        g_free (dum1);
+      }
+
+      /* Index the XDG categories */
+      appman = unity_app_info_manager_get_default ();
+      cats = unity_app_info_manager_get_categories (appman, // const return
+                                                    gmenu_tree_entry_get_desktop_file_id (entry),
+                                                    &len);
+
+      /* Note: Wine apps and app launchers created with Alacarte commonly
+       * don't have any category metadata, so they'll only show up under
+       * All Applications */
+      for (i = 0; i < len; i++)
+      {
+        dum1 = g_ascii_strdown (cats[i], -1);
+        dum2 = g_strconcat ("AC", dum1, NULL);
+        doc.add_term (dum2);
+        g_free (dum1);
+        g_free (dum2);
+      }
+
+      /* Index Keywords*/
+      keywords = unity_app_info_manager_get_keywords (appman, // const return
+                                                      gmenu_tree_entry_get_desktop_file_id (entry),
+                                                      &len);
+      for (i = 0; i < len; i++)
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (keywords[i]);
+        indexer->index_text (dum1, 0);
+        indexer->index_text (dum1, 0, "KW");
+        g_free (dum1);
+      }
+
+      g_object_unref (appman);
+
+      /* Always assume Type=Application for items in a menu... */
+      doc.add_term ("ATapplication");
+
+      /* Index application names */
+      dum1 = (gchar *) gmenu_tree_entry_get_display_name (entry); // const
+      dum2 = g_strconcat ("AA", dum1, NULL);
       doc.add_term (dum2);
       g_free (dum2);
 
       dum1 = (gchar *) gmenu_tree_entry_get_name (entry); // const
-            dum2 = g_strconcat ("AA", dum1, NULL);
+      dum2 = g_strconcat ("AA", dum1, NULL);
       doc.add_term (dum2);
       g_free (dum2);
 
       /* Index executable name, change - in _ for exec */
       dum1 = g_strdup (gmenu_tree_entry_get_exec (entry)); // alloc
-      if (dum1) {
+      if (dum1)
+      {
         dum2 = strstr (dum1, " "); // const
         dum2 == NULL ? : *dum2 = '\0'; // const
         dum2 = g_path_get_basename (dum1); // alloc
@@ -265,19 +259,17 @@
       }
 
       db->add_document(doc);
-            break;
-          case GMENU_TREE_ITEM_SEPARATOR:
-          case GMENU_TREE_ITEM_HEADER:
-          case GMENU_TREE_ITEM_ALIAS:
-            break;
-          default:
-            g_warning ("Unexpected GMenuTreeItemType %u",
-                       gmenu_tree_item_get_type (item));
-            return;
+      break;
+    case GMENU_TREE_ITEM_SEPARATOR:
+    case GMENU_TREE_ITEM_HEADER:
+    case GMENU_TREE_ITEM_ALIAS:
+      break;
+    default:
+      g_warning ("Unexpected GMenuTreeItemType %u", gmenu_tree_item_get_type (item));
+      return;
   }
 
   // Add the document to the database.
-
 }
 
 /* Create a searcher that searches in a menu tree. The menu tree
@@ -316,26 +308,32 @@
   searcher = g_new0 (UnityPackageSearcher, 1);
 
   // Xapian initialization
-  try {
+  try
+  {
     searcher->db = new Xapian::Database (SOFTWARE_CENTER_INDEX);
-  } catch(const Xapian::Error &error) {
+  }
+  catch(const Xapian::Error &error)
+  {
     cerr << "Error loading package indexes: "  << error.get_msg() << endl;
     return NULL;
   }
 
   // add software-center-agent.db
-  try {
+  try
+  {
     agent = g_strdup_printf("%s/software-center/software-center-agent.db",
                             g_get_user_cache_dir());
     if (g_file_test(agent, G_FILE_TEST_IS_DIR))
-       searcher->db->add_database (Xapian::Database (agent));
+      searcher->db->add_database (Xapian::Database (agent));
     g_free(agent);
-  } catch(const Xapian::Error &error) {
+  }
+  catch(const Xapian::Error &error)
+  {
     cerr << "Error loading agent indexes: "  << error.get_msg() << endl;
   }
 
   init_searcher (searcher);
-
+  
   return searcher;
 }
 
@@ -447,29 +445,25 @@
     searcher->enquire->set_collapse_key(XAPIAN_VALUE_DESKTOP_FILE);
     max_hits = (max_hits != 0 ? max_hits : searcher->db->get_doccount ());
     searcher->enquire->set_query(query);
-    Xapian::MSet matches =
-      searcher->enquire->get_mset(0, max_hits);
+    Xapian::MSet matches = searcher->enquire->get_mset(0, max_hits);
 
     // Retrieve the results, note that we build the result->results
     // list in reverse order and then reverse it before we return it
     result->num_hits = matches.get_matches_estimated ();
-    for (Xapian::MSetIterator i = matches.begin();
-         i != matches.end();
-         ++i)
-      {
-        try
-          {
-            Xapian::Document doc = i.get_document();
-            UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
-            pkginfo->relevancy = i.get_percent ();
-            result->results = g_slist_prepend (result->results, pkginfo);
-          }
-        catch (Xapian::Error e)
-          {
-            g_warning ("Unable to read document from result set: %s",
-                       e.get_msg().c_str());
-          }
-      }
+    for (Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i)
+    {
+      try
+      {
+        Xapian::Document doc = i.get_document();
+        UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
+        pkginfo->relevancy = i.get_percent ();
+        result->results = g_slist_prepend (result->results, pkginfo);
+      }
+      catch (Xapian::Error e)
+      {
+        g_warning ("Unable to read document from result set: %s", e.get_msg().c_str());
+      }
+    }
 
     result->results = g_slist_reverse (result->results);
   }
@@ -503,69 +497,68 @@
    * requested apps in order to try and avoid dupes. This is a sloppy
    * check, but works well enough in practice */
   if (filter_query == NULL)
+  {
+    g_debug ("RANDOM");
+    for (i = 0, n_unique = 0; i < n_apps*2, n_unique < n_apps; i++)
     {
-      g_debug ("RANDOM");
-      for (i = 0, n_unique = 0; i < n_apps*2, n_unique < n_apps; i++)
-        {
-          Xapian::Document doc;
-          try
-            {
-              doc = searcher->db->get_document (
-                             g_rand_int_range (searcher->random, 1, lastdocid));
-                        UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
-              if (g_hash_table_lookup_extended (unique, pkginfo->package_name, NULL, NULL))
-                {
-                  _free_package_info (pkginfo);
-                }
-              else
-                {
-                  g_hash_table_insert (unique, pkginfo->package_name, NULL);
-                  result->results = g_slist_prepend (result->results, pkginfo);
-                  n_unique++;
-                }
-            }
-          catch (Xapian::Error e)
-            {
-              g_warning ("Error getting random apps: %s", e.get_msg().c_str());
-              continue;
-            }
-        }
+      Xapian::Document doc;
+      try
+      {
+        doc = searcher->db->get_document (
+          g_rand_int_range (searcher->random, 1, lastdocid));
+        UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
+        if (g_hash_table_lookup_extended (unique, pkginfo->package_name, NULL, NULL))
+        {
+          _free_package_info (pkginfo);
+        }
+        else
+        {
+          g_hash_table_insert (unique, pkginfo->package_name, NULL);
+          result->results = g_slist_prepend (result->results, pkginfo);
+          n_unique++;
+        }
+      }
+      catch (Xapian::Error e)
+      {
+        g_warning ("Error getting random apps: %s", e.get_msg().c_str());
+        continue;
+      }
     }
+  }
   else
-    {
-      g_debug ("FILTER %s", filter_query);
-      Xapian::Query query;
-      try
-      {
-        query = searcher->query_parser->parse_query (filter_query, QUERY_PARSER_FILTER_FLAGS);
-        searcher->enquire->set_sort_by_relevance ();
-        searcher->enquire->set_query(query);
-        Xapian::MSet matches = searcher->enquire->get_mset(0, searcher->db->get_doccount ());
-        for (i = 0, n_unique = 0; i < n_apps*4, n_unique < n_apps; i++)
-          {
-            docid = g_rand_int_range (searcher->random, 0, matches.size ());
-            Xapian::MSetIterator iter = matches[docid];
-            Xapian::Document doc = iter.get_document ();
-            UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
-            if (g_hash_table_lookup_extended (unique, pkginfo->package_name, NULL, NULL))
-              {
-                _free_package_info (pkginfo);
-              }
-            else
-              {
-                g_hash_table_insert (unique, pkginfo->package_name, NULL);
-                result->results = g_slist_prepend (result->results, pkginfo);
-                n_unique++;
-              }
-          }
-      }
-      catch (Xapian::Error e)
-      {
-        g_debug ("Error getting random apps for query '%s': %s",
-                 filter_query, e.get_msg().c_str());
-        return g_slice_new0 (UnityPackageSearchResult);
-      }
-    }
+  {
+    g_debug ("FILTER %s", filter_query);
+    Xapian::Query query;
+    try
+    {
+      query = searcher->query_parser->parse_query (filter_query, QUERY_PARSER_FILTER_FLAGS);
+      searcher->enquire->set_sort_by_relevance ();
+      searcher->enquire->set_query(query);
+      Xapian::MSet matches = searcher->enquire->get_mset(0, searcher->db->get_doccount ());
+      for (i = 0, n_unique = 0; i < n_apps*4, n_unique < n_apps; i++)
+      {
+        docid = g_rand_int_range (searcher->random, 0, matches.size ());
+        Xapian::MSetIterator iter = matches[docid];
+        Xapian::Document doc = iter.get_document ();
+        UnityPackageInfo *pkginfo = _pkginfo_from_document (doc);
+        if (g_hash_table_lookup_extended (unique, pkginfo->package_name, NULL, NULL))
+        {
+          _free_package_info (pkginfo);
+        }
+        else
+        {
+          g_hash_table_insert (unique, pkginfo->package_name, NULL);
+          result->results = g_slist_prepend (result->results, pkginfo);
+          n_unique++;
+        }
+      }
+    }
+    catch (Xapian::Error e)
+    {
+      g_debug ("Error getting random apps for query '%s': %s", filter_query, e.get_msg().c_str());
+      return g_slice_new0 (UnityPackageSearchResult);
+    }
+  }
 
   g_hash_table_unref (unique);