Merge lp:~njpatel/unity-lens-applications/unity-lens-applications into lp:unity-lens-applications

[Neil J. Patel]

This ports the application place to the new infrastructure. The only way to test it is over d-feet and it requires lp:~njpatel/libunity/lenses-extras to compile.

This also s/place/lens, which means we need new packaging and we need to ask LP guys to rename this project.

[lp:~njpatel/unity-lens-applications/unity-lens-applications]

218. By Neil J. Patel on 2011-08-04

update version

[Alex Launi (alexlauni)]

Looks pretty much like a port from the new api to the old. Looks good to me.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-01-27 13:08:27 +0000
+++ .bzrignore	2011-08-04 08:16:52 +0000
@@ -60,3 +60,14 @@
 ABOUT-NLS
 config.rpath
 po/unity-place-applications.pot
+applications.place
+applications.place.in
+data/X-Unity-All-Applications.directory
+data/unity-place-applications.menu
+po/da.gmo
+src/config.c
+src/config.vala
+src/daemon.c
+src/schemas.c
+src/unity-applications-daemon
+src/unity_applications_daemon.vala.stamp
 
=== modified file 'Makefile.am'
--- Makefile.am	2011-02-11 12:35:12 +0000
+++ Makefile.am	2011-08-04 08:16:52 +0000
@@ -1,16 +1,20 @@
 SUBDIRS = src data po
 
 #
-# Install the applications.place file
+# Install the applications.lens file
 #
-place_in_files = applications.place.in
-placedir = $(datadir)/unity/places
-place_DATA = $(place_in_files:.place.in=.place)
+lens_in_files = applications.lens.in
+lensdir = $(datadir)/unity/lenses/applications
+lens_DATA = $(lens_in_files:.lens.in=.lens)
+
+cmdlens_in_files = commands.lens.in
+cmdlensdir = $(datadir)/unity/lenses/commands
+cmdlens_DATA = $(cmdlens_in_files:.lens.in=.lens)
 
 icondir = $(datadir)/unity/themes
 icon_DATA = applications.png
 
-@INTLTOOL_PLACE_RULE@
+@INTLTOOL_LENS_RULE@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
@@ -32,7 +36,7 @@
 EXTRA_DIST = \
   applications.png \
   autogen.sh \
-  $(place_in_files) \
+  $(lens_in_files) \
   AUTHORS \
   COPYING \
   HACKING \
@@ -42,5 +46,5 @@
   vapi/unity-package-search.deps
 
 CLEANFILES = \
-  $(place_DATA)
+  $(lens_DATA)
 
 
=== renamed file 'applications.place.in.in' => 'applications.lens.in.in'
--- applications.place.in.in	2011-04-01 14:54:26 +0000
+++ applications.lens.in.in	2011-08-04 08:16:52 +0000
@@ -1,27 +1,12 @@
-[Place]
-DBusName=com.canonical.Unity.ApplicationsPlace
-DBusObjectPath=/com/canonical/unity/applicationsplace
-
-[Entry:Files]
-DBusObjectPath=/com/canonical/unity/applicationsplace/applications
+[Lens]
+DBusName=com.canonical.Unity.Lens.Applications
+DBusObjectPath=/com/canonical/unity/lens/applications
 Icon=@prefix@/share/unity/themes/applications.png
 _Name=Applications
 Description=
 _SearchHint=Search Applications
 Shortcut=a
 
