Merge lp:~stolowski/unity-lens-applications/fuzzy-public-content into lp:unity-lens-applications

[Paweł Stołowski]

Mark results of libcolumbus fuzzy searches as 'default' content (as opposed to 'personal'). Also mark apps returned by software-center-dbus-provider as 'default', unless they were purchased before.

Mark results of libcolumbus fuzzy searches as 'default' content (as opposed to 'personal'). Also mark apps returned by software-center-dbus-provider as 'default', unless they were purchased before.

[lp:~stolowski/unity-lens-applications/fuzzy-public-content]

348. By Paweł Stołowski on 2013-05-08

Fixed conditional to treat all apps from category other than AVAILABLE as personal content, as this also includes
more categories than just INSTALLED (e.g. RECENT apps).

Unmerged revisions

348. By Paweł Stołowski on 2013-05-08

Fixed conditional to treat all apps from category other than AVAILABLE as personal content, as this also includes
more categories than just INSTALLED (e.g. RECENT apps).

347. By Paweł Stołowski on 2013-05-08

Mark results of libcolumbus fuzzy searches as 'default' content (as opposed to 'personal'). Also mark apps returned by software-center-dbus-provider
as 'default', unless they were purchased before.

346. By PS Jenkins bot on 2013-05-07

Releasing 6.10.0daily13.05.07ubuntu.unity.experimental.certified-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

345. By Michal Hruby on 2013-05-02

Remove an old icon used by the commands scope.

Approved by Pawel Stolowski, PS Jenkins bot.

344. By James Henstridge on 2013-05-01

Add screenshots to local scope previews with information obtained from the software center, escape markup characters in descriptions and don't allow the user to disable the applications scope. Fixes: https://bugs.launchpad.net/bugs/1174453, https://bugs.launchpad.net/bugs/1174910.

Approved by PS Jenkins bot, Michal Hruby.

343. By James Henstridge on 2013-05-01

Various scope search result fixes: show local scopes on empty search, filter out master scopes from results and move disabled local scopes to available category. Fixes: https://bugs.launchpad.net/bugs/1174464.

Approved by Michal Hruby, PS Jenkins bot.

342. By Michal Hruby on 2013-04-29

Update the scope description.

Approved by Pawel Stolowski, PS Jenkins bot.

341. By James Henstridge on 2013-04-25

Index local scopes and include them in the search results. Fixes: https://bugs.launchpad.net/bugs/1170713.

Approved by Michal Hruby, PS Jenkins bot.

340. By Andrea Azzarone on 2013-04-23

Don't show the ratings widget for remote scope. Fixes: https://bugs.launchpad.net/bugs/1170715.

Approved by Michal Hruby, PS Jenkins bot.

339. By PS Jenkins bot on 2013-04-23

Releasing 6.10.0daily13.04.23ubuntu.unity.experimental.certified-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

=== modified file 'Makefile.am'
--- Makefile.am	2013-02-15 10:11:07 +0000
+++ Makefile.am	2013-05-08 13:32:23 +0000
@@ -4,18 +4,14 @@
 #
 # Install the applications.lens file
 #
-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)
+scope_in_files = applications.scope.in commands.scope.in
+scopedir = $(datadir)/unity/scopes
+scope_DATA = $(scope_in_files:.scope.in=.scope)
 
 icondir = $(datadir)/unity/themes
 icon_DATA = applications.png
 
-@INTLTOOL_LENS_RULE@
+@INTLTOOL_SCOPE_RULE@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
@@ -37,7 +33,7 @@
 EXTRA_DIST = \
   applications.png \
   autogen.sh \
-  $(lens_in_files) \
+  $(scope_in_files) \
   AUTHORS \
   COPYING \
   HACKING \
@@ -50,8 +46,7 @@
   $(NULL)
 
 CLEANFILES = \
-  $(lens_DATA) \
-  $(cmdlens_DATA) \
+  $(scope_DATA) \
   $(NULL)
 
 include $(top_srcdir)/Makefile.am.coverage
 
=== removed file 'applications.lens.in.in'
--- applications.lens.in.in	2012-07-04 16:05:38 +0000
+++ applications.lens.in.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Lens]
-DBusName=com.canonical.Unity.Lens.Applications
-DBusPath=/com/canonical/unity/lens/applications
-_Name=Applications
-Icon=@prefix@/share/unity/6/lens-nav-app.svg
-Description=
-_SearchHint=Search Applications
-Shortcut=a
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-lens-applications
-
 
=== added file 'applications.scope.in.in'
--- applications.scope.in.in	1970-01-01 00:00:00 +0000
+++ applications.scope.in.in	2013-05-08 13:32:23 +0000
@@ -0,0 +1,13 @@
+[Scope]
+DBusName=com.canonical.Unity.Scope.Applications
+DBusPath=/com/canonical/unity/scope/applications
+Icon=@prefix@/share/unity/icons/lens-nav-app.svg
+_Name=Applications
+_Description=This is an Ubuntu search plugin that enables information from local applications to be searched and displayed in the Dash underneath the Applications header. If you do not wish to search this content source, you can disable this search plugin.
+Type=applications
+_SearchHint=Search Applications
+Shortcut=a
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=unity-lens-applications
+
 
=== renamed file 'commands.lens.in.in' => 'commands.scope.in.in'
--- commands.lens.in.in	2011-08-08 22:05:14 +0000
+++ commands.scope.in.in	2013-05-08 13:32:23 +0000
@@ -1,8 +1,10 @@
-[Lens]
-DBusName=com.canonical.Unity.Lens.Applications
-DBusPath=/com/canonical/unity/lens/commands
+[Scope]
+DBusName=com.canonical.Unity.Scope.Applications
+DBusPath=/com/canonical/unity/scope/commands
 _Name=Commands
-Icon=@prefix@/share/unity/themes/applications.png
+_Description=This is an Ubuntu search plugin that enables information from local binaries to be searched and displayed in the Dash. If you do not wish to search this content source, you can disable this search plugin.
+Icon=
+Type=commands
 _SearchHint=Run a command
 Visible=false
 
 
=== modified file 'configure.ac'
--- configure.ac	2013-03-01 15:11:29 +0000
+++ configure.ac	2013-05-08 13:32:23 +0000
@@ -47,10 +47,10 @@
 AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
 
 ######################################################
-# intltool rule for generating translated .lens file
+# intltool rule for generating translated .scope file
 ######################################################
-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)
+INTLTOOL_SCOPE_RULE='%.scope: %.scope.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_SCOPE_RULE)
 
 ###########################
 # gcov coverage reporting
@@ -77,6 +77,7 @@
                   zeitgeist-1.0 >= 0.3.8
                   libcolumbus0 >= 0.4.0
                   unity >= 6.7.0
+                  unity-protocol-private
                   libgnome-menu-3.0 >= 3.6.0)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
@@ -138,6 +139,12 @@
 AS_AC_EXPAND(DATADIR, $datarootdir)
 AC_SUBST(DATADIR)
 
+#####################################################
+# Look for protocol-private lib dir
+#####################################################
+PROTOCOLPRIVATELIBDIR="`$PKG_CONFIG --variable=libdir unity-protocol-private`/libunity"
+AC_SUBST(PROTOCOLPRIVATELIBDIR)
+
 #############################################
 # look for dbus service dir
 #############################################