-[Entry:Runner]
-DBusObjectPath=/com/canonical/unity/applicationsplace/runner
-_Name=Commands
-_SearchHint=Run a command
-ShowGlobal=false
-ShowEntry=false
-
-[Activation]
-URIPattern=unity-(install|runner)://.+
-MimetypePattern=application/x-unity-available-application
-Priority=0
-
 [Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-place-applications
+X-Ubuntu-Gettext-Domain=unity-lens-applications
 
 
=== added file 'commands.lens.in.in'
--- commands.lens.in.in	1970-01-01 00:00:00 +0000
+++ commands.lens.in.in	2011-08-04 08:16:52 +0000
@@ -0,0 +1,10 @@
+[Lens]
+DBusName=com.canonical.Unity.Lens.Applications
+DBusObjectPath=/com/canonical/unity/lens/commands
+Icon=@prefix@/share/unity/themes/applications.png
+_Name=Commands
+_SearchHint=Run a command
+Visible=false
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=unity-lens-applications
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-07 10:51:45 +0000
+++ configure.ac	2011-08-04 08:16:52 +0000
@@ -1,4 +1,4 @@
-AC_INIT(unity-place-applications, 0.2.47, https://launchpad.net/unity-place-applications)
+AC_INIT(unity-lens-applications, 0.3.0, https://launchpad.net/unity-lens-applications)
 AC_COPYRIGHT([Copyright 2010 Canonical])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -46,16 +46,16 @@
 AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
 
 ######################################################
-# intltool rule for generating translated .place file
+# intltool rule for generating translated .lens file
 ######################################################
-INTLTOOL_PLACE_RULE='%.place: %.place.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_PLACE_RULE)
+INTLTOOL_LENS_RULE='%.lens: %.lens.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST(INTLTOOL_LENS_RULE)
 
 #############################################
 # Check for module and library dependancies
 #############################################
 GLIB_REQUIRED=2.27
-PKG_CHECK_MODULES(PLACE_DAEMON,
+PKG_CHECK_MODULES(LENS_DAEMON,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
@@ -64,11 +64,11 @@
                   gee-1.0
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
-                  unity >= 3.6.3
+                  unity >= 4.0
                   libgnome-menu)
 
-AC_SUBST(PLACE_DAEMON_CFLAGS)
-AC_SUBST(PLACE_DAEMON_LIBS)
+AC_SUBST(LENS_DAEMON_CFLAGS)
+AC_SUBST(LENS_DAEMON_LIBS)
 
 #############################################
 # local install for distcheck and stand-alone running
@@ -106,10 +106,11 @@
 #############################################
 AC_CONFIG_FILES([
   Makefile
-  applications.place.in
+  applications.lens.in
+  commands.lens.in
   data/Makefile
   data/X-Unity-All-Applications.directory
-  data/unity-place-applications.menu
+  data/unity-lens-applications.menu
   src/Makefile
   src/config.vala
   po/Makefile.in
@@ -119,7 +120,7 @@
 dnl Output the results
 AC_MSG_NOTICE([
 
-  Unity Applications Place Daemon $VERSION
+  Unity Applications Lens Daemon $VERSION
   ------------------------------------
 
   Prefix         : ${prefix}
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-03-10 10:56:46 +0000
+++ data/Makefile.am	2011-08-04 08:16:52 +0000
@@ -1,5 +1,5 @@
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  unity-place-applications.service.in
+service_in_files =  unity-lens-applications.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
@@ -14,7 +14,7 @@
 
 menudir = $(sysconfdir)/xdg/menus
 menu_in_files = \
-  unity-place-applications.menu.in
+  unity-lens-applications.menu.in
 menu_DATA = $(menu_in_files:.menu.in=.menu)
   
 
@@ -24,4 +24,4 @@
   $(menu_in_files)
 
 CLEANFILES = \
-  unity-place-applications.service
+  unity-lens-applications.service
 
=== renamed file 'data/unity-place-applications.menu.in' => 'data/unity-lens-applications.menu.in'
=== renamed file 'data/unity-place-applications.service.in' => 'data/unity-lens-applications.service.in'
--- data/unity-place-applications.service.in	2010-06-24 18:02:29 +0000
+++ data/unity-lens-applications.service.in	2011-08-04 08:16:52 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.Unity.ApplicationsPlace
+Name=com.canonical.Unity.Lens.Applications
 Exec=@libexecdir@/unity-applications-daemon
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-03-10 13:25:55 +0000
+++ po/POTFILES.in	2011-08-04 08:16:52 +0000
@@ -4,4 +4,5 @@
 src/utils.vala
 src/main.vala
 data/X-Unity-All-Applications.directory.in
-[type: gettext/ini]applications.place.in.in
+[type: gettext/ini]applications.lens.in.in
+[type: gettext/ini]commands.lens.in.in
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-03-30 01:29:07 +0000
+++ src/Makefile.am	2011-08-04 08:16:52 +0000
@@ -14,7 +14,7 @@
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   -DG_LOG_DOMAIN=\"unity-applications-daemon\" \
   -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-  $(PLACE_DAEMON_CFLAGS) \
+  $(LENS_DAEMON_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
   -I$(srcdir) \
   -g
@@ -40,7 +40,7 @@
 unity_package_search_libs = -lxapian -lstdc++
 
 unity_applications_daemon_LDADD = \
-  $(PLACE_DAEMON_LIBS) \
+  $(LENS_DAEMON_LIBS) \
   $(unity_package_search_libs) \
   unity-package-search.o \
   $(NULL)
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-05-04 13:20:43 +0000
+++ src/daemon.vala	2011-08-04 08:16:52 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ *             Neil Jagdish Patel <[e-mail]>
  *
  */
 using Dee;
@@ -23,11 +24,11 @@
 using Gee;
 using GMenu;
 
-namespace Unity.ApplicationsPlace {
-
-  const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
-
-  public class Daemon : GLib.Object, Unity.Activation
+namespace Unity.ApplicationsLens {
+
+  const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/lenss/svg/";
+
+  public class Daemon : GLib.Object
   {
     private Zeitgeist.Log log;
     private Zeitgeist.Index zg_index;
@@ -37,67 +38,36 @@
     private Unity.Package.Searcher? pkgsearcher;
     public Unity.Package.Searcher appsearcher;
 
-    private Unity.PlaceController control;
-    private Unity.PlaceEntryInfo applications;
+    private Unity.Lens lens;
+    private Unity.Scope scope;
     
-    private Unity.ApplicationsPlace.Runner runner;
+    private Unity.ApplicationsLens.Runner runner;
 
     /* For each section we have a set filtering query we use to restrict
-     * Xapian queries to that section */
-    private Gee.List<string> section_queries;
+     * Xapian queries to that type */
+    private HashTable<string, string> type_queries;
 
     private Gee.List<string> image_extensions;
     private HashTable<string,Icon> file_icon_cache;
     
     /* We remember the previous search so we can figure out if we should do
      * incremental filtering of the result models */
-    private PlaceSearch? previous_search;
-    private PlaceSearch? previous_global_search;
-    
-    /* To make sure we don't fire of unnecessary queries if the active section
-     * is in fact not changed */
-    private uint previous_active_section;
-    
+    private Unity.LensSearch? previous_search;
+    private Unity.LensSearch? previous_global_search;
+        
     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;
 
-    private bool all_models_synced;
-    
     private Regex? uri_regex;
 
     construct
     {
-      var sections_model = new Dee.SharedModel("com.canonical.Unity.ApplicationsPlace.SectionsModel");
-      sections_model.set_schema ("s", "s");
-
-      var groups_model = new Dee.SharedModel("com.canonical.Unity.ApplicationsPlace.GroupsModel");
-      groups_model.set_schema ("s", "s", "s");
-
-      var global_groups_model = new Dee.SharedModel("com.canonical.Unity.ApplicationsPlace.GlobalGroupsModel");
-      global_groups_model.set_schema ("s", "s", "s");
-
-      var results_model = new Dee.SharedModel("com.canonical.Unity.ApplicationsPlace.ResultsModel");
-      results_model.set_schema ("s", "s", "u", "s", "s", "s");
-
-      var global_results_model = new Dee.SharedModel("com.canonical.Unity.ApplicationsPlace.GlobalResultsModel");
-      global_results_model.set_schema ("s", "s", "u", "s", "s", "s");
-
-      section_queries = new Gee.ArrayList<string> ();
-      populate_section_queries();
+      populate_type_queries ();
       populate_zg_templates ();
 
-      applications = new PlaceEntryInfo ("/com/canonical/unity/applicationsplace/applications");
-      applications.sections_model = sections_model;
-      applications.entry_renderer_info.groups_model = groups_model;
-      applications.entry_renderer_info.results_model = results_model;
-      applications.global_renderer_info.groups_model = global_groups_model;
-      applications.global_renderer_info.results_model = global_results_model;
-
-      applications.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
-
       log = new Zeitgeist.Log();
       zg_index = new Zeitgeist.Index();
       
@@ -119,68 +89,60 @@
       
       previous_search = null;
       previous_global_search = null;
-      previous_active_section = Section.LAST_SECTION; /* Must be an invalid section! */
-      
+            
       build_app_menu_index ();
       
       file_icon_cache = new HashTable<string,Icon>(str_hash, str_equal);
+
+      scope = new Unity.Scope ("/com/canonical/unity/scope/applications");
+      //scope.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
       
-      /* Listen for section changes */
-      applications.notify["active-section"].connect (
-        (obj, pspec) => {
-          if (!all_models_synced)
-            return;
-
-          if (previous_active_section == applications.active_section)
-            return;
-
-          var search = applications.active_search;
-          var section = (Section) applications.active_section;
-          update_entry_search.begin (search, section);
-          
-          previous_search = search;
-          previous_active_section = applications.active_section;
-        }
-      );
-
-      /* Listen for changes to the place entry search */
-      applications.notify["active-search"].connect (
-        (obj, pspec) => {
-          if (!all_models_synced)
-            return;
-
-          var search = applications.active_search;
-          Section section = (Section) applications.active_section;
-          
+      /* Listen for changes to the lens scope search */
+      scope.notify["active-search"].connect (
+        (obj, pspec) => {
+          var search = scope.active_search;
+
           if (!Utils.search_has_really_changed (previous_search, search))
             return;
+
+          update_scope_search.begin (search);
+          previous_search = search;
+        }
+      );
+
+      /* Re-do the search if the filters changed */
+      scope.filters_changed.connect (
+        () => {
+          var search = scope.active_search;
+          if (search.search_string == null)
+            return;
+
+          update_scope_search.begin (search);
+          previous_search = search;
           
-          update_entry_search.begin (search, section);
-          previous_search = search;
         }
       );
 
       /* Listen for changes to the global search aka Dash search */
-      applications.notify["active-global-search"].connect (
+      scope.notify["active-global-search"].connect (
         (obj, pspec) => {
-          if (!all_models_synced)
-            return;
+          var search = scope.active_global_search;
 
-          var search = applications.active_global_search;
-          
           if (!Utils.search_has_really_changed (previous_global_search, search))
             return;
           
-          update_global_search.begin(search);
+          update_global_search.begin (search);
           previous_global_search = search;
         }
       );
 
+      scope.activate_uri.connect (activate);
+
       /* Listen for changes in the installed applications */
       AppInfoManager.get_instance().changed.connect (on_appinfo_changed);
       
       /* Now start the RunEntry */
-      runner = new Unity.ApplicationsPlace.Runner (this);
+      runner = new Unity.ApplicationsLens.Runner (this);
       
       try {
         uri_regex = new Regex ("^[a-z]+:.+$");
@@ -189,131 +151,89 @@
         critical ("Failed to compile URI regex. URL launching will be disabled");
       }
       
-
-      /* The last thing we do is export the controller. Once that is up,
-       * clients will expect the SharedModels to work */
-      control = new Unity.PlaceController ("/com/canonical/unity/applicationsplace");
-      control.add_entry (applications);
-      control.add_entry (runner.place_entry);
-      control.activation = this;
-      try {
-        control.export ();
-      } catch (IOError error) {
-        critical ("Failed to export DBus service for '%s': %s",
-                  control.dbus_path, error.message);
-      }
-
-      /* We should not start manipulating any of our models before they are
-       * all synchronized. When they are we set all_models_synced = true */
-      sections_model.notify["synchronized"].connect (check_models_synced);
-      groups_model.notify["synchronized"].connect (check_models_synced);
-      global_groups_model.notify["synchronized"].connect (check_models_synced);
-      results_model.notify["synchronized"].connect (check_models_synced);
-      global_results_model.notify["synchronized"].connect (check_models_synced);
-      all_models_synced = false;
-    }
-
-    /* The check_models_synced() method acts like a latch - once all models
-     * have reported themselves to be synchronized we set
-     * all_models_synced = true and tell the searches to re-check their state
-     * as they should refuse to run when all_models_synced == false */
-    private void check_models_synced (Object obj, ParamSpec pspec)
-    {
-      if ((applications.sections_model as Dee.SharedModel).synchronized &&
-          (applications.entry_renderer_info.groups_model as Dee.SharedModel).synchronized &&
-          (applications.entry_renderer_info.results_model as Dee.SharedModel).synchronized &&
-          (applications.global_renderer_info.groups_model as Dee.SharedModel).synchronized &&
-          (applications.global_renderer_info.results_model as Dee.SharedModel).synchronized) {
-        if (all_models_synced == false)
-          {
-            all_models_synced = true;
-            
-            populate_sections ();
-            populate_groups (applications.entry_renderer_info.groups_model);
-            populate_groups (applications.global_renderer_info.groups_model);
-            
-            /* Emitting notify here will make us recheck if the search results
-             * need update. In the negative case this is a noop */
-            applications.notify_property ("active-search");
-            applications.notify_property ("active-global-search");
-          }
-      }
-    }
-
-    private void populate_sections ()
-    {
-      var sections = applications.sections_model;
-
-      if (sections.get_n_rows() != 0)
-        {
-          debug ("Sections model already populated. We probably cloned it off Unity. Rebuilding.");
-          sections.clear ();
-        }
-
-      sections.append (_("All Applications"), "");
-      sections.append (_("Accessories"), "");
-      sections.append (_("Universal Access"), "");
-      sections.append (_("Developer Tools"), "");
-      sections.append (_("Education"), "");
-      sections.append (_("Science & Engineering"), "");
-      sections.append (_("Games"), "");
-      sections.append (_("Graphics"), "");
-      sections.append (_("Internet"), "");
-      sections.append (_("Multimedia"), "");
-      sections.append (_("Office"), "");
-      sections.append (_("Themes & Tweaks"), "");
-      sections.append (_("System"), "");
-    }
-
-    private void populate_groups (Dee.Model groups)
-    {
-      if (groups.get_n_rows() != 0)
-        {
-          debug ("The groups model already populated. We probably cloned it off Unity. Rebuilding.");
-          groups.clear ();
-        }
-
-      groups.append ("UnityShowcaseRenderer",
-                     _("Most Frequently Used"),
-                     ICON_PATH + "group-mostused.svg");
-      groups.append ("UnityDefaultRenderer",
-                     _("Installed"),
-                     ICON_PATH + "group-installed.svg");
-      groups.append ("UnityDefaultRenderer",
-                     _("Apps Available for Download"),
-                     ICON_PATH + "group-available.svg");
-      groups.append ("UnityEmptySearchRenderer",
-                     "No search results", // No i18n, should never be rendered
-                     "");
-      groups.append ("UnityEmptySectionRenderer",
-                     "Empty section", // No i18n, should never be rendered
-                     "");
-      
-      /* Always expand the Installed group */
-      applications.entry_renderer_info.set_hint ("ExpandedGroups",
-                                                 @"$((uint)Group.INSTALLED)");
-    }
-
-    private void populate_section_queries ()
-    {
-      /* XDG category names. Not for translation. */
-      /* We need the hack for ALL_APPLICATIONS below because Xapian doesn't
-       * like '' or '*' queries */
-      section_queries.add ("NOT category:XYZ"); //ALL_APPLICATIONS
-      section_queries.add ("(category:Utility AND NOT category:Accessibility)"); //ACCESSORIES
-      section_queries.add ("(category:Accessibility AND NOT category:Settings)"); //UNIVERSAL_ACCESS
-      section_queries.add ("category:Development"); //DEVELOPER_TOOLS FIXME emacs.desktop should be added
-      section_queries.add ("(category:Education AND NOT category:Science)"); // EDUCATION
-      section_queries.add ("(category:Science OR category:Engineering)"); // SCIENCE
-      section_queries.add ("category:Game"); // GAMES
-      section_queries.add ("category:Graphics"); // GRAPHICS
-      section_queries.add ("category:Network"); // INTERNET
-      section_queries.add ("category:AudioVideo"); // MULTIMEDIA
-      section_queries.add ("category:Office"); // OFFICE
-      section_queries.add ("category:Settings"); // THEMES
-      section_queries.add ("(category:System OR category:Security)"); // SYSTEM
-    }
-    
+      lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
+      lens.search_hint = _("Search Applications");
+      lens.visible = true;
+      lens.search_in_global = true;
+      populate_categories ();
+      populate_filters();
+      lens.add_local_scope (scope);
+      lens.export ();
+    }
+
+    /* Pre-populates the type queries so it's easier/faster to build our search */
+    private void populate_type_queries ()
+    {
+      type_queries = new HashTable<string, string> (null, null);
+      type_queries.insert ("all", "NOT category:XYZ");
+
+      type_queries.insert ("accessories", "(category:Utility AND NOT category:Accessibility)");
+      type_queries.insert ("education", "(category:Education AND NOT category:Science)");
+      type_queries.insert ("game", "category:Game");
+      type_queries.insert ("graphics", "category:Graphics");
+      type_queries.insert ("internet", "category:Network");
+      type_queries.insert ("fonts", "category:Fonts"); // FIXME: wtf?
+      type_queries.insert ("office", "category:Office");
+      type_queries.insert ("media", "category:AudioVideo");
+      type_queries.insert ("customization", "category:Settings");
+      type_queries.insert ("accessibility", "(category:Accessibility AND NOT category:Settings)");
+      type_queries.insert ("developer", "category:Development"); // FIXME emacs.desktop should be added
+      type_queries.insert ("science-and-engineering", "(category:Science OR category:Engineering)");
+      type_queries.insert ("system", "(category:System OR category:Security)");
+    }
+
+    private void populate_categories ()
+    {
+      Unity.Category[] categories = {};
+
+      var cat = new Unity.Category (_("Most Frequently Used"),
+                                    ICON_PATH + "category-mostused.svg");
+      categories += cat;
+
+      cat = new Unity.Category (_("Installed"),
+                                ICON_PATH + "category-installed.svg");
+      categories += cat;
+
+      cat = new Unity.Category (_("Apps Available for Download"),
+                                ICON_PATH + "category-available.svg");
+      categories += cat;
+
+      lens.categories = categories;
+    }
+
+    private void populate_filters()
+    {
+      Unity.Filter[] filters = {};
+
+      /* Type filter */
+      {
+        var filter = new RadioOptionFilter ("type", _("Type"));
+        filter.add_option ("accessories", _("Accessories"));
+        filter.add_option ("education", _("Education"));
+        filter.add_option ("games", _("Games"));
+        filter.add_option ("graphics", _("Graphics"));
+        filter.add_option ("internet", _("Internet"));
+        filter.add_option ("fonts", _("Fonts"));
+        filter.add_option ("office", _("Office"));
+        filter.add_option ("media", _("Media"));
+        filter.add_option ("customization", _("Customization"));
+        filter.add_option ("accessibility", _("Accessibility"));
+        filter.add_option ("developer", _("Developer"));
+        filter.add_option ("science-and-engineering", _("Science & Engineering"));
+        filter.add_option ("system", _("System"));
+
+        filters += filter;
+      }
+
+      /* Rating filter */
+      {
+        var filter = new RatingsFilter("rating", _("Rating"));
+        filters += filter;
+      }
+
+      lens.filters = filters;
+    }
+  
     /* 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 ()
@@ -323,10 +243,10 @@
           debug ("Building initial application menu");
         
           /* We need INCLUDE_NODISPLAY to employ proper de-duping between
-           * the Installed and Availabale groups. If a NoDisplay app is installed,
+           * 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 group */
-          app_menu = GMenu.Tree.lookup ("unity-place-applications.menu",
+           * 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) => {
@@ -350,7 +270,7 @@
 
     /* Called when our app_menu structure changes - probably because something
      * has been installed or removed. We rebuild the index and update the
-     * result models for global and entry. We need to update both because
+     * result models for global and scope. We need to update both because
      * we can't know exactly what Unity may be showing */
     private bool build_app_menu_index_and_result_models ()
     {
@@ -359,8 +279,8 @@
       debug ("Updating result models");
       previous_search = null;
       previous_global_search = null;
-      applications.notify_property ("active-search");
-      applications.notify_property ("active-global-search");
+      scope.notify_property ("active-search");
+      scope.notify_property ("active-global-search");
       
       return false;
     }
@@ -377,12 +297,13 @@
       zg_templates.add ((ev as GLib.Object).ref());
     }
 
-    private string prepare_zg_search_string (PlaceSearch? search, Section section)
+    private string prepare_zg_search_string (Unity.LensSearch? search,
+                                             string type_id="all")
     {
       
       string s;
       if (search != null)
-        s = search.get_search_string ();
+        s = search.search_string;
       else
         s = "";
 
@@ -394,26 +315,30 @@
       if (s != "")
         s = @"app:($s)";
       else
-        return section_queries.get(section);
+        return type_queries.lookup(type_id);
       
-      if (section == Section.ALL_APPLICATIONS)
+      if (type_id == "all")
         return s;
       else
-        return s + @" AND $(section_queries.get(section))";
+        return s + @" AND $(type_queries.lookup(type_id))";
     }
 
-    private async void update_entry_search (PlaceSearch? search,
-                                            Section section)
+    private async void update_scope_search (Unity.LensSearch? search)
     {
       /* Prevent concurrent searches and concurrent updates of our models,
        * by preventing any notify signals from propagating to us.
        * Important: Remeber to thaw the notifys again! */
-      applications.freeze_notify ();
+      scope.freeze_notify ();
 
-      var model = applications.entry_renderer_info.results_model;
+      var model = scope.results_model;
       model.clear ();
       
-      string pkg_search_string = prepare_pkg_search_string (search, section);
+      var filter = scope.get_filter ("type") as RadioOptionFilter;
+      Unity.FilterOption? option =  filter.get_active_option ();
+      string type_id = option == null ? "all" : option.id;
+
+      string pkg_search_string = prepare_pkg_search_string (search, type_id);
+
       bool has_search = !Utils.search_is_invalid (search);
       
       Timer timer = new Timer ();
@@ -425,7 +350,7 @@
                                               Unity.Package.Sort.BY_RELEVANCY :
                                               Unity.Package.Sort.BY_NAME);
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Group.INSTALLED);
+                             Category.INSTALLED);
       
       timer.stop ();
       debug ("Entry search listed %i Installed apps in %fms for query: %s",
@@ -437,7 +362,7 @@
        * So we can update the UI quicker */
       (model as Dee.SharedModel).flush_revision_queue ();
       
-      var zg_search_string = prepare_zg_search_string (search, section);      
+      var zg_search_string = prepare_zg_search_string (search, type_id);
 
       try {
         timer.start ();
@@ -449,7 +374,7 @@
                                              Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
                                              null);
 
-        append_events_with_group (results, model, Group.MOST_USED, section);
+        append_events_with_category (results, model, Category.MOST_USED);
         
         timer.stop ();
         debug ("Entry search found %u/%u Most Used apps in %fms for query '%s'",
@@ -458,7 +383,7 @@
 
       } catch (GLib.Error e) {
         warning ("Error performing search '%s': %s",
-                 search.get_search_string (), e.message);
+                 search.search_string, e.message);
       }
       
       /* We force a flush of the shared model's revision queue here because
@@ -475,7 +400,7 @@
                                                Unity.Package.SearchType.PREFIX,
                                                Unity.Package.Sort.BY_RELEVANCY);
           add_pkg_search_result (pkgresults, installed_uris, available_uris,
-                                 model, Group.AVAILABLE);
+                                 model, Category.AVAILABLE);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms for query: %s",
                  pkgresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
@@ -483,27 +408,21 @@
       else if (pkgsearcher != null)
         {
           timer.start ();
-          string? category = (section == Section.ALL_APPLICATIONS ?
-                                           null : section_queries.get(section));
+          string? category = null;
           var random_pkgresults = pkgsearcher.get_random_apps (category, 12);
           add_pkg_search_result (random_pkgresults, installed_uris, available_uris,
-                                 model, Group.AVAILABLE, 6);
+                                 model, Category.AVAILABLE, 6);
           timer.stop ();
           debug ("Entry search listed %i random Available apps in %fms",
                  random_pkgresults.num_hits, timer.elapsed ()*1000);
         }
       
-      if (has_search)
-        check_empty_search (search, model);
-      else
-        check_empty_section (section, model);
-      
       /* 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
        */
       Idle.add (() => {
-        applications.thaw_notify ();
+        scope.thaw_notify ();
         return false;
       });
       
@@ -511,9 +430,9 @@
         search.finished ();
     }
     
-    private async void update_global_search (PlaceSearch? search)
+    private async void update_global_search (Unity.LensSearch? search)
     {
-      var model = applications.global_renderer_info.results_model;
+      var model = scope.global_results_model;
     
       model.clear ();
       
@@ -525,10 +444,9 @@
       /* Prevent concurrent searches and concurrent updates of our models,
        * by preventing any notify signals from propagating to us.
        * Important: Remember to thaw the notifys again! */
-      applications.freeze_notify ();      
+      scope.freeze_notify ();
       
-      var search_string = prepare_pkg_search_string (search,
-                                                     Section.ALL_APPLICATIONS);
+      var search_string = prepare_pkg_search_string (search, "all");
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
       var timer = new Timer ();
@@ -536,14 +454,14 @@
                                            Unity.Package.SearchType.PREFIX,
                                            Unity.Package.Sort.BY_RELEVANCY);      
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Group.INSTALLED);
+                             Category.INSTALLED);
       
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, search_string);
 
       // Dowloadable Apps search disabled from global search
-      // See https://bugs.launchpad.net/unity-place-applications/+bug/733669
+      // See https://bugs.launchpad.net/unity-lens-applications/+bug/733669
       /*
       if (pkgsearcher != null)
         {      
@@ -558,7 +476,7 @@
                                                Unity.Package.SearchType.PREFIX,
                                                Unity.Package.Sort.BY_RELEVANCY);
           add_pkg_search_result (pkgresults, installed_uris, available_uris,
-                                 model, Group.AVAILABLE);
+                                 model, Category.AVAILABLE);
           timer.stop ();
           debug ("Global search listed %i Available apps in %fms for query: %s",
                  pkgresults.num_hits, timer.elapsed ()*1000, search_string);
@@ -570,7 +488,7 @@
        * changing the model even before we had flushed out current changes
        */
       Idle.add (() => {
-        applications.thaw_notify ();
+        scope.thaw_notify ();
         return false;
       });
       
@@ -578,18 +496,18 @@
         search.finished ();
     }
     
-    private string prepare_pkg_search_string (PlaceSearch? search, Section section)
+    private string prepare_pkg_search_string (Unity.LensSearch? search, string type_id="all")
     {       
       if (Utils.search_is_invalid (search))
         {
-          if (section == Section.ALL_APPLICATIONS)
+          if (type_id == "all")
             return "type:Application";
           else
-            return @"type:Application AND $(section_queries.get(section))";
+            return @"type:Application AND $(type_queries.lookup(type_id))";
         }
       else
         {
-          var s = search.get_search_string ();
+          var s = search.search_string;
 
           s = s.strip ();
           
@@ -600,10 +518,10 @@
            * match 'd-feet' etc. */
           s = s.delimit ("-", ' ');
 
-          if (section == Section.ALL_APPLICATIONS)
+          if (type_id == "all")
             return @"type:Application AND $s";
           else
-            return @"type:Application AND $(section_queries.get(section)) AND $s";
+            return @"type:Application AND $(type_queries.lookup(type_id)) AND $s";
         }
     }
     
@@ -668,14 +586,14 @@
     private void on_appinfo_changed (string id, AppInfo? appinfo)
     {
       debug ("Application changed: %s", id);
-      //update_entry_results_model.begin ();
+      //update_scope_results_model.begin ();
     }
     
     private void add_pkg_search_result (Unity.Package.SearchResult results,
                                         Set<string> installed_uris,
                                         Set<string> available_uris,
                                         Dee.Model model,
-                                        Group group,
+                                        Category category,
                                         uint max_add=0)
     {
       var appmanager = AppInfoManager.get_instance();
@@ -699,20 +617,20 @@
         /* Extract basic metadata and register de-dupe keys */
         string display_name;
         string comment;
-        switch (group)
+        switch (category)
         {
-          case Group.INSTALLED:
+          case Category.INSTALLED:
             installed_uris.add (uri);
             display_name = app.get_display_name ();
             comment = app.get_description ();
             break;
-          case Group.AVAILABLE:
+          case Category.AVAILABLE:
             available_uris.add (uri);
             display_name = pkginfo.application_name;
             comment = "";
             break;
           default:
-            warning (@"Illegal group for package search $(group)");
+            warning (@"Illegal category for package search $(category)");
             continue;
         } 
         
@@ -722,7 +640,7 @@
         if (app != null && !app.should_show ())
           continue;
                 
-        if (group == Group.AVAILABLE)
+        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
@@ -731,7 +649,7 @@
             if (app != null)
               continue;            
             
-            /* Apps that are not installed, ie. in the Available group
+            /* 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! */
@@ -742,7 +660,7 @@
         Icon icon = find_pkg_icon (pkginfo);
         
         model.append (uri, icon.to_string (),
-                      group,"application/x-desktop",
+                      category,"application/x-desktop",
                       display_name != null ? display_name : "",
                       comment != null ? comment : "");
         
@@ -754,10 +672,10 @@
     }
 
     /**
-     * Override of the default activation handler. The apps place daemon
+     * Override of the default activation handler. The apps lens daemon
      * can handle activation of installable apps using the Software Center
      */
-    public async uint32 activate (string uri)
+    public Unity.ActivationResponse activate (string uri)
     {
       string[] args;
       string exec_or_dir = null;
@@ -778,9 +696,10 @@
               AppInfo.launch_default_for_uri (orig, null);
             } catch (GLib.Error error) {
               warning ("Failed to launch URI %s", orig);
-              return ActivationStatus.NOT_ACTIVATED;
+              return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
             }
-            return ActivationStatus.ACTIVATED_HIDE_DASH;
+            return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+
           } else {
             exec_or_dir = Utils.subst_tilde (orig);
             args = exec_or_dir.split (" ", 0);
@@ -792,7 +711,7 @@
       else
         {
           debug ("Declined activation of URI '%s': Expected URI scheme unity-install:// or unity-runner://", uri);
-          return ActivationStatus.NOT_ACTIVATED;
+          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
         }
 
       if ((exec_or_dir != null) && FileUtils.test (exec_or_dir, FileTest.IS_DIR))
@@ -802,7 +721,7 @@
         } catch (GLib.Error err) {
             warning ("Failed to open current folder '%s' in file manager: %s",
                      exec_or_dir, err.message);
-          return ActivationStatus.NOT_ACTIVATED;
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
         }
       }
       else
@@ -813,20 +732,19 @@
           } catch (SpawnError e) {
             warning ("Failed to spawn software-center or direct URI activation '%s': %s",
                      uri, e.message);
-            return ActivationStatus.NOT_ACTIVATED;
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
           }
       }
 
-      return ActivationStatus.ACTIVATED_HIDE_DASH;
+      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
       
     }
 
     /* Appends the subject URIs from a set of Zeitgeist.Events to our Dee.Model
      * assuming that these events are already sorted */
-    public void append_events_with_group (Zeitgeist.ResultSet events,
+    public void append_events_with_category (Zeitgeist.ResultSet events,
                                           Dee.Model results,
-                                          uint group_id,
-                                          int section_filter = -1)
+                                          uint category_id)
     {
       foreach (var ev in events)
         {
@@ -848,90 +766,12 @@
           if (!app.should_show ())
             continue;          
           
-          results.append (app_uri, app.get_icon().to_string(), group_id,
+          results.append (app_uri, app.get_icon().to_string(), category_id,
                           "application/x-desktop", app.get_display_name (),
                           app.get_description ());
         }
     }
     
-    public void check_empty_search (PlaceSearch? search,
-                                    Dee.Model results_model)
-    {
-      if (results_model.get_n_rows () > 0)
-        return;
-      
-      if (Utils.search_is_invalid (search))
-        return;
-      
-      results_model.append ("", "", Group.EMPTY_SEARCH, "",
-                            _("Your search did not match any applications"),
-                            "");      
-      
-      // FIXME: Use prefered browser
-      // FIXME: URL escape search string
-      results_model.append (@"http://google.com/#q=$(search.get_search_string())",
-                            "", Group.EMPTY_SEARCH, "",
-                             _("Search the web"), "");
-    }
-    
-    public void check_empty_section (Section section,
-                                     Dee.Model results_model)
-    {
-      if (results_model.get_n_rows () > 0)
-        return;
-            
-      string msg;
-      
-      switch (section)
-      {
-        case Section.ALL_APPLICATIONS:
-          msg = _("There are no applications installed on this computer");
-          break;
-        case Section.ACCESSORIES:
-          msg = _("There are no accessories installed on this computer");
-          break;
-        case Section.UNIVERSAL_ACCESS:
-          msg = _("There are no universal access applications installed on this computer");
-          break;
-        case Section.DEVELOPER_TOOLS:
-          msg = _("There are no developer tools installed on this computer");
-          break;
-        case Section.EDUCATION:
-          msg = _("There are no educational applications installed on this computer");
-          break;
-        case Section.SCIENCE:
-          msg = _("There are no scientific or engineering applications installed on this computer");
-          break;
-        case Section.GAMES:
-          msg = _("There are no games installed on this computer");
-          break;
-        case Section.GRAPHICS:
-          msg = _("There are no graphics applications installed on this computer");
-          break;
-        case Section.INTERNET:
-          msg = _("There are no internet applications installed on this computer");
-          break;
-        case Section.MULTIMEDIA:
-          msg = _("There are no multimedia applications installed on this computer");
-          break;
-        case Section.OFFICE:
-          msg = _("There are no office applications installed on this computer");
-          break;
-        case Section.THEMES:
-          msg = _("There are no theming or tweaking applications installed on this computer");
-          break;
-        case Section.SYSTEM:
-          msg = _("There are no system applications installed on this computer");
-          break;
-        default:
-          msg = _("There are no applications installed on this computer");
-          warning ("Unknown section: %u", section);
-          break;
-      }
-      
-      results_model.append ("", "", Group.EMPTY_SECTION, "", msg, "");
-    }
-  
   } /* END: class Daemon */
 
 } /* namespace */
 
=== modified file 'src/main.vala'
--- src/main.vala	2011-01-31 10:37:41 +0000
+++ src/main.vala	2011-08-04 08:16:52 +0000
@@ -20,7 +20,7 @@
 using GLib;
 using Config;
 
-namespace Unity.ApplicationsPlace {
+namespace Unity.ApplicationsLens {
 
   static Application? app = null;
   static Daemon? daemon = null;
@@ -66,7 +66,7 @@
      * making it race against GDBus' worker thread to export our
      * objects on the bus before/after owning our name and receiving
      * method calls on our objects (which may not yet be up!)*/
-    if (dbus_name_has_owner ("com.canonical.Unity.ApplicationsPlace"))
+    if (dbus_name_has_owner ("com.canonical.Unity.Lens.Applications"))
       {
         print ("Another instance of the Unity Applications Daemon " +
                "already appears to be running.\nBailing out.\n");
@@ -78,7 +78,7 @@
     daemon = new Daemon ();
     
     /* Use GApplication directly for single instance app functionality */
-    app = new Application ("com.canonical.Unity.ApplicationsPlace",
+    app = new Application ("com.canonical.Unity.Lens.Applications",
                            ApplicationFlags.IS_SERVICE);
     try {
       app.register ();
 
=== modified file 'src/runner.vala'
--- src/runner.vala	2011-07-20 06:43:25 +0000
+++ src/runner.vala	2011-08-04 08:16:52 +0000
@@ -21,7 +21,7 @@
 using Gee;
 
 
-namespace Unity.ApplicationsPlace {
+namespace Unity.ApplicationsLens {
 
   private class AboutEntry {
     public string name;
@@ -39,20 +39,21 @@
   public class Runner: GLib.Object
   {  
   
-    private Unity.ApplicationsPlace.Daemon daemon;    
-    private const string BUS_NAME_PREFIX = "com.canonical.Unity.ApplicationsPlace.Runner";
+    private Unity.ApplicationsLens.Daemon daemon;    
+    private const string BUS_NAME_PREFIX = "com.canonical.Unity.ApplicationsLens.Runner";
     
     /* for now, load the same keys as gnome-panel */
     private const string HISTORY_KEY = "history";
     private const int    MAX_HISTORY = 10;
     
-    public Unity.PlaceEntryInfo place_entry;
+    public Unity.Lens lens;
+    public Unity.Scope scope;
 
     private bool all_models_synced;
 
     /* We remember the previous search so we can figure out if we should do
      * incremental filtering of the result models */
-    private PlaceSearch? previous_search;    
+    private LensSearch? previous_search;    
     
     private Gee.HashMap<string,AboutEntry> about_entries;
     private Gee.List<string> executables;
@@ -60,22 +61,61 @@
 
     private Settings gp_settings;
     
-    public Runner (Unity.ApplicationsPlace.Daemon daemon)
+    public Runner (Unity.ApplicationsLens.Daemon daemon)
     {
-      var sections_model = new Dee.SharedModel(BUS_NAME_PREFIX + "SectionsModel");
-      sections_model.set_schema ("s", "s");
-
-      var groups_model = new Dee.SharedModel(BUS_NAME_PREFIX + "GroupsModel");
-      groups_model.set_schema ("s", "s", "s");
-
-      var results_model = new Dee.SharedModel(BUS_NAME_PREFIX + "ResultsModel");
-      results_model.set_schema ("s", "s", "u", "s", "s", "s");
-    
-      place_entry = new PlaceEntryInfo ("/com/canonical/unity/applicationsplace/runner");
-      place_entry.sections_model = sections_model;
-      place_entry.entry_renderer_info.groups_model = groups_model;
-      place_entry.entry_renderer_info.results_model = results_model;
-
+      /* First create scope */
+      scope = new Unity.Scope ("/com/canonical/unity/scope/commands");
+      scope.search_in_global = false;
+            
+      /* Listen for changes to the lens scope search */
+      scope.notify["active-search"].connect (
+        (obj, pspec) => {
+          var search = scope.active_search;
+
+          if (!Utils.search_has_really_changed (previous_search, search))
+            return;
+
+          update_search.begin(search);
+          previous_search = search;
+        }
+      );
+
+      /* Re-do the search if the filters changed */
+      scope.filters_changed.connect (
+        () => {
+          var search = scope.active_search;
+          if (search.search_string == null)
+            return;
+
+          update_search.begin(search);
+          previous_search = search;
+          
+        }
+      );
+
+      // Listen for when the lens is hidden/shown by the Unity Shell
+      scope.notify["active"].connect(
+	      (obj, pspec) => {
+	        if (scope.active)
+	        {
+            var search = scope.active_search;
+            update_search.begin(search);
+            previous_search = search;
+          }
+	      }
+      );
+
+      scope.activate_uri.connect (daemon.activate);
+
+       /* Now create Lens */
+      lens = new Unity.Lens ("/com/canonical/unity/lens/commands", "commands");
+      lens.search_hint = _("Run a command");
+      lens.visible = false;
+      lens.search_in_global = false;
+      populate_categories ();
+      //populate_filters();
+      lens.add_local_scope (scope);
+      lens.export ();
       previous_search = null;
       
       /* create the private about entries */
@@ -89,78 +129,59 @@
       history = new Gee.ArrayList<string> ();
       load_history ();
       
-      /* Listen for changes to the place entry search */
-      place_entry.notify["active-search"].connect (
-        (obj, pspec) => {
-          if (!all_models_synced)
-            return;
-
-          var search = place_entry.active_search;
-          
-          if (!Utils.search_has_really_changed (previous_search, search))
-            return;
-          
-          update_search.begin(search);
-          previous_search = search;
-        }
-      );
-      
-      // Listen for when the place is hidden/shown by the Unity Shell
-      place_entry.notify["active"].connect(
-	      (obj, pspec) => {
-	        if (place_entry.active)
-	        {
-            var search = place_entry.active_search;
-            update_search.begin(search);
-            previous_search = search;
-          }
-	      }
-      );
-
-      /* We should not start manipulating any of our models before they are
-       * all synchronized. When they are we set all_models_synced = true */
-      sections_model.notify["synchronized"].connect (check_models_synced);
-      groups_model.notify["synchronized"].connect (check_models_synced);
-      results_model.notify["synchronized"].connect (check_models_synced);
-      all_models_synced = false;
-
       this.daemon = daemon;
     
     }
 
-    private async void update_search (PlaceSearch? search)
-    {
-      var model = place_entry.entry_renderer_info.results_model;
+    private void populate_categories ()
+    {
+      Unity.Category[] categories = {};
+
+      var cat = new Unity.Category (_("Results"),
+                                    ICON_PATH + "category-installed.svg");
+      categories += cat;
+
+      cat = new Unity.Category (_("History"),
+                                ICON_PATH + "category-available.svg");
+
+      categories += cat;
+
+      lens.categories = categories;
+    }
+
+    private async void update_search (LensSearch? search)
+    {
+      var model = scope.results_model;
       var executables_match = new Gee.ArrayList<string> ();
       var dirs_match = new Gee.ArrayList<string> ();
       model.clear ();
 
-      var search_string = search.get_search_string ();
+      var search_string = search.search_string;
       bool has_search = !Utils.search_is_invalid (search);
 
       string uri;      
       Icon icon;
       string mimetype;
       string display_name;
-      var group_id = RunnerGroup.HISTORY;
+      var category_id = RunnerCategory.HISTORY;
 
       foreach (var command in this.history)
       {          
         display_name = get_icon_uri_and_mimetype (command, out icon, out uri, out mimetype);   
         model.append (uri, icon.to_string (),
-                      group_id, mimetype,
+                      category_id, mimetype,
                       display_name,
                       null);
       }
               
       /* Prevent concurrent searches and concurrent updates of our models,
        * by preventing any notify signals from propagating to us.
-       * Important: Remember to thaw the notifys with release_entrylock()! */
-      place_entry.freeze_notify ();
+       * Important: Remember to thaw the notifys with release_scopelock()! */
+      scope.freeze_notify ();
 
       if (!has_search)
       {
-        release_entrylock ();
+        release_scopelock ();
         search.finished ();
         return;
       }
@@ -177,7 +198,7 @@
                       0, "no-mime",
                       commenteaster,
                       null);
-        release_entrylock ();
+        release_scopelock ();
         search.finished ();
         return;
       }
@@ -190,7 +211,7 @@
                       0, "no-mime",
                       commentnoeaster,
                       null);
-        release_entrylock ();
+        release_scopelock ();
         search.finished ();
         return;
          
@@ -261,13 +282,13 @@
       executables_match.sort ();
       dirs_match.sort ();
       
-      group_id = RunnerGroup.RESULTS;
+      category_id = RunnerCategory.RESULTS;
 
       // populate results
       // 1. enable launching the exact search string
       display_name = get_icon_uri_and_mimetype (search_string, out icon, out uri, out mimetype);
       model.append (uri.strip (), icon.to_string (),
-                    group_id, mimetype,
+                    category_id, mimetype,
                     display_name,
                     null);
       
@@ -278,7 +299,7 @@
       {
         uri = @"unity-runner://$(dir)";
         model.append (uri, icon.to_string (),
-                      group_id, mimetype,
+                      category_id, mimetype,
                       dir,
                       null);        
       }
@@ -291,7 +312,7 @@
         display_name = get_icon_uri_and_mimetype (final_exec, out icon, out uri, out mimetype);   
         
         model.append (uri, icon.to_string (),
-                      group_id, mimetype,
+                      category_id, mimetype,
                       display_name,
                       null);
       }
@@ -301,18 +322,18 @@
              dirs_match.size, executables_match.size, timer.elapsed ()*1000, search_string);
       
 
-      release_entrylock ();
+      release_scopelock ();
       search.finished ();
     }
     
-    private void release_entrylock ()
+    private void release_scopelock ()
     {
        /* 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
        */
       Idle.add (() => {
-        place_entry.thaw_notify ();
+        scope.thaw_notify ();
         return false;
       });       
     }
@@ -395,51 +416,8 @@
       return exec_string;
       
     }
-
-    
-    /* The check_models_synced() method acts like a latch - once all models
-     * have reported themselves to be synchronized we set
-     * all_models_synced = true and tell the searches to re-check their state
-     * as they should refuse to run when all_models_synced == false */
-    private void check_models_synced (Object obj, ParamSpec pspec)
-    {
-      if ((place_entry.sections_model as Dee.SharedModel).synchronized &&
-          (place_entry.entry_renderer_info.groups_model as Dee.SharedModel).synchronized &&
-          (place_entry.entry_renderer_info.results_model as Dee.SharedModel).synchronized) {
-        if (all_models_synced == false)
-          {
-            all_models_synced = true;
-            
-            populate_groups (place_entry.entry_renderer_info.groups_model);
-            
-            /* Emitting notify here will make us recheck if the search results
-             * need update. In the negative case this is a noop */
-            place_entry.notify_property ("active-search");
-          }
-      }
-    }
-    
-    private void populate_groups (Dee.Model groups)
-    {
-      if (groups.get_n_rows() != 0)
-        {
-          debug ("The groups model already populated. We probably cloned it off Unity. Rebuilding.");
-          groups.clear ();
-        }
-
-      // TODO: needs asset
-      groups.append ("UnityDefaultRenderer",
-                     _("Results"),
-                     ICON_PATH + "group-installed.svg");
-      groups.append ("UnityDefaultRenderer",
-                     _("History"),
-                     ICON_PATH + "group-available.svg");
-
-      /* expand the history */
-      place_entry.entry_renderer_info.set_hint ("ExpandedGroups",
-                                                 @"$((uint)RunnerGroup.HISTORY)");
-    }
-    
+ 
+
     public void add_history (string last_command)
     {
 
@@ -472,7 +450,7 @@
       }
       
       // force a search to refresh history order (TODO: be more clever in the future)
-      update_search.begin(place_entry.active_search);
+      update_search.begin(scope.active_search);
     }
     
     private void load_history ()
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2011-03-10 10:56:46 +0000
+++ src/schemas.vala	2011-08-04 08:16:52 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-namespace Unity.ApplicationsPlace {
+namespace Unity.ApplicationsLens {
 
   public enum ResultsColumn
   {
@@ -29,38 +29,7 @@
     COMMENT
   }
   
-  public enum SectionsColumn
-  {
-    DISPLAY_NAME = 0,
-    ICON_HINT
-  }
-  
-  public enum Section
-  {
-    ALL_APPLICATIONS = 0,
-    ACCESSORIES,
-    UNIVERSAL_ACCESS,
-    DEVELOPER_TOOLS,
-    EDUCATION,
-    SCIENCE,
-    GAMES,
-    GRAPHICS,
-    INTERNET,
-    MULTIMEDIA,
-    OFFICE,
-    THEMES,
-    SYSTEM,
-    LAST_SECTION
-  }
-  
-  public enum GroupsColumn
-  {
-    RENDERER = 0,
-    DISPLAY_NAME,
-    ICON_HINT
-  }
-  
-  public enum Group
+ public enum Category
   {
     MOST_USED,
     INSTALLED,
@@ -69,7 +38,7 @@
     EMPTY_SECTION
   }
   
-  public enum RunnerGroup
+  public enum RunnerCategory
   {
     RESULTS,
     HISTORY
 
=== modified file 'src/utils.vala'
--- src/utils.vala	2011-03-31 01:30:09 +0000
+++ src/utils.vala	2011-08-04 08:16:52 +0000
@@ -20,7 +20,7 @@
 using Unity;
 using Gee;
  
-namespace Unity.ApplicationsPlace.Utils
+namespace Unity.ApplicationsLens.Utils
 { 
   
   public AppInfo? get_app_info_for_actor (string actor)
@@ -71,22 +71,22 @@
     return actor;
   }
   
-  public bool search_is_invalid (PlaceSearch? search)
+  public bool search_is_invalid (Unity.LensSearch? search)
   {
     /* This boolean expression is unfolded as we seem to get
     * some null dereference if we join them in a big || expression */
     if (search == null)
         return true;
-    else if (search.get_search_string () == null)
+    else if (search.search_string == null)
         return true;
   
-    return search.get_search_string () == "";
+    return search.search_string == "";
   }
   
   /* Sloppy and null-safe equality checking. null == "" and strings
    * are stripped of whitespace before comparison */
-  private bool search_has_really_changed (PlaceSearch? old_search,
-                                          PlaceSearch? new_search)
+  private bool search_has_really_changed (Unity.LensSearch? old_search,
+                                          Unity.LensSearch? new_search)
   {
     if (old_search == null && new_search == null)
       return false;
@@ -95,7 +95,7 @@
    
     if (old_search == null)
       {
-        s1 = new_search.get_search_string ();
+        s1 = new_search.search_string;
         if (s1 == null || s1.strip() == "")
           return false;
         else
@@ -103,7 +103,7 @@
       }
     else if (new_search == null)
       {
-        s2 = old_search.get_search_string ();
+        s2 = old_search.search_string;
         if (s2 == null || s2.strip() == "")
           return false;
         else
@@ -111,8 +111,8 @@
       }
     else
       {
-        s1 = new_search.get_search_string ();
-        s2 = old_search.get_search_string ();
+        s1 = new_search.search_string;
+        s2 = old_search.search_string;
         if (s1 == null)
           {
             if (s2 == null || s2.strip() == "")