@@ -159,8 +166,8 @@
 #############################################
 AC_CONFIG_FILES([
   Makefile
-  applications.lens.in
-  commands.lens.in
+  applications.scope.in
+  commands.scope.in
   data/com.canonical.Unity.AppsLens.gschema.xml.in
   data/Makefile
   data/X-Unity-All-Applications.directory
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-11-08 04:49:06 +0000
+++ data/Makefile.am	2013-05-08 13:32:23 +0000
@@ -2,7 +2,7 @@
 # DBus service files
 #############################################################
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  unity-lens-applications.service.in
+service_in_files =  unity-scope-applications.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
@@ -39,6 +39,6 @@
   $(menu_in_files)
 
 CLEANFILES = \
-  unity-lens-applications.service \
+  unity-scope-applications.service \
   $(gsettings_SCHEMAS)
 
 
=== renamed file 'data/unity-lens-applications.service.in' => 'data/unity-scope-applications.service.in'
--- data/unity-lens-applications.service.in	2012-11-08 04:49:06 +0000
+++ data/unity-scope-applications.service.in	2013-05-08 13:32:23 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.Unity.Lens.Applications
+Name=com.canonical.Unity.Scope.Applications
 Exec=@pkglibexecdir@/unity-applications-daemon
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 21:58:08 +0000
+++ debian/changelog	2013-05-08 13:32:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity-lens-applications (6.10.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]
@@ -25,6 +26,48 @@
 
  -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:02 +0000
 
+=======
+unity-lens-applications (6.10.0daily13.05.07ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
+
+  [ James Henstridge ]
+  * Master scopes shouldn't be displayed in App Lens results (LP:
+    #1174464)
+  * Previews for scopes should use a screenshot of web page (LP:
+    #1174453)
+  * It should not be possible to disable the App Scope from within the
+    App Lens preview. (LP: #1174910)
+  * The “Search Plugins” filter in the apps lens displays remote scopes
+    only (LP: #1170713)
+
+  [ Andrea Azzarone ]
+  * Search Plugins previews in the apps lens should not display any
+    ‘review stars’ (LP: #1170715)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 345 (ubuntu-unity/experimental-
+    certified)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 07 May 2013 10:43:23 +0000
+
+unity-lens-applications (6.10.0daily13.04.23ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
+
+  [ Michal Hruby ]
+  * Application scope not behaving when searching for " " with filters
+    (LP: #1161337)
+
+  [ Mathieu Trudel-Lapierre <[e-mail]>, Jussi Pakkanen ]
+  * search in application lens is innacurate (LP: #1159812)
+
+  [ Mathieu Trudel-Lapierre ]
+  * search in application lens is innacurate (LP: #1159812)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 338 (ubuntu-unity/experimental-
+    certified)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 23 Apr 2013 07:03:12 +0000
+
+>>>>>>> MERGE-SOURCE
 unity-lens-applications (6.10.0daily13.04.15-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]
@@ -38,6 +81,18 @@
 
  -- Ubuntu daily release <[e-mail]>  Mon, 15 Apr 2013 04:17:07 +0000
 
+unity-lens-applications (6.10.0daily13.04.10ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
+
+  [ Didier Roche ]
+  * debian/control:
+    - bump build-dep on latest libunity version
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 335 (ubuntu-unity/experimental-
+    certified)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 10 Apr 2013 07:14:44 +0000
+
 unity-lens-applications (6.10.0daily13.03.06-0ubuntu1) raring; urgency=low
 
   [ Jussi Pakkanen ]
 
=== modified file 'debian/control'
--- debian/control	2013-04-12 12:21:04 +0000
+++ debian/control	2013-05-08 13:32:23 +0000
@@ -11,7 +11,7 @@
                libgee-dev,
                libdee-dev (>= 0.5.16),
                libzeitgeist-dev (>= 0.3.8),
-               libunity-dev (>= 6.8.0),
+               libunity-dev (>= 6.91),
                libgnome-menu-3-dev,
                dh-autoreconf,
                libxapian-dev,
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-04 10:07:39 +0000
+++ po/POTFILES.in	2013-05-08 13:32:23 +0000
@@ -4,5 +4,5 @@
 src/utils.vala
 src/main.vala
 data/X-Unity-All-Applications.directory.in
-[type: gettext/ini]applications.lens.in.in
-[type: gettext/ini]commands.lens.in.in
+[type: gettext/ini]applications.scope.in.in
+[type: gettext/ini]commands.scope.in.in
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-02-22 12:05:05 +0000
+++ src/Makefile.am	2013-05-08 13:32:23 +0000
@@ -35,6 +35,7 @@
   --pkg dee-1.0 \
   --pkg zeitgeist-1.0 \
   --pkg unity \
+  --pkg unity-protocol \
   --pkg gee-1.0 \
   --pkg libgnome-menu-3.0 \
   --pkg unity-package-search \
@@ -54,7 +55,7 @@
   unity-ratings-db.o \
   $(NULL)
 
-unity_applications_daemon_LDFLAGS = $(COVERAGE_LDFLAGS)
+unity_applications_daemon_LDFLAGS = -rpath $(PROTOCOLPRIVATELIBDIR) $(COVERAGE_LDFLAGS)
 
 unity_applications_daemon_VALASOURCES = \
   app-watcher.vala \
 
=== modified file 'src/config.vala.in'
--- src/config.vala.in	2010-06-22 07:36:19 +0000
+++ src/config.vala.in	2013-05-08 13:32:23 +0000
@@ -4,6 +4,8 @@
   
   const string DATADIR = "@DATADIR@";
   
+  const string PKGDATADIR = "@DATADIR@/unity";
+
   const string BINDIR = "@prefix@/bin";
   
   const string LOCALEDIR = "@DATADIR@/locale";
@@ -11,4 +13,4 @@
   const string PACKAGE = "@PACKAGE@";
   
   const string VERSION = "@VERSION@";
-}
 \ No newline at end of file
+}
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-04-22 17:45:49 +0000
+++ src/daemon.vala	2013-05-08 13:32:23 +0000
@@ -42,9 +42,13 @@
 
   const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
   const string GENERIC_APP_ICON = "applications-other";
+  const string GENERIC_SCOPE_ICON = ICON_PATH + "service-generic.svg";
+
+  const string LIBUNITY_SCHEMA = "com.canonical.Unity.Lenses";
 
   public class Daemon : GLib.Object
   {
+    private Variant empty_asv;
     private Zeitgeist.Log log;
     private Zeitgeist.Index zg_index;
     private Zeitgeist.Monitor monitor;
@@ -55,14 +59,14 @@
     /* The searcher for online material may be null if it fails to load
      * the Xapian index from the Software Center */
     private Unity.Package.Searcher? pkgsearcher;
+    private Unity.Package.Searcher? scopesearcher;
     public Unity.Package.Searcher appsearcher;
 
     /* Read the app ratings dumped by the Software Center */
     private bool ratings_db_initialized = false;
     private Unity.Ratings.Database? ratings = null;
 
-    private Unity.Lens lens;
-    private Unity.Scope scope;
+    private Unity.DeprecatedScope scope;
 
     /* Support aptd dbus interface; created when application install/remove was requested by preview action */
     private AptdProxy aptdclient;
@@ -107,6 +111,7 @@
     private Regex  mountable_regex;
 
     private Settings gp_settings;
+    private HashTable<unowned string, unowned string> disabled_scope_ids;
 
     private const string DISPLAY_RECENT_APPS_KEY = "display-recent-apps";
     private const string DISPLAY_AVAILABLE_APPS_KEY = "display-available-apps";
@@ -116,6 +121,9 @@
     public bool force_small_icons_for_suggestions { get; set; default = true; }
 
     private PurchaseInfoHelper purchase_info = null;
+    private Dee.Model remote_scopes_model;
+    private Dee.Index scopes_index;
+    private Dee.Analyzer analyzer;
 
     construct
     {
@@ -123,6 +131,7 @@
 
       log = new Zeitgeist.Log();
       zg_index = new Zeitgeist.Index();
+      empty_asv = new Variant.array (new VariantType ("{sv}"), {});
       monitor = new Zeitgeist.Monitor (new Zeitgeist.TimeRange.from_now (),
                                        zg_templates);
       monitor.events_inserted.connect (mark_dirty);
@@ -159,14 +168,17 @@
       image_extensions.add ("jpg");
 
       build_app_menu_index ();
+      build_scope_index.begin ();
 
       file_icon_cache = new HashTable<string,Icon>(str_hash, str_equal);
       sc_mangler = new SoftwareCenterUtils.MangledDesktopFileLookup ();
 
-      scope = new Unity.Scope ("/com/canonical/unity/scope/applications");
-      scope.provides_personal_content = true;
-      //scope.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
+      scope = new Unity.DeprecatedScope ("/com/canonical/unity/scope/applications",
+                               "applications");
 
+      scope.search_hint = _("Search Applications");
+      scope.search_in_global = true;
+      // scope.sources_display_name = _("Sources");
       // TRANSLATORS: Please make sure this string is short enough to fit
       // into the filter button
       local_apps_option = scope.sources.add_option ("local", _("Local Apps"));
@@ -177,6 +189,10 @@
         usc_apps_option = scope.sources.add_option ("usc", _("Software Center"));
       }
 
+      populate_categories ();
+      populate_filters();
+      //scope.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
+
       scope.generate_search_key.connect ((lens_search) =>
       {
         return lens_search.search_string.strip ();
@@ -184,16 +200,10 @@
       /* Listen for changes to the lens scope search */
       scope.search_changed.connect ((lens_search, search_type, cancellable) =>
       {
-        dispatch_search (lens_search, search_type, cancellable);
-      });
-
-      /* Re-do the search if the filters changed */
-      scope.filters_changed.connect (() =>
-      {
-        scope.queue_search_changed (SearchType.DEFAULT);
-      });
-
-      /* And also if the sources change */
+        dispatch_search.begin (lens_search, search_type, cancellable);
+      });
+
+      /* Re-do the search if the sources change */
       scope.active_sources_changed.connect (() =>
       {
         scope.queue_search_changed (SearchType.DEFAULT);
@@ -225,15 +235,35 @@
       aptdclient = new AptdProxy ();
       launcherservice = new LauncherProxy ();
 
-      lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
-      lens.search_hint = _("Search Applications");
-      lens.visible = true;
-      lens.search_in_global = true;
-      lens.sources_display_name = _("Sources");
-      populate_categories ();
-      populate_filters();
-      lens.add_local_scope (scope);
-      lens.export ();
+      scope.export ();
+
+      remote_scopes_model = new Dee.SharedModel ("com.canonical.Unity.SmartScopes.RemoteScopesModel");
+      remote_scopes_model.set_schema ("s", "s", "s", "s", "s", "as");
+
+      scopes_index = Utils.prepare_index (remote_scopes_model,
+                                          RemoteScopesColumn.NAME,
+                                          (model, iter) =>
+      {
+        unowned string name = model.get_string (iter, RemoteScopesColumn.NAME);
+        return "%s\n%s".printf (_("scope"), name);
+      }, out analyzer);
+
+      disabled_scope_ids = new HashTable<unowned string, unowned string> (str_hash, str_equal);
+      update_disabled_scopes_hash ();
+
+      var pref_man = PreferencesManager.get_default ();
+      pref_man.notify["disabled-scopes"].connect (update_disabled_scopes_hash);
+    }
+
+    private void update_disabled_scopes_hash ()
+    {
+      disabled_scope_ids.remove_all ();
+      var pref_man = PreferencesManager.get_default ();
+      foreach (unowned string scope_id in pref_man.disabled_scopes)
+      {
+        // using HashTable as a set (optimized in glib when done like this)
+        disabled_scope_ids[scope_id] = scope_id;
+      }
     }
 
     private void init_ratings_db ()
@@ -251,9 +281,9 @@
       ratings_db_initialized = true;
     }
 
-    private async void dispatch_search (LensSearch lens_search,
+    private async void dispatch_search (DeprecatedScopeSearch search,
                                         SearchType search_type,
-                                        Cancellable cancellable)
+                                        GLib.Cancellable cancellable)
     {
       if (popularities_dirty)
       {
@@ -265,43 +295,45 @@
       }
 
       if (search_type == SearchType.DEFAULT)
-        yield update_scope_search (lens_search, cancellable);
+        yield update_scope_search (search, cancellable);
       else
-        yield update_global_search (lens_search, cancellable);
+        yield update_global_search (search, cancellable);
+
+      search.finished ();
     }
 
     private void populate_categories ()
     {
-      GLib.List<Unity.Category> categories = new GLib.List<Unity.Category> ();
+      Unity.CategorySet categories = new Unity.CategorySet ();
       File icon_dir = File.new_for_path (ICON_PATH);
 
-      var cat = new Unity.Category (_("Applications"),
+      var cat = new Unity.Category ("apps", _("Applications"),
                                     new FileIcon (icon_dir.get_child ("group-apps.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat = new Unity.Category (_("Recently Used"),
+      cat = new Unity.Category ("recently-used", _("Recently Used"),
                                 new FileIcon (icon_dir.get_child ("group-recent.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat = new Unity.Category (_("Recent Apps"),
+      cat = new Unity.Category ("recent", _("Recent Apps"),
                                 new FileIcon (icon_dir.get_child ("group-apps.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat = new Unity.Category (_("Installed"),
+      cat = new Unity.Category ("installed", _("Installed"),
                                 new FileIcon (icon_dir.get_child ("group-installed.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat = new Unity.Category (_("More suggestions"),
+      cat = new Unity.Category ("more", _("More suggestions"),
                                 new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")),
                                 Unity.CategoryRenderer.FLOW);
-      categories.append (cat);
+      categories.add (cat);
 
-      lens.categories = categories;
+      scope.categories = categories;
     }
 
     private void populate_filters()
     {
-      GLib.List<Unity.Filter> filters = new GLib.List<Unity.Filter> ();
+      Unity.FilterSet filters = new Unity.FilterSet ();
 
       /* Type filter */
       {
@@ -320,25 +352,28 @@
         filter.add_option ("accessibility", _("Accessibility"));
         filter.add_option ("developer", _("Developer"));
         filter.add_option ("science-and-engineering", _("Science & Engineering"));
+        filter.add_option ("scopes", _("Search plugins"));
         filter.add_option ("system", _("System"));
 
-        filters.append (filter);
+        filters.add (filter);
       }
 
-      lens.filters = filters;
+      scope.filters = filters;
     }
 
-    private bool local_apps_active ()
+    private bool local_apps_active (DeprecatedScopeSearch search)
     {
-      if (scope.sources.filtering && local_apps_option != null)
-        return local_apps_option.active;
+      var filter = search.get_filter (scope.sources.id) as Unity.OptionsFilter;
+      if (filter.filtering && local_apps_option != null)
+        return filter.get_option (local_apps_option.id).active;
       return true;
     }
 
-    private bool usc_apps_active ()
+    private bool usc_apps_active (DeprecatedScopeSearch search)
     {
-      if (scope.sources.filtering && usc_apps_option != null)
-        return usc_apps_option.active;
+      var filter = search.get_filter (scope.sources.id) as Unity.OptionsFilter;
+      if (filter.filtering && usc_apps_option != null)
+        return filter.get_option (usc_apps_option.id).active;
       return true;
     }
 
@@ -401,6 +436,15 @@
       return false;
     }
 
+    private async void build_scope_index ()
+    {
+      var scope_registry = yield Unity.Protocol.ScopeRegistry.find_scopes (
+        Config.PKGDATADIR + "/scopes");
+
+      debug ("Indexing scopes");
+      scopesearcher = new Unity.Package.Searcher.for_scopes (scope_registry);
+    }
+
     private void populate_zg_templates ()
     {
       /* Create a template that activation of applications */
@@ -430,7 +474,7 @@
                                         zg_templates,
                                         StorageState.ANY,
                                         256,
-                                        ResultType.MOST_POPULAR_SUBJECTS,
+                                        Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
                                         null);
 
         // most popular apps must have high value, so unknown apps (where
@@ -461,21 +505,22 @@
       return app == null;
     }
 
-    private async void update_scope_search (Unity.LensSearch search,
-                                            Cancellable cancellable)
+    private async void update_scope_search (DeprecatedScopeSearch search,
+                                            GLib.Cancellable cancellable)
     {
       var model = search.results_model;
       /* We'll clear the model once we finish waiting for the dbus-call
        * to finish, to prevent flicker. */
 
-      debug ("Searching for: %s", search.search_string);
-
-      var filter = scope.get_filter ("type") as OptionsFilter;
-
-      string pkg_search_string = XapianUtils.prepare_pkg_search_string (search.search_string, filter);
-
-      bool has_filter = (filter != null && filter.filtering);
-      bool has_search = !Utils.is_search_empty (search.search_string);
+      var search_string = search.search_string.strip ();
+      debug ("Searching for: %s", search_string);
+
+      var type_filter = search.get_filter ("type") as OptionsFilter;
+
+      string pkg_search_string = XapianUtils.prepare_pkg_search_string (search_string, type_filter);
+
+      bool has_filter = (type_filter != null && type_filter.filtering);
+      bool has_search = !Utils.is_search_empty (search_string);
 
       Timer timer = new Timer ();
 
@@ -494,7 +539,7 @@
                                            has_search ?
                                               Unity.Package.Sort.BY_RELEVANCY :
                                               Unity.Package.Sort.BY_NAME);
-      if (local_apps_active ())
+      if (local_apps_active (search))
       {
         if (has_search) resort_pkg_search_results (appresults);
         add_pkg_search_result (appresults, installed_uris, available_uris,
@@ -505,7 +550,7 @@
       debug ("Entry search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
 
-      if (local_apps_active () && display_recent_apps)
+      if (local_apps_active (search) && display_recent_apps)
       {
         try
         {
@@ -513,7 +558,7 @@
           /* Ignore the search string, we want to keep displaying the same apps
            * in the recent category and just filter out those that don't match
            * the search query */
-          var zg_search_string = XapianUtils.prepare_zg_search_string ("", filter);
+          var zg_search_string = XapianUtils.prepare_zg_search_string ("", type_filter);
 
           var results = yield zg_index.search (zg_search_string,
                                                new Zeitgeist.TimeRange.anytime(),
@@ -535,16 +580,23 @@
           // 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_string, e.message);
         }
       }
 
       transaction.commit ();
 
+      // add scopes (if filter is active)
+      if (!has_filter || type_filter.get_option ("scopes").active)
+      {
+        add_local_scopes_results (search_string, model, installed_uris);
+        add_remote_scopes_results (search_string, model);
+      }
+
       purchase_info = new PurchaseInfoHelper ();
 
       /* If we don't have a search we display 6 random apps */
-      if (usc_apps_active () && display_available_apps && pkgsearcher != null)
+      if (usc_apps_active (search) && display_available_apps && pkgsearcher != null)
       {
         if (has_search)
         {
@@ -561,7 +613,7 @@
         else if (has_filter) /* Empty search string + active filters should get lots of results from selected categories */
         {
           timer.start ();
-          string? filter_query = XapianUtils.prepare_pkg_search_string (search.search_string, filter);
+          string? filter_query = XapianUtils.prepare_pkg_search_string (search_string, type_filter);
 
           var pkgresults = pkgsearcher.get_apps (filter_query, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, filter_cb);
           purchase_info.from_pkgresults (pkgresults);
@@ -610,19 +662,18 @@
         search.set_reply_hint ("no-results-hint",
           _("Sorry, there are no applications that match your search."));
       }
-
-      search.finished ();
     }
 
-    private async void update_global_search (Unity.LensSearch search,
-                                             Cancellable cancellable)
+    private async void update_global_search (DeprecatedScopeSearch search,
+                                             GLib.Cancellable cancellable)
     {
       /*
        * In global search, with a non-empty search string, we collate all
        * hits under one Applications category
        */
+      var search_string = search.search_string.strip ();
 
-      if (Utils.is_search_empty (search.search_string))
+      if (Utils.is_search_empty (search_string))
       {
         yield update_global_without_search (search, cancellable);
         return;
@@ -632,11 +683,11 @@
 
       model.clear ();
 
-      var search_string = XapianUtils.prepare_pkg_search_string (search.search_string, null);
+      var pkg_search_string = XapianUtils.prepare_pkg_search_string (search_string, null);
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
       var timer = new Timer ();
-      var appresults = appsearcher.search (search_string, 0,
+      var appresults = appsearcher.search (pkg_search_string, 0,
                                            Unity.Package.SearchType.PREFIX,
                                            Unity.Package.Sort.BY_RELEVANCY);
       resort_pkg_search_results (appresults);
@@ -645,17 +696,11 @@
 
       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 ();
+             appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
     }
 
-    private async void update_global_without_search (Unity.LensSearch search,
-                                                     Cancellable cancellable)
+    private async void update_global_without_search (DeprecatedScopeSearch search,
+                                                     GLib.Cancellable cancellable)
     {
       /*
        * In global search, with an empty search string, we show just Recent Apps
@@ -665,12 +710,12 @@
 
       Timer timer = new Timer ();
 
-      if (local_apps_active () && display_recent_apps)
+      if (local_apps_active (search) && display_recent_apps)
       {
         try
         {
-          var zg_search_string = XapianUtils.prepare_zg_search_string (search.search_string,
-                                                           null);
+          var zg_search_string = XapianUtils.prepare_zg_search_string ("",
+                                                                       null);
 
           var time_range = new Zeitgeist.TimeRange.anytime ();
           var results = yield log.find_events (time_range,
@@ -697,8 +742,6 @@
                    search.search_string, e.message);
         }
       }
-
-      search.finished ();
     }
 
     public Icon find_pkg_icon (string? desktop_file, string icon_name)
@@ -871,10 +914,12 @@
 
         model.append (uri, icon_obj,
                       category,
+                      pinfo != null && pinfo.paid ? Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT,
                       "application/x-desktop",
                       app.application_name,
                       "", //comment
-                      "file://" + app.desktop_file);
+                      "file://" + app.desktop_file,
+                      empty_asv);
         duplicates_lookup.add (uri);
         i++;
         if (i == max_results)
@@ -968,11 +1013,16 @@
           icon_str = icon.to_string ();
         }
 
+        var result_type = (category == Category.INSTALLED && !results.fuzzy_search) ?
+          Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT;
         model.append (uri, icon_str,
-                      category,"application/x-desktop",
+                      category,
+                      result_type,
+                      "application/x-desktop",
                       display_name != null ? display_name : "",
                       comment != null ? comment : "",
-                      full_path != null ? "file://" + full_path : "");
+                      full_path != null ? "file://" + full_path : "",
+                      empty_asv);
 
         /* Stop if we added the number of items requested */
         n_added++;
@@ -981,6 +1031,124 @@
       }
     }
 
+    private static Icon? get_default_scope_icon ()
+    {
+      try
+      {
+        return Icon.new_for_string (GENERIC_SCOPE_ICON);
+      }
+      catch (Error err)
+      {
+        warning ("%s", err.message);
+      }
+      return null;
+    }
+
+    private void add_local_scopes_results (string search_string,
+                                           Dee.Model model,
+                                           Set<string> installed_uris)
+    {
+      // If the local scopes Xapian index hasn't been built, return.
+      if (scopesearcher == null)
+        return;
+
+      bool has_search = !Utils.is_search_empty (search_string);
+      var pkg_search_string = XapianUtils.prepare_pkg_search_string (
+          search_string, null);
+
+      var results = scopesearcher.search (pkg_search_string, 0,
+                                          Unity.Package.SearchType.PREFIX,
+                                          has_search ?
+                                            Unity.Package.Sort.BY_RELEVANCY :
+                                            Unity.Package.Sort.BY_NAME);
+
+      foreach (unowned Unity.Package.PackageInfo info in results.results)
+      {
+        /* De-dupe by "application://foo.scope", since that is what is
+         * used for software-center results. */
+        string dedup_key = @"application://$(info.desktop_file)";
+        if (dedup_key in installed_uris)
+          continue;
+        installed_uris.add(dedup_key);
+
+        /* Don't include master scopes in the search results.  This is
+         * performed after deduping so the master scopes don't just
+         * move to hte "available" category. */
+        if (info.is_master_scope)
+          continue;
+
+        var uri = @"scope://$(info.desktop_file)";
+        var name = info.application_name;
+        var icon_hint = info.icon;
+        var category = info.desktop_file in disabled_scope_ids ?
+          Category.AVAILABLE : Category.INSTALLED;
+
+        try
+        {
+          Icon base_icon = icon_hint == null || icon_hint == "" ?
+            get_default_scope_icon () : Icon.new_for_string (icon_hint);
+          var anno_icon = new AnnotatedIcon (base_icon);
+          anno_icon.size_hint = IconSizeHint.SMALL;
+          icon_hint = anno_icon.to_string ();
+        }
+        catch (Error err)
+        {
+          icon_hint = "";
+        }
+
+        model.append (uri,
+                      icon_hint,
+                      category,
+                      ResultType.DEFAULT,
+                      "application/x-unity-scope",
+                      name != "" ? name : uri,
+                      "",
+                      "", // dnd_uri ?!
+                      empty_asv);
+      }
+    }
+
+    private void add_remote_scopes_results (string search_string,
+                                            Dee.Model model)
+    {
+      var results = Utils.search_index (scopes_index, analyzer, search_string);
+      foreach (var iter in results)
+      {
+        unowned string scope_id =
+          remote_scopes_model.get_string (iter, RemoteScopesColumn.SCOPE_ID);
+        var uri = @"scope://$(scope_id)";
+        var name =
+          remote_scopes_model.get_string (iter, RemoteScopesColumn.NAME);
+        var icon_hint = 
+          remote_scopes_model.get_string (iter, RemoteScopesColumn.ICON_HINT);
+
+        try
+        {
+          Icon base_icon = icon_hint == null || icon_hint == "" ?
+            get_default_scope_icon () : Icon.new_for_string (icon_hint);
+          var anno_icon = new AnnotatedIcon (base_icon);
+          anno_icon.size_hint = IconSizeHint.SMALL;
+          icon_hint = anno_icon.to_string ();
+        }
+        catch (Error err)
+        {
+          icon_hint = "";
+        }
+
+        var category = scope_id in disabled_scope_ids ?
+          Category.AVAILABLE : Category.INSTALLED;
+
+        model.append (uri,
+                      icon_hint,
+                      category,
+                      ResultType.DEFAULT,
+                      "application/x-unity-scope",
+                      name != "" ? name : uri,
+                      "",
+                      "", // dnd_uri ?!
+                      empty_asv);
+      }
+    }
     private async void call_install_packages (string package_name, out string tid) throws IOError
     {
       tid = yield aptdclient.install_packages ({package_name});
@@ -1141,74 +1309,308 @@
 
     public Unity.Preview preview (string uri)
     {
+      Unity.Preview? preview = null;
+      bool installed = uri.has_prefix ("application://");
+      bool is_scope = uri.has_prefix ("scope://");
+
+      if (installed || uri.has_prefix ("unity-install://"))
+      {
+        preview = make_app_preview (uri, installed);
+      }
+      else if (is_scope)
+      {
+        preview = make_scope_preview (uri);
+      }
+      return preview;
+    }
+
+    private SoftwareCenterData.AppDetailsData get_app_details (string appname, string pkgname) throws Error
+    {
+      if (sc_data_provider == null)
+      {
+        sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
+        sc_data_provider.connect_to ();
+      }
+
+      debug ("Requesting pkg info: %s, %s\n", pkgname, appname);
+      return sc_data_provider.get_app_details (appname, pkgname);
+    }
+
+    private Unity.Preview make_app_preview (string uri, bool installed)
+    {
       Unity.ApplicationPreview? preview = null;
-
+      string desktopfile = null;
       string pkgname = "";
       string appname = "";
-      bool installed = uri.has_prefix ("application://");
-
-      if (installed || uri.has_prefix ("unity-install://"))
-      {
-        string desktopfile = null;
-        if (installed)
-        {
-          desktopfile = uri.substring (14); //remove "application://" prefix
-
-          // de-mangle desktop file names back to what S-C expects
-          if (sc_mangler.contains (desktopfile))
-          {
-            desktopfile = sc_mangler.get (desktopfile);
-          }
-
-          Unity.Package.PackageInfo pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
-          if (pkginfo != null)
-          {
-            appname = pkginfo.application_name;
-            pkgname = pkginfo.package_name;
-          }
-        }
-        else // unity-install
-        {
-          string app = uri.substring (16); //remove "unity-install://" prefix
-          string[] parts = app.split ("/");
-          if (parts.length > 1)
-          {
-            pkgname = parts[0];
-            appname = parts[1];
-          }
-        }
-
-        if (pkgname != "")
-        {
+
+      if (installed)
+      {
+        desktopfile = uri.substring (14); //remove "application://" prefix
+
+        // de-mangle desktop file names back to what S-C expects
+        if (sc_mangler.contains (desktopfile))
+        {
+          desktopfile = sc_mangler.get (desktopfile);
+        }
+
+        Unity.Package.PackageInfo pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
+        if (pkginfo != null)
+        {
+          appname = pkginfo.application_name;
+          pkgname = pkginfo.package_name;
+        }
+      }
+      else // unity-install
+      {
+        string app = uri.substring (16); //remove "unity-install://" prefix
+        string[] parts = app.split ("/");
+        if (parts.length > 1)
+        {
+          pkgname = parts[0];
+          appname = parts[1];
+        }
+      }
+
+      if (pkgname != "")
+      {
+        try {
+          var details = get_app_details (appname, pkgname);
+
+          Icon? icon = null;
+          if (installed)
+            icon = new GLib.ThemedIcon (details.icon);
+          else
+          {
+            icon = find_pkg_icon (null, details.icon);
+            if (icon.to_string () == GENERIC_APP_ICON && details.icon_url != null && details.icon_url != "")
+            {
+              icon = new GLib.FileIcon (File.new_for_uri (details.icon_url));
+            }
+          }
+
+          Icon? screenshot = null;
+
+          if (details.screenshot != null)
+          {
+            File scr_file = File.new_for_uri (details.screenshot);
+            screenshot = new FileIcon (scr_file);
+          }
+
+          string subtitle = "";
+          if (details.version != "")
+            subtitle = _("Version %s").printf (details.version);
+          if (details.size > 0)
+          {
+            if (subtitle != "")
+              subtitle += ", ";
+            subtitle += ("Size %s").printf (GLib.format_size (details.size));
+          }
+          preview = new Unity.ApplicationPreview (details.name, subtitle, details.description, icon, screenshot);
+          preview.license = details.license;
+
+          init_ratings_db ();
+          if (ratings != null)
+          {
+            Unity.Ratings.Result result;
+            ratings.query (pkgname, out result);
+            preview.set_rating (result.average_rating / 5.0f, result.total_rating);
+          }
+
+          if (details.hardware_requirements != "")
+            preview.add_info (new InfoHint ("hardware-requirements", _("Hardware requirements"), null, details.hardware_requirements));
+
+          if (uri.has_prefix ("unity-install://")) // application needs to be purchased/installed
+          {
+            // uninstalled and not purchased before
+            if (details.pkg_state == SoftwareCenterData.PackageState.NEEDS_PURCHASE)
+            {
+              var buy_action = new Unity.PreviewAction ("buy", _("Buy"), null);
+              if (details.price != null && details.price != "")
+              {
+                buy_action.extra_text = details.price;
+              }
+
+              buy_action.activated.connect (start_software_center);
+              preview.add_action (buy_action);
+            }
+            else // uninstalled, purchased before
+            {
+
+              Unity.PreviewAction install_action = null;
+              if (details.raw_price == null || details.raw_price == "")
+              {
+                install_action = new Unity.PreviewAction ("install", _("Free Download"), null);
+                install_action.activated.connect (app_preview_install);
+              }
+              else
+              {
+                install_action = new Unity.PreviewAction ("install", _("Install"), null);
+                install_action.activated.connect (start_software_center);
+              }
+              preview.add_action (install_action);
+            }
+
+            if (details.website != null && details.website != "")
+            {
+              preview_developer_website = details.website;
+              var website_action = new Unity.PreviewAction ("website", _("Developer Site"), null);
+              website_action.activated.connect (app_preview_website);
+              preview.add_action (website_action);
+            }
+          }
+          else // application is already installed
+          {
+            preview.add_info (new InfoHint ("date-installed", _("Installed on"), null, details.installation_date));
+            var launch_action = new Unity.PreviewAction ("launch", _("Launch"), null);
+            preview.add_action (launch_action);
+            if (!details.is_desktop_dependency)
+            {
+              var uninstall_action = new Unity.PreviewAction ("uninstall", _("Uninstall"), null);
+              uninstall_action.activated.connect (app_preview_uninstall);
+              preview.add_action (uninstall_action);
+            }
+          }
+
+          preview_installable_desktop_file = details.desktop_file;
+          preview_installable_icon_file = details.icon;
+        }
+        catch (Error e)
+        {
+          warning ("Failed to get package details for '%s': %s", uri, e.message);
+          preview = null;
+        }
+      }
+
+      // xapian db doesn't know this .desktop file or S-C dbus data provider fails,
+      // fallback to DesktopAppInfo (based on installed .desktop file) if available
+      if (preview == null && desktopfile != null)
+      {
+        var app_info = new DesktopAppInfo (desktopfile);
+        if (app_info != null)
+        {
+          preview = new Unity.ApplicationPreview (app_info.get_display_name (), "", app_info.get_description () ?? "", app_info.get_icon (), null);
+          var launch_action = new Unity.PreviewAction ("launch", _("Launch"), null);
+          preview.add_action (launch_action);
+        }
+      }
+
+      if (preview == null)
+      {
+        warning ("No pksearcher nor desktop app info for '%s'", uri);
+      }
+      return preview;
+    }
+
+    private Unity.Preview make_scope_preview(string uri)
+    {
+      Unity.ApplicationPreview? preview = null;
+      var scope_id = uri.substring (8);
+      bool scope_disabled = scope_id in disabled_scope_ids;
+
+      // figure out if the scope is remote
+      bool is_remote_scope = false;
+      var info = scopesearcher.get_by_desktop_file (scope_id);
+
+      Dee.ModelIter found_iter = null;
+      if (info == null)
+      {
+        var iter = remote_scopes_model.get_first_iter ();
+        var end_iter = remote_scopes_model.get_last_iter ();
+        while (iter != end_iter)
+        {
+          if (remote_scopes_model.get_string (iter, 0) == scope_id)
+          {
+            is_remote_scope = true;
+            found_iter = iter;
+            break;
+          }
+          iter = remote_scopes_model.next (iter);
+        }
+      }
+
+      if (is_remote_scope)
+      {
+        var name = remote_scopes_model.get_string (found_iter, 1);
+        if (name == null || name == "")
+          name = remote_scopes_model.get_string (found_iter, 0);
+        var description = remote_scopes_model.get_string (found_iter, 2);
+        if (description != null)
+          description = Markup.escape_text(description);
+        Icon? icon = null;
+        Icon? screenshot = null;
+        var icon_hint = remote_scopes_model.get_string (found_iter, 3);
+        var screenshot_url = remote_scopes_model.get_string (found_iter, 4);
+        try
+        {
+          if (icon_hint != "") icon = Icon.new_for_string (icon_hint);
+          if (screenshot_url != "") screenshot = Icon.new_for_string (screenshot_url);
+        }
+        catch (Error err)
+        {
+          warning ("%s", err.message);
+        }
+
+        if (icon == null) icon = get_default_scope_icon ();
+
+        preview = new Unity.ApplicationPreview (name,
+                                                "",
+                                                description,
+                                                icon,
+                                                screenshot);
+      }
+      else if (info != null)
+      {
+        var name = info.application_name;
+        if (name == null || name == "")
+          name = info.desktop_file;
+        var subtitle = "";
+        var description = info.description;
+        if (description != null)
+          description = Markup.escape_text(description);
+        Icon? icon = null;
+        Icon? screenshot = null;
+        try
+        {
+          if (info.icon != null && info.icon != "")
+            icon = Icon.new_for_string (info.icon);
+        }
+        catch (Error err)
+        {
+          warning ("%s", err.message);
+        }
+        if (icon == null)
+          icon = get_default_scope_icon ();
+
+        // de-mangle desktop file names back to what S-C expects
+        string mangled_id;
+        if (sc_mangler.contains (scope_id))
+        {
+          mangled_id = sc_mangler.get (scope_id);
+        }
+        else
+        {
+          mangled_id = scope_id;
+        }
+
+        Unity.Package.PackageInfo pkginfo = pkgsearcher.get_by_desktop_file (mangled_id);
+        if (pkginfo != null)
+        {
+          SoftwareCenterData.AppDetailsData? details;
           try {
-            if (sc_data_provider == null)
-            {
-              sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
-              sc_data_provider.connect_to ();
-            }
-
-            debug ("Requesting pkg info: %s, %s\n", pkgname, appname);
-            var details = sc_data_provider.get_app_details (appname, pkgname);
-
-            Icon? icon = null;
-            if (installed)
-              icon = new GLib.ThemedIcon (details.icon);
-            else
-            {
-              icon = find_pkg_icon (null, details.icon);
-              if (icon.to_string () == GENERIC_APP_ICON && details.icon_url != null && details.icon_url != "")
-              {
-                icon = new GLib.FileIcon (File.new_for_uri (details.icon_url));
-              }
-            }
-
-            Icon? screenshot = null;
-
+            details = get_app_details(pkginfo.application_name,
+                                      pkginfo.package_name);
+          } catch (Error e) {
+            details = null;
+          }
+          if (details != null) {
+            if (details.version != "")
+              subtitle = _("Version %s").printf (details.version);
             if (details.screenshot != null)
             {
               File scr_file = File.new_for_uri (details.screenshot);
               screenshot = new FileIcon (scr_file);
             }
+<<<<<<< TREE
 
             string subtitle = "";
             if (details.version != "")
@@ -1312,10 +1714,72 @@
         {
           warning ("No pksearcher nor desktop app info for '%s'", uri);
         }
+=======
+          }
+        }
+
+        preview = new Unity.ApplicationPreview (name,
+                                                subtitle,
+                                                description,
+                                                icon,
+                                                screenshot);
+      }
+      if (preview != null && scope_id != "home.scope" &&
+          scope_id != "applications.scope")
+      {
+        PreviewAction action;
+        preview.set_rating(-1.0f, 0);
+        if (scope_disabled)
+        {
+          action = new Unity.PreviewAction ("enable-scope", _("Enable"), null);
+          action.activated.connect (() =>
+            {
+              enable_scope (scope_id);
+              return new ActivationResponse.with_preview (this.preview (uri));
+            });
+        }
+        else
+        {
+          action = new Unity.PreviewAction ("disable-scope", _("Disable"), null);
+          action.activated.connect (() =>
+            {
+              disable_scope (scope_id);
+              return new ActivationResponse.with_preview (this.preview (uri));
+            });
+        }
+        preview.add_action (action);
+>>>>>>> MERGE-SOURCE
       }
       return preview;
     }
 
+    private void disable_scope (string scope_id)
+    {
+      if (scope_id in disabled_scope_ids) return;
+
+      var pref_man = PreferencesManager.get_default ();
+      var disabled_scopes = pref_man.disabled_scopes;
+      disabled_scopes += scope_id;
+
+      var settings = new Settings (LIBUNITY_SCHEMA);
+      settings.set_strv ("disabled-scopes", disabled_scopes);
+    }
+
+    private void enable_scope (string scope_id)
+    {
+      if (!(scope_id in disabled_scope_ids)) return;
+
+      var pref_man = PreferencesManager.get_default ();
+      string[] disabled_scopes = {};
+      foreach (unowned string disabled_scope_id in pref_man.disabled_scopes)
+      {
+        if (disabled_scope_id != scope_id)
+          disabled_scopes += disabled_scope_id;
+      }
+
+      var settings = new Settings (LIBUNITY_SCHEMA);
+      settings.set_strv ("disabled-scopes", disabled_scopes);
+    }
     /**
      * Override of the default activation handler. The apps lens daemon
      * can handle activation of installable apps using the Software Center
@@ -1324,7 +1788,7 @@
     {
       string[] args;
       string exec_or_dir = null;
-      if (uri.has_prefix ("unity-install://"))
+      if (uri.has_prefix ("unity-install://") || uri.has_prefix ("scope://"))
       {
         var prv = preview (uri);
         if (prv != null)
@@ -1334,7 +1798,7 @@
         else
         {
           warning ("Failed to generate preview for %s", uri);
-          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+          return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
         }
       }
       else if (uri.has_prefix ("unity-runner://"))
@@ -1462,9 +1926,12 @@
         string full_path = appmanager.get_path (desktop_id);
         string full_uri = full_path != null ? "file://" + full_path : app_uri;
 
-        results.append (app_uri, app.get_icon().to_string(), category_id,
+        results.append (app_uri, app.get_icon().to_string(),
+                        category_id, Unity.ResultType.DEFAULT,
                         "application/x-desktop", app.get_display_name (),
-                        sanitize_binary_name (app.get_executable ()), full_uri);
+                        sanitize_binary_name (app.get_executable ()),
+                        full_uri,
+                        empty_asv);
       }
     }
 
 
=== modified file 'src/main.vala'
--- src/main.vala	2011-10-06 12:25:59 +0000
+++ src/main.vala	2013-05-08 13:32:23 +0000
@@ -22,6 +22,7 @@
 
 namespace Unity.ApplicationsLens {
 
+  const string DBUS_NAME = "com.canonical.Unity.Scope.Applications";
   static Application? app = null;
   static Daemon? daemon = null;
 
@@ -71,7 +72,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.Lens.Applications"))
+    if (dbus_name_has_owner (DBUS_NAME))
       {
         print ("Another instance of the Unity Applications Daemon " +
                "already appears to be running.\nBailing out.\n");
@@ -83,8 +84,7 @@
     daemon = new Daemon ();
     
     /* Use GApplication directly for single instance app functionality */
-    app = new Application ("com.canonical.Unity.Lens.Applications",
-                           ApplicationFlags.IS_SERVICE);
+    app = new Application (DBUS_NAME, ApplicationFlags.IS_SERVICE);
     try {
       app.register ();
     } catch (Error e) {
@@ -93,7 +93,7 @@
       print ("Failed to start applications daemon: %s\n", e.message);
       return 1;
     }
-    
+
     if (app.get_is_remote ())
       {
         print ("Another instance of the Unity Applications Daemon " +
 
=== modified file 'src/runner.vala'
--- src/runner.vala	2012-11-05 19:18:41 +0000
+++ src/runner.vala	2013-05-08 13:32:23 +0000
@@ -27,7 +27,7 @@
     public string name;
     public string exec;
     public Icon   icon;
-    
+
     public AboutEntry (string name, string exec, Icon icon)
     {
       this.name = name;
@@ -37,30 +37,33 @@
   }
 
   public class Runner: GLib.Object
-  {  
-  
-    private Unity.ApplicationsLens.Daemon daemon;    
+  {
+
+    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.Lens lens;
-    public Unity.Scope scope;
+
+    public Unity.DeprecatedScope scope;
 
     private Gee.HashMap<string,AboutEntry> about_entries;
     private Gee.List<string> history;
     private ExecSearcher exec_searcher = new ExecSearcher ();
 
     private Settings gp_settings;
-    
+
     public Runner (Unity.ApplicationsLens.Daemon daemon)
     {
       /* First create scope */
-      scope = new Unity.Scope ("/com/canonical/unity/scope/commands");
+      scope = new Unity.DeprecatedScope ("/com/canonical/unity/scope/commands",
+                               "commands");
       scope.search_in_global = false;
-            
+      scope.search_hint = _("Run a command");
+      scope.visible = false;
+      populate_categories ();
+
       /* Listen for changes to the lens scope search */
       scope.search_changed.connect ((lens_search, search_type, cancellable) =>
       {
@@ -73,56 +76,53 @@
         return lens_search.search_string.strip ();
       });
 
-      // Listen for when the lens is hidden/shown by the Unity Shell
-      scope.notify["active"].connect(() =>
-      {
-        if (scope.active)
-        {
-          scope.queue_search_changed (SearchType.DEFAULT);
-        }
-      });
-
       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 ();
-      
       /* create the private about entries */
       about_entries = new Gee.HashMap<string,AboutEntry> ();
       load_about_entries ();
-      
+
       this.gp_settings = new Settings ("com.canonical.Unity.Runner");
       history = new Gee.ArrayList<string> ();
       load_history ();
-      
+
       this.daemon = daemon;
-    
+
+      scope.export ();
     }
 
     private void populate_categories ()
     {
-      var categories = new GLib.List<Unity.Category> ();
+      var categories = new Unity.CategorySet ();
       var icon_dir = File.new_for_path (ICON_PATH);
-      var cat = new Unity.Category (_("Results"),
+      var cat = new Unity.Category ("results", _("Results"),
                                     new FileIcon (icon_dir.get_child ("group-installed.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat = new Unity.Category (_("History"),
+      cat = new Unity.Category ("history", _("History"),
                                 new FileIcon (icon_dir.get_child ("group-available.svg")));
 
-      categories.append (cat);
-
-      lens.categories = categories;
-    }
-
-    private async void update_search (LensSearch search)
+      categories.add (cat);
+
+      scope.categories = categories;
+    }
+
+    private void add_result (Dee.Model model, string uri, string icon_hint,
+                             uint category_id, string mimetype, string title)
+    {
+      Variant row_data[9];
+      model.append_row (
+        model.build_named_row_static (row_data, "uri", uri,
+                                      "icon_hint", icon_hint,
+                                      "category", category_id,
+                                      "result_type", ResultType.DEFAULT,
+                                      "mimetype", mimetype,
+                                      "title", title,
+                                      "comment", "",
+                                      "dnd_uri", uri));
+    }
+
+    private async void update_search (DeprecatedScopeSearch search)
     {
       var model = search.results_model;
       var executables_match = new Gee.ArrayList<string> ();
@@ -132,19 +132,17 @@
       var search_string = search.search_string;
       bool has_search = !Utils.is_search_empty (search.search_string);
 
-      string uri;      
+      string uri;
       Icon icon;
       string mimetype;
       string display_name;
       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 (),
-                      category_id, mimetype,
-                      display_name,
-                      null);
+      {
+        display_name = get_icon_uri_and_mimetype (command, out icon, out uri, out mimetype);
+        add_result (model, uri, icon.to_string (), category_id, mimetype,
+                    display_name);
       }
 
       if (!has_search)
@@ -154,34 +152,30 @@
       }
 
       Timer timer = new Timer ();
-      
+
       /* no easter egg in unity */
       if (search_string == "free the fish")
       {
-        uri = "no-easter-egg";
+        uri = "about:blank";
         string commenteaster = _("There is no easter egg in Unity");
         icon = new ThemedIcon ("gnome-panel-fish");
-        model.append (uri, icon.to_string (),
-                      0, "no-mime",
-                      commenteaster,
-                      null);
+        add_result (model, uri, icon.to_string (), 0, "text/plain",
+                    commenteaster);
         search.finished ();
         return;
       }
       else if (search_string == "gegls from outer space")
       {
-        uri = "really-no-easter-egg";
+        uri = "about:blank";
         string commentnoeaster = _("Still no easter egg in Unity");
         icon = new ThemedIcon ("gnome-panel-fish");
-        model.append (uri, icon.to_string (),
-                      0, "no-mime",
-                      commentnoeaster,
-                      null);
+        add_result (model, uri, icon.to_string (), 0, "text/plain",
+                    commentnoeaster);
         search.finished ();
         return;
-         
+
       }
-      
+
       /* manual seek with directory and executables result */
       if (search_string.has_prefix ("/") || search_string.has_prefix ("~"))
       {
@@ -189,7 +183,7 @@
         var search_dirname = Path.get_dirname (search_string);
         var directory = File.new_for_path (search_dirname);
         var search_dirname_in_path = false;
-        
+
         /* strip path_directory if in executable in path */
         foreach (var path_directory in Environment.get_variable ("PATH").split(":"))
         {
@@ -208,7 +202,7 @@
             var subelem_info = iterator.next_file ();
             if (subelem_info == null)
               break;
-            
+
             var complete_path = Path.build_filename (search_dirname, subelem_info.get_name ());
             if (complete_path.has_prefix (search_string))
             {
@@ -241,10 +235,10 @@
           executables_match.add (matching_exec);
         }
       }
-      
+
       executables_match.sort ();
       dirs_match.sort ();
-      
+
       category_id = RunnerCategory.RESULTS;
 
       // populate results
@@ -252,45 +246,38 @@
       if ((executables_match.size == 0) && (dirs_match.size == 0))
       {
         display_name = get_icon_uri_and_mimetype (search_string, out icon, out uri, out mimetype);
-        model.append (uri.strip (), icon.to_string (),
-                      category_id, mimetype,
-                      display_name,
-                      null);
+        add_result (model, uri.strip (), icon.to_string (),
+                    category_id, mimetype, display_name);
       }
-      
+
       // 2. add possible directories (we don't store them)
       mimetype = "inode/directory";
       icon = ContentType.get_icon (mimetype);
       foreach (var dir in dirs_match)
       {
         uri = @"unity-runner://$(dir)";
-        model.append (uri, icon.to_string (),
-                      category_id, mimetype,
-                      dir,
-                      null);        
+        add_result (model, uri, icon.to_string (),
+                    category_id, mimetype, dir);
       }
-              
+
       // 3. add available exec
       foreach (var final_exec in executables_match)
       {
         // TODO: try to match to a desktop file for the icon
         uri = @"unity-runner://$(final_exec)";
-        display_name = get_icon_uri_and_mimetype (final_exec, out icon, out uri, out mimetype);   
-        
-        model.append (uri, icon.to_string (),
-                      category_id, mimetype,
-                      display_name,
-                      null);
+        display_name = get_icon_uri_and_mimetype (final_exec, out icon, out uri, out mimetype);
+        add_result (model, uri, icon.to_string (),
+                    category_id, mimetype, display_name);
       }
-      
+
       timer.stop ();
       debug ("Entry search listed %i dir matches and %i exec matches in %fms for search: %s",
              dirs_match.size, executables_match.size, timer.elapsed ()*1000, search_string);
-      
+
 
       search.finished ();
     }
-    
+
     private class ExecSearcher: Object
     {
       public ExecSearcher ()
@@ -378,13 +365,13 @@
         return matching;
       }
     }
-    
+
     private string get_icon_uri_and_mimetype (string exec_string, out Icon? icon, out string? uri, out string? mimetype)
     {
-      
+
       AboutEntry? entry = null;
-      
-      mimetype = "application/x-unity-run";      
+
+      mimetype = "application/x-unity-run";
       entry = about_entries[exec_string];
       if (entry != null)
       {
@@ -395,7 +382,7 @@
 
       uri = @"unity-runner://$(exec_string)";
 
-      
+
       // if it's a folder, show… a folder icone! + right exec
       if (FileUtils.test (exec_string, FileTest.IS_DIR))
       {
@@ -404,7 +391,7 @@
         return exec_string;
       }
 
-      var s = exec_string.delimit ("-", '_').split (" ", 0)[0];      
+      var s = exec_string.delimit ("-", '_').split (" ", 0)[0];
       var appresults = this.daemon.appsearcher.search (@"type:Application AND exec:$s", 0,
                                                        Unity.Package.SearchType.EXACT,
                                                        Unity.Package.Sort.BY_NAME);
@@ -413,19 +400,19 @@
 
         if (pkginfo.desktop_file == null)
           continue;
-        
+
         // pick the first one
         icon = this.daemon.find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
         return exec_string;
-        
+
       }
-      
+
       // if no result, default icon
       icon = new ThemedIcon ("gtk-execute");
       return exec_string;
-      
+
     }
- 
+
 
     public void add_history (string last_command)
     {
@@ -434,14 +421,14 @@
       var new_history = new Gee.ArrayList<string> ();
       var history_store = new string [this.history.size + 1];
       int i = 1;
-      
+
       new_history.add (last_command);
       history_store[0] = last_command;
       for (var j = 0; (j < this.history.size) && (i < MAX_HISTORY); j++)
       {
         if (this.history[j] == last_command)
            continue;
-        
+
         new_history.add(history[j]);
         history_store[i] = history[j];
         i++;
@@ -450,11 +437,11 @@
 
       // store in gsettings
       this.gp_settings.set_strv (HISTORY_KEY, history_store);
-      
+
       // force a search to refresh history order (TODO: be more clever in the future)
       scope.queue_search_changed (SearchType.DEFAULT);
     }
-    
+
     private void load_history ()
     {
       int i = 0;
@@ -467,39 +454,39 @@
         i++;
       }
     }
-    
+
     private void load_about_entries ()
-    { 
+    {
       AboutEntry entry;
       string name;
       string exec;
       Icon icon;
-      
+
       // first about:config
       name = "about:config";
       exec = "ccsm -p unityshell";
       try {
-        icon = Icon.new_for_string (@"$(Config.PREFIX)/share/ccsm/icons/hicolor/64x64/apps/plugin-unityshell.png");      
+        icon = Icon.new_for_string (@"$(Config.PREFIX)/share/ccsm/icons/hicolor/64x64/apps/plugin-unityshell.png");
       }
       catch (Error err) {
         warning ("Can't find unityshell icon: %s", err.message);
         icon = new ThemedIcon ("gtk-execute");
-      }   
+      }
       entry = new AboutEntry (name, exec, icon);
-      
+
       about_entries[name] = entry;
       about_entries[exec] = entry;
-      
+
       // second about:robots
       name = "Robots have a plan.";
       exec = "firefox about:robots";
       entry = new AboutEntry (name, exec, icon = new ThemedIcon ("battery"));
-      
+
       about_entries["about:robots"] = entry;
       about_entries[exec] = entry;
-      
+
     }
-      
+
   }
-  
+
 }
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2012-09-13 11:15:00 +0000
+++ src/schemas.vala	2013-05-08 13:32:23 +0000
@@ -37,6 +37,16 @@
     INSTALLED,
     AVAILABLE,
   }
+
+  public enum RemoteScopesColumn
+  {
+    SCOPE_ID,
+    NAME,
+    DESCRIPTION,
+    ICON_HINT,
+    SCREENSHOT_URL,
+    KEYWORDS
+  }
   
   public enum RunnerCategory
   {
 
=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2013-04-15 16:32:36 +0000
+++ src/unity-package-search.cc	2013-05-08 13:32:23 +0000
@@ -59,6 +59,10 @@
 #define XAPIAN_VALUE_EXENAME 294
 #define XAPIAN_VALUE_CURRENCY 201
 
+/* this isn't a Software Center slot, but we use it to mark master
+ * scopes in the scope index. */
+#define XAPIAN_VALUE_MASTERSCOPE 1000
+
 #include "unity-package-search.h"
 #include "columbus.hh"
 
@@ -184,6 +188,10 @@
   query_parser->add_prefix ("pkgname", "AP");
   query_parser->add_prefix ("exec", "XX");
   query_parser->add_prefix ("keyword", "KW");
+  query_parser->add_prefix ("pkg_wildcard", "XP");
+  query_parser->add_prefix ("pkg_wildcard", "XPM");
+  query_parser->add_prefix ("pkg_wildcard", "AP");
+  query_parser->add_prefix ("pkg_wildcard", "APM");
   query_parser->set_default_op (Xapian::Query::OP_AND);
   query_parser->set_database (db);
   searcher->query_parser = query_parser;
@@ -235,6 +243,9 @@
       if (g_app_info_get_display_name (app_info))
         doc.add_value (XAPIAN_VALUE_APPNAME, g_app_info_get_display_name (app_info));
 
+      if (g_app_info_get_description (app_info))
+        doc.add_value (XAPIAN_VALUE_DESCRIPTION, g_app_info_get_description (app_info));
+
       if (g_app_info_get_icon (app_info))
       {
         gchar *icon_str = g_icon_to_string (g_app_info_get_icon (app_info));
@@ -379,6 +390,97 @@
   return searcher;
 }
 
+/* Recursively traverse the set of scopes */
+static void
+index_scope (Xapian::WritableDatabase                *db,
+             Xapian::TermGenerator                   *indexer,
+             UnityProtocolScopeRegistryScopeMetadata *info)
+{
+  Xapian::Document doc;
+  char *dum1;
+
+  if (info->name != NULL)
+    doc.add_value (XAPIAN_VALUE_APPNAME, info->name);
+  if (info->description != NULL)
+    doc.add_value (XAPIAN_VALUE_DESCRIPTION, info->description);
+  if (info->icon != NULL)
+    doc.add_value (XAPIAN_VALUE_ICON, info->icon);
+  if (info->id != NULL)
+    doc.add_value (XAPIAN_VALUE_DESKTOP_FILE, info->id);
+  if (info->is_master)
+      doc.add_value (XAPIAN_VALUE_MASTERSCOPE, "true");
+
+  indexer->set_document (doc);
+  if (info->name != NULL)
+  {
+    dum1 = unity_applications_lens_utils_preprocess_string (info->name);
+    indexer->index_text (dum1, 5);
+    g_free (dum1);
+  }
+  if (info->description != NULL)
+  {
+    dum1 = unity_applications_lens_utils_preprocess_string (info->description);
+    indexer->index_text (dum1, 5);
+    g_free (dum1);
+  }
+  for (GSList *l = info->keywords; l != NULL; l = l->next)
+  {
+    dum1 = unity_applications_lens_utils_preprocess_string ((char *)l->data);
+    indexer->index_text (dum1, 0);
+    indexer->index_text (dum1, 0, "KW");
+    g_free (dum1);
+  }
+
+  /* Always assume Type=Scope for scopes... */
+  doc.add_term ("ATscope");
+
+  /* Index application name */
+  dum1 = g_strconcat ("AA", info->name, NULL);
+  doc.add_term (dum1);
+  g_free (dum1);
+
+  db->add_document (doc);
+}
+
+UnityPackageSearcher*
+unity_package_searcher_new_for_scopes (UnityProtocolScopeRegistry *scope_registry)
+{
+  UnityPackageSearcher *searcher;
+  Xapian::WritableDatabase *db;
+
+  searcher = new UnityPackageSearcher;
+  db = new Xapian::WritableDatabase ();
+  searcher->db = db;
+  searcher->db->add_database (Xapian::InMemory::open ());
+
+  init_searcher (searcher);
+
+  /* Index the menu recursively */
+  searcher->db_merged = false;
+  Xapian::TermGenerator *indexer = new Xapian::TermGenerator ();
+
+  GSList *scopes = unity_protocol_scope_registry_get_scopes (scope_registry);
+  for (GSList *l = scopes; l != NULL; l = l->next)
+  {
+    UnityProtocolScopeRegistryScopeRegistryNode *node = (UnityProtocolScopeRegistryScopeRegistryNode *)l->data;
+    index_scope (db, indexer, node->scope_info);
+
+    // Also index any sub-scopes
+    for (GSList *sl = node->sub_scopes; sl != NULL; sl = sl->next)
+    {
+      UnityProtocolScopeRegistryScopeMetadata *info = (UnityProtocolScopeRegistryScopeMetadata *)sl->data;
+      index_scope (db, indexer, info);
+    }
+  }
+  delete indexer;
+  db->flush ();
+
+  searcher->matcher = new Columbus::Matcher();
+  buildMatcher(searcher);
+
+  return searcher;
+}
+
 /* Create a new searcher that searches into the Xapian index
  * provided by the Software Center */
 UnityPackageSearcher*
@@ -448,6 +550,9 @@
   string appname = doc.get_value (XAPIAN_VALUE_APPNAME);
   pkginfo->application_name = g_strdup (appname.c_str ());
 
+  string description = doc.get_value (XAPIAN_VALUE_DESCRIPTION);
+  pkginfo->description = g_strdup (description.c_str ());
+
   string desktop_file = doc.get_value (XAPIAN_VALUE_DESKTOP_FILE);
   pkginfo->desktop_file = g_strdup (desktop_file.c_str ());
 
@@ -465,6 +570,9 @@
   const string purchase_date = doc.get_value (XAPIAN_VALUE_PURCHASED_DATE);
   pkginfo->needs_purchase = purchase_date.empty ();
 
+  string is_master = doc.get_value (XAPIAN_VALUE_MASTERSCOPE);
+  pkginfo->is_master_scope = (is_master == "true");
+
   return pkginfo;
 }
 
@@ -572,6 +680,7 @@
     // 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 ();
+    result->fuzzy_search = false;
 
     for (Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i)
       {
@@ -623,6 +732,7 @@
       }
 
     result->results = g_slist_reverse (result->results);
+    result->fuzzy_search = true;
     return result;
 }
 
@@ -637,11 +747,12 @@
   g_return_val_if_fail (searcher != NULL, NULL);
   g_return_val_if_fail (search_string != NULL, NULL);
 
-  bool has_category = strstr(search_string, "category:") != NULL;
+  bool is_filtered = strstr(search_string, "category:") != NULL
+    || strstr(search_string, "pkg_wildcard:") != NULL;
   const char *col_query_str = strstr(search_string, "AND");
   xap_result = xapian_search(searcher, search_string, max_hits, search_type, sort);
   // If Xapian does not find anything, try fuzzy matching.
-  if(g_slist_length(xap_result->results) == 0 && (!has_category && col_query_str)) {
+  if (g_slist_length(xap_result->results) == 0 && (!is_filtered && col_query_str)) {
       g_slice_free(UnityPackageSearchResult, xap_result);
       col_query_str += 3;
       UnityPackageSearchResult *res = libcolumbus_search(searcher, col_query_str);
@@ -710,6 +821,7 @@
   g_hash_table_unref (unique);
 
   result->num_hits = num_matches;
+  result->fuzzy_search = false;
   return result;
 }
 
@@ -726,6 +838,7 @@
 
   result = g_slice_new0 (UnityPackageSearchResult);
   result->num_hits = n_apps;
+  result->fuzzy_search = false;
   lastdocid = searcher->db->get_lastdocid ();
 
   /* Since we really just pick random apps we may end up with dupes */
@@ -867,6 +980,7 @@
   }
 
   result->num_hits = num_matches;
+  result->fuzzy_search = false;
   return result;
 }
 
@@ -887,14 +1001,20 @@
     Xapian::Document doc = searcher->db->get_document (*it);
     string value = doc.get_value (XAPIAN_VALUE_DESKTOP_FILE);
 
+    bool matches = false;
     size_t sep = value.find (':');
     if (sep != string::npos)
     {
-      if (value.compare (sep+1, value.size() - sep, query) == 0)
-      {
-        pkginfo = _pkginfo_from_document (doc);
-        return pkginfo;
-      }
+      matches = value.compare (sep+1, value.size() - sep, query) == 0;
+    }
+    else
+    {
+      matches = value == query;
+    }
+    if (matches)
+    {
+      pkginfo = _pkginfo_from_document (doc);
+      return pkginfo;
     }
     ++it;
   }
 
=== modified file 'src/unity-package-search.h'
--- src/unity-package-search.h	2012-10-09 15:26:49 +0000
+++ src/unity-package-search.h	2013-05-08 13:32:23 +0000
@@ -19,6 +19,7 @@
 
 #include <glib.h>
 #include <gmenu-tree.h>
+#include <unity-protocol.h>
 
 typedef struct _UnityPackageSearcher UnityPackageSearcher;
 
@@ -36,19 +37,22 @@
 
 typedef struct
 {
-        GSList *results;
-        gint    num_hits;
+    GSList *results;
+    gint    num_hits;
+    gboolean fuzzy_search;
 } UnityPackageSearchResult;
 
 typedef struct
 {
         gchar    *package_name;
         gchar    *application_name;
+        gchar    *description;
         gchar    *desktop_file;
         gchar    *icon;
         gchar    *price;
         gboolean  needs_purchase;
         gint      relevancy;
+        gboolean  is_master_scope;
 } UnityPackageInfo;
 
 typedef gboolean (*AppFilterCallback)(UnityPackageInfo *, void *);
@@ -61,6 +65,7 @@
 UnityPackageSearcher*     unity_package_searcher_new    ();
 
 UnityPackageSearcher*     unity_package_searcher_new_for_menu    (GMenuTree *menu);
+UnityPackageSearcher*     unity_package_searcher_new_for_scopes  (UnityProtocolScopeRegistry *scope_registry);
 
 void                      unity_package_searcher_free   (UnityPackageSearcher *searcher);
 
 
=== modified file 'src/utils.vala'
--- src/utils.vala	2012-10-05 16:17:11 +0000
+++ src/utils.vala	2013-05-08 13:32:23 +0000
@@ -138,6 +138,99 @@
     }
   }
 
+  public Dee.Index prepare_index (Dee.Model model,
+                                  uint sort_column,
+                                  owned Dee.ModelReaderFunc reader_func,
+                                  out Dee.Analyzer out_analyzer)
+  {
+    // reuse the icu_filter
+    if (icu_filter == null)
+    {
+      icu_filter = new Dee.ICUTermFilter.ascii_folder ();
+    }
+
+    var sort_filter = Dee.Filter.new_collator (sort_column);
+    var filter_model = new Dee.FilterModel (model, sort_filter);
+
+    var analyzer = new Dee.TextAnalyzer ();
+    analyzer.add_term_filter ((terms_in, terms_out) =>
+    {
+      for (uint i = 0; i < terms_in.num_terms (); i++)
+      {
+        unowned string term = terms_in.get_term (i);
+        var folded = icu_filter.apply (term);
+        terms_out.add_term (term);
+        if (folded != term) terms_out.add_term (folded);
+      }
+    });
+    out_analyzer = analyzer;
+
+    var reader = Dee.ModelReader.new (reader_func);
+    return new Dee.TreeIndex (filter_model, analyzer, reader);
+  }
+
+  public SList<Dee.ModelIter> search_index (Dee.Index index,
+                                            Dee.Analyzer analyzer,
+                                            string query)
+  {
+    if (is_search_empty (query))
+    {
+      var model = index.get_model ();
+      var iter = model.get_first_iter ();
+      var end_iter = model.get_last_iter ();
+
+      var result = new SList<Dee.ModelIter> ();
+      while (iter != end_iter)
+      {
+        result.prepend (iter);
+        iter = model.next (iter);
+      }
+      result.reverse ();
+      return result;
+    }
+
+    var term_list = Object.new (typeof (Dee.TermList)) as Dee.TermList;
+    analyzer.tokenize (query, term_list);
+    var matches = new Sequence<Dee.ModelIter> ();
+
+    uint num_terms = term_list.num_terms ();
+    for (uint i = 0; i < num_terms; i++)
+    {
+      var rs = index.lookup (term_list.get_term (i),
+                             i < num_terms - 1 ? Dee.TermMatchFlag.EXACT : Dee.TermMatchFlag.PREFIX);
+
+      bool first_pass = i == 0;
+      CompareDataFunc<Dee.ModelIter> cmp_func = (a, b) =>
+      {
+        return a == b ? 0 : ((void*) a > (void*) b ? 1 : -1);
+      };
+      // intersect the results (cause we want to AND the terms)
+      var remaining = new Sequence<Dee.ModelIter> ();
+      foreach (var item in rs)
+      {
+        if (first_pass)
+          matches.insert_sorted (item, cmp_func);
+        else if (matches.lookup (item, cmp_func) != null)
+          remaining.insert_sorted (item, cmp_func);
+      }
+      if (!first_pass) matches = (owned) remaining;
+      // final result set empty already?
+      if (matches.get_begin_iter () == matches.get_end_iter ()) break;
+    }
+
+    var result = new SList<Dee.ModelIter> ();
+    var iter = matches.get_begin_iter ();
+    var end_iter = matches.get_end_iter ();
+    while (iter != end_iter)
+    {
+      result.prepend (iter.get ());
+      iter = iter.next ();
+    }
+
+    result.reverse ();
+    return result;
+  }
+
   /* Substitute tilde character in @s by the home directory.
    * Expansion of ~username also works if 'username' is found. */
   public string subst_tilde (string s)
 
=== modified file 'src/xapian-utils.vala'
--- src/xapian-utils.vala	2012-10-08 13:30:44 +0000
+++ src/xapian-utils.vala	2013-05-08 13:32:23 +0000
@@ -31,6 +31,7 @@
     "accessibility",
     "developer",
     "science-and-engineering",
+    "scopes",
     "system"
   };
 
@@ -58,6 +59,7 @@
       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 ("scopes", "(pkg_wildcard:unity_scope_* OR pkg_wildcard:unity_lens_*)");
       type_queries.insert ("system", "(category:System OR category:Security)");
     }
   }
@@ -107,9 +109,9 @@
     if (Utils.is_search_empty (search_string))
     {
       if (options == null || !options.filtering)
-        return "type:Application";
+        return "(type:Application OR type:Scope)";
       else
-        return "type:Application AND " + extract_type_query (options);
+        return "(type:Application OR type:Scope) AND " + extract_type_query (options);
     }
     else
     {
@@ -125,9 +127,9 @@
       s = s.delimit ("-", ' ');
       
       if (options == null || !options.filtering)
-        return "type:Application AND " + s;
+        return "(type:Application OR type:Scope) AND " + s;
       else
-        return "type:Application AND %s AND %s".printf (extract_type_query (options), s);
+        return "(type:Application OR type:Scope) AND %s AND %s".printf (extract_type_query (options), s);
     }
   }
-}
 \ No newline at end of file
+}
 
=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2013-03-01 15:41:08 +0000
+++ tests/unit/Makefile.am	2013-05-08 13:32:23 +0000
@@ -30,6 +30,8 @@
 	$(test_libs) \
 	$(UNITY_PACKAGE_SEARCH_LIBS)
 
+LDFLAGS += -rpath $(PROTOCOLPRIVATELIBDIR)
+
 AM_CPPFLAGS = \
   $(LENS_DAEMON_CFLAGS) \
   -I$(srcdir) \
 
=== modified file 'tests/unit/test-xapian-utils.vala'
--- tests/unit/test-xapian-utils.vala	2012-10-08 08:41:45 +0000
+++ tests/unit/test-xapian-utils.vala	2013-05-08 13:32:23 +0000
@@ -43,7 +43,7 @@
   internal static void test_empty_search_query ()
   {
     var query = XapianUtils.prepare_pkg_search_string ("", null);
-    assert (query == "type:Application");
+    assert (query == "(type:Application OR type:Scope)");
   }
 
   internal static void test_empty_search_with_single_cat_filter ()
@@ -54,7 +54,7 @@
     filter.add_option ("internet", "Internet", null);
 
     var query = XapianUtils.prepare_pkg_search_string ("", filter);
-    assert (query == "type:Application AND (category:AudioVideo)");
+    assert (query == "(type:Application OR type:Scope) AND (category:AudioVideo)");
   }
 
   internal static void test_empty_search_with_multi_cat_filter ()
@@ -65,16 +65,16 @@
     filter.add_option ("internet", "Internet", null);
     filter.add_option ("game", "Game", null).active = true;
     var query = XapianUtils.prepare_pkg_search_string ("", filter);
-    assert (query == "type:Application AND (category:Game OR category:AudioVideo)");
+    assert (query == "(type:Application OR type:Scope) AND (category:Game OR category:AudioVideo)");
   }
 
   internal static void test_search_query_no_filters ()
   {
     var query = XapianUtils.prepare_pkg_search_string (" foo ", null);
-    assert (query == "type:Application AND foo");
+    assert (query == "(type:Application OR type:Scope) AND foo");
 
     query = XapianUtils.prepare_pkg_search_string ("foo", null);
-    assert (query == "type:Application AND foo");
+    assert (query == "(type:Application OR type:Scope) AND foo");
   }
 
   internal static void test_search_query_with_single_cat_filter ()
@@ -84,7 +84,7 @@
     filter.add_option ("media", "Media", null);
     filter.add_option ("internet", "Internet", null).active = true;
     var query = XapianUtils.prepare_pkg_search_string ("foo", filter);
-    assert (query == "type:Application AND (category:Network) AND foo");
+    assert (query == "(type:Application OR type:Scope) AND (category:Network) AND foo");
   }
 
   internal static void test_search_query_with_multi_cat_filter ()
@@ -95,7 +95,7 @@
     filter.add_option ("internet", "Internet", null).active = true;
     filter.add_option ("game", "Game", null).active = true;
     var query = XapianUtils.prepare_pkg_search_string ("foo", filter);
-    assert (query == "type:Application AND (category:Game OR category:Network) AND foo");
+    assert (query == "(type:Application OR type:Scope) AND (category:Game OR category:Network) AND foo");
   }
 
   internal static void test_zg_empty_search_query ()
 
=== modified file 'vapi/unity-package-search.deps'
--- vapi/unity-package-search.deps	2012-10-18 12:36:37 +0000
+++ vapi/unity-package-search.deps	2013-05-08 13:32:23 +0000
@@ -1,2 +1,3 @@
 glib-2.0
 libgnome-menu-3.0
+unity-protocol
 
=== modified file 'vapi/unity-package-search.vapi'
--- vapi/unity-package-search.vapi	2012-10-08 15:11:07 +0000
+++ vapi/unity-package-search.vapi	2013-05-08 13:32:23 +0000
@@ -27,6 +27,8 @@
       public Searcher ();
       [CCode (cname = "unity_package_searcher_new_for_menu")]
       public Searcher.for_menu(GMenu.Tree menu);
+      [CCode (cname = "unity_package_searcher_new_for_scopes")]
+      public Searcher.for_scopes(Unity.Protocol.ScopeRegistry scope_registry);
       public SearchResult search (string search_string, uint max_hits, Unity.Package.SearchType search_type, Unity.Package.Sort sort);
       public SearchResult get_random_apps (string? filter_query, uint n_apps);
       public SearchResult get_apps (string? filter_query, uint n_apps, AppFilterCallback cb);
@@ -41,6 +43,7 @@
       public SearchResult ();
       public GLib.SList<PackageInfo> results;
       public int num_hits;
+      public bool fuzzy_search;
     }
     
     [Compact]
@@ -49,11 +52,13 @@
       public PackageInfo ();
       public string package_name;
       public string application_name;
+      public string description;
       public string desktop_file;
       public string icon;
       public string price;
       public bool needs_purchase;
       public int relevancy;
+      public bool is_master_scope;
     }
   }
 }