Merge lp:~jamesh/unity-lens-applications/split-scope into lp:unity-lens-applications

[James Henstridge]

Convert the Applications scope over to the Unity.AbstractScope API.

Convert the Applications scope over to the Unity.AbstractScope API.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:367
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/unity-lens-applications/split-scope/+merge/175982/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

368. By James Henstridge on 2013-07-23

Merge from trunk, fixing conflict

[James Henstridge (jamesh)]

Note that this branch depends on there being an apps master scope in place, so should probably not be fully approved until we're ready to bring that back. I'd still appreciate review feedback though.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:368
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/unity-lens-applications/split-scope/+merge/175982/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/23/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

369. By James Henstridge on 2013-07-24

Change "-rpath" to "-R", since that is libtool's equivalent flag.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:369
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/unity-lens-applications/split-scope/+merge/175982/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

First of all, could we rename the main apps scope to something more appropriate? A scope with ID applications-applications.scope looks just wrong.

1315 + var search_string = context.search_query.strip();

AbstractScope has normalize_search_query method, pls override that instead. (SearchContext will have the normalized string in its search_query field).

1491 + /* XXX:
1492 if (model.get_n_rows () == 0)

Another prop that's not exposed by the new API? We should add it to ResultSet imo, thoughts?

2258 + public override Unity.AbstractPreview? run ()

Isn't this is doing blocking dbus calls to get the preview? Why isn't it async then?

2844 + private class RunnerScope : Unity.AbstractScope

Pls rename to CommandsScope, not sure why we have the disparity in the code and the .scope file.

2940 + // force a search to refresh history order (TODO: be more clever in the future)
2941 + // XXX: No way to queue result update
2942 + //scope.queue_search_changed (SearchType.DEFAULT);

There is now :)

3541 + public ScopesScope (ApplicationsScope appscope)
2869 + public RunnerScope (ApplicationsScope appscope)

Not liking the circular dependencies, but I suppose it doesn't make much sense to try to get rid of them.

2849 + // The ApplicationsScope holds a reference to us, so avoid a
2850 + // reference cycle.

But, can we at least get rid of this? Seems it's just one method AppsScope uses, can we make that one static?

That's it for the first round... The diff is huge but it's mostly moving stuff around, so it's not too bad.

[lp:~jamesh/unity-lens-applications/split-scope]

370. By James Henstridge on 2013-07-25

Rename RunnerScope to CommandsScope, to match scope name.

371. By James Henstridge on 2013-07-25

Use results_invalidted in CommandsScope too.

372. By James Henstridge on 2013-07-25

No need to normalise query in search method.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:372
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/25/rebuild

review: Approve (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

373. By James Henstridge on 2013-07-25

Make software-center D-Bus calls in previewers async.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:373
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

374. By James Henstridge on 2013-07-26

Fix tests to account for changing Software Center code to async.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/27/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

The installed scope files are not pointing to correct .so location (cause it's using multiarch), therefore the final scope doesn't work.

review: Needs Fixing

[lp:~jamesh/unity-lens-applications/split-scope]

375. By James Henstridge on 2013-07-26

Substitute @libdir@ in the scope files so we correctly handle multi-lib.

376. By James Henstridge on 2013-07-26

Bump version number.

377. By James Henstridge on 2013-07-26

Don't install the libtool .la file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/28/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

There's a couple functional issues:

1) The scope loader daemon is trying to exit after a couple of seconds of inactivity, but that is not desired as the startup of the xapian-and-io-heavy apps scope is very expensive. Also, for some reason it failed to exit and that resulted it apps no longer appearing in the dash.

2) The ordering of the items in the apps scope is now undefined, but according to design scopes should be displayed after installed (or available) apps. But this should be brought up to design, maybe we want a separate category for scopes now, similarly to the phone.

3) Performing a search in the apps lens causes the results to flicker a lot. This will be because finishing a scope search flushes the results, so if the scopes scope finishes very quickly it'll flush empty result set, so the dash will remove everything and a few frames later the apps scope will flush its non-empty result set causing another redraw.

review: Needs Fixing

[lp:~jamesh/unity-lens-applications/split-scope]

378. By Michal Hruby on 2013-08-05

Mark scope results to aid sorting in the master scope.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/29/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/29/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

379. By James Henstridge on 2013-08-06

Merge from trunk, fixing conflicts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:379
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/30/rebuild

review: Approve (continuous-integration)

[lp:~jamesh/unity-lens-applications/split-scope]

380. By James Henstridge on 2013-08-06

Disable timeout for the applications scope.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:380
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/31/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Should be good with the fixes that landed in home scope and libunity.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-08-03 21:52:17 +0000
+++ .bzrignore	2013-08-06 08:19:29 +0000
@@ -1,8 +1,8 @@
-
-src/.deps
-tests/.deps
-src/.libs
-tests/.libs
+.deps
+.libs
+*.lo
+*.la
+ABOUT-NLS
 INSTALL
 Makefile
 Makefile.in
@@ -13,6 +13,7 @@
 config.h
 config.h.in
 config.log
+config.rpath
 config.status
 config.sub
 configure
@@ -20,33 +21,27 @@
 install-sh
 libtool
 ltmain.sh
-m4/
 missing
-stamp-h1
-data/Makefile
-data/Makefile.in
-src/Makefile
-src/Makefile.in
-src/main.c
-src/unity-place-applications
-src/unity_place_applications.vala.stamp
-tests/Makefile
-tests/Makefile.in
-tests/test-place-applications
-tests/test-place-applications.c
-tests/test_place_applications_vala.stamp
-vapi/Makefile
-vapi/Makefile.in
-unity-apps_version.tar.gz
-tests/place-applications-check-results.xml
 mkinstalldirs
-data/unity-place-applications.service
+stamp-*
+data/*.directory
+data/*.gschema.valid
+data/*.gschema.xml
+data/*.gschema.xml.in
+data/*.menu
+data/*.scope
+data/*.scope.in
+data/*.service
+m4/intltool.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+po/*.gmo
 po/POTFILES
 po/stamp-it
-src/applications.c
-src/utils.c
 po/Makefile.in.in
-unity-place-applications.desktop
 po/.intltool-merge-cache
 po/Makevars.template
 po/Rules-quot
@@ -57,17 +52,15 @@
 po/remove-potcdate.sin
 po/boldquot.sed
 po/quot.sed
-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
+po/unity-lens-applications.pot
+src/*.c
 src/config.vala
-src/daemon.c
-src/schemas.c
-src/unity-applications-daemon
-src/unity_applications_daemon.vala.stamp
+src/unity-scope-applications.vala.stamp
+tests/unit/*.c
+tests/unit/*.stamp
+tests/unit/test-purchase-info-helper
+tests/unit/test-software-center-data-cache
+tests/unit/test-software-center-details
+tests/unit/test-software-center-utils
+tests/unit/test-utils
+tests/unit/test-xapian-utils

=== modified file 'Makefile.am'
--- Makefile.am	2013-07-28 10:26:17 +0000
+++ Makefile.am	2013-08-06 08:19:29 +0000
@@ -1,21 +1,6 @@
 NULL = 
 SUBDIRS = src data po tests/unit
 
-#
-# Install the applications.lens file
-#
-scope_in_files = applications.scope.in commands.scope.in
-
-scopedir = $(datadir)/unity/scopes
-scope_DATA = commands.scope
-appscopedir = $(scopedir)/applications
-appscope_DATA = applications.scope
-
-icondir = $(datadir)/unity/themes
-icon_DATA = applications.png
-
-@INTLTOOL_SCOPE_RULE@
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
 # ChangeLog file created at distcheck time
@@ -34,9 +19,7 @@
   fi
 
 EXTRA_DIST = \
-  applications.png \
   autogen.sh \
-  $(scope_in_files) \
   AUTHORS \
   COPYING \
   HACKING \

=== modified file 'configure.ac'
--- configure.ac	2013-05-16 21:13:36 +0000
+++ configure.ac	2013-08-06 08:19:29 +0000
@@ -1,7 +1,9 @@
-AC_INIT(unity-lens-applications, 7.0.0, https://launchpad.net/unity-lens-applications)
+AC_INIT(unity-lens-applications, 7.1.0, https://launchpad.net/unity-lens-applications)
 AC_COPYRIGHT([Copyright 2010-2012 Canonical])
 AM_INIT_AUTOMAKE([1.11])
 
+LT_INIT
+
 #############################################
 # Silent build rules
 #############################################
@@ -166,8 +168,6 @@
 #############################################
 AC_CONFIG_FILES([
   Makefile
-  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	2013-05-16 11:37:05 +0000
+++ data/Makefile.am	2013-08-06 08:19:29 +0000
@@ -1,4 +1,22 @@
 #############################################################
+# Unity scope files
+#############################################################
+@INTLTOOL_SCOPE_RULE@
+
+%.scope.in: %.scope.in.in
+	sed -e "s|\@prefix\@|$(prefix)|" -e "s|\@libdir\@|$(libdir)|" $< > $@
+
+scope_in_in_files = applications.scope.in.in scopes.scope.in.in commands.scope.in.in
+
+scopedir = $(datadir)/unity/scopes
+scope_DATA = commands.scope
+appscopedir = $(scopedir)/applications
+appscope_DATA = applications.scope scopes.scope
+
+icondir = $(datadir)/unity/themes
+icon_DATA = applications.png
+
+#############################################################
 # DBus service files
 #############################################################
 dbus_servicesdir = $(DBUSSERVICEDIR)
@@ -6,7 +24,7 @@
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+	sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
 #############################################################
 # XDG Menu files
@@ -33,12 +51,16 @@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
+  applications.png \
+  $(scope_in_in_files) \
   com.canonical.Unity.AppsLens.gschema.xml.in.in \
   $(service_in_files) \
   $(directory_in_files) \
   $(menu_in_files)
 
 CLEANFILES = \
+  $(scope_DATA) \
+  $(scope_in_in_files:.scope.in.in=.scope.in) \
   unity-scope-applications.service \
   $(gsettings_SCHEMAS)
 

=== renamed file 'applications.png' => 'data/applications.png'
=== renamed file 'applications.scope.in.in' => 'data/applications.scope.in.in'
--- applications.scope.in.in	2013-06-20 13:11:17 +0000
+++ data/applications.scope.in.in	2013-08-06 08:19:29 +0000
@@ -1,6 +1,9 @@
 [Scope]
 DBusName=com.canonical.Unity.Scope.Applications
 DBusPath=/com/canonical/unity/scope/applications
+Module=@libdir@/unity/unity-scope-applications.so
+ModuleType=C
+Timeout=-1
 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.

=== renamed file 'commands.scope.in.in' => 'data/commands.scope.in.in'
--- commands.scope.in.in	2013-05-16 11:37:05 +0000
+++ data/commands.scope.in.in	2013-08-06 08:19:29 +0000
@@ -1,6 +1,8 @@
 [Scope]
 DBusName=com.canonical.Unity.Scope.Applications
 DBusPath=/com/canonical/unity/scope/commands
+Module=@libdir@/unity/unity-scope-applications.so
+ModuleType=C
 _Name=Commands
 _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=

=== added file 'data/scopes.scope.in.in'
--- data/scopes.scope.in.in	1970-01-01 00:00:00 +0000
+++ data/scopes.scope.in.in	2013-08-06 08:19:29 +0000
@@ -0,0 +1,15 @@
+[Scope]
+DBusName=com.canonical.Unity.Scope.Applications
+DBusPath=/com/canonical/unity/scope/scopes
+Module=@libdir@/unity/unity-scope-applications.so
+ModuleType=C
+Icon=@prefix@/share/unity/icons/lens-nav-app.svg
+_Name=Scopes
+_Description=This is an Ubuntu search plugin that enables information from available search plugins 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 search plugins
+OptionalMetadata=is_scope[u]
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=unity-lens-applications
+

=== modified file 'data/unity-scope-applications.service.in'
--- data/unity-scope-applications.service.in	2013-05-16 11:37:05 +0000
+++ data/unity-scope-applications.service.in	2013-08-06 08:19:29 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.Applications
-Exec=@pkglibexecdir@/unity-applications-daemon
+Exec=@bindir@/unity-scope-loader applications/applications.scope applications/scopes.scope commands.scope

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-29 04:02:27 +0000
+++ debian/changelog	2013-08-06 08:19:29 +0000
@@ -1,3 +1,9 @@
+unity-lens-applications (7.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * Convert scope to run as a unity-scope-loader plugin.
+
+ -- James Henstridge <[e-mail]>  Fri, 26 Jul 2013 17:09:10 +0800
+
 unity-lens-applications (7.0.0+13.10.20130729-0ubuntu1) saucy; urgency=low
 
   [ Michal Hruby ]

=== modified file 'debian/rules'
--- debian/rules	2013-04-12 12:21:04 +0000
+++ debian/rules	2013-08-06 08:19:29 +0000
@@ -10,3 +10,4 @@
 
 override_dh_install:
 	dh_install --fail-missing
+	rm -f debian/unity-lens-applications/usr/lib/*/unity/*.la

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-05-16 11:37:05 +0000
+++ po/POTFILES.in	2013-08-06 08:19:29 +0000
@@ -1,8 +1,10 @@
 [encoding: UTF-8]
 src/daemon.vala
-src/runner.vala
+src/commands-scope.vala
+src/scopes-scope.vala
 src/utils.vala
 src/main.vala
 data/X-Unity-All-Applications.directory.in
-[type: gettext/ini]applications.scope.in.in
-[type: gettext/ini]commands.scope.in.in
+[type: gettext/ini]data/applications.scope.in.in
+[type: gettext/ini]data/commands.scope.in.in
+[type: gettext/ini]data/scopes.scope.in.in

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2011-03-10 14:49:07 +0000
+++ po/POTFILES.skip	2013-08-06 08:19:29 +0000
@@ -1,5 +1,5 @@
 src/main.c
 src/daemon.c
 src/utils.c
-src/runner.c
-
+src/commands-scope.c
+src/scopes-scope.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-05-16 11:37:05 +0000
+++ src/Makefile.am	2013-08-06 08:19:29 +0000
@@ -1,14 +1,14 @@
 NULL =
 BUILT_SOURCES =
 CLEANFILES =
-EXTRA_DIST =	
+EXTRA_DIST =
 
 DATADIR = $(datadir)
 
-pkglibexec_PROGRAMS = \
-  unity-applications-daemon
+unitylibdir = $(libdir)/unity
+unitylib_LTLIBRARIES = unity-scope-applications.la
 
-unity_applications_daemon_CPPFLAGS = \
+AM_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
@@ -21,12 +21,14 @@
   -g
 
 if !ENABLE_C_WARNINGS
-  unity_applications_daemon_CPPFLAGS += -w
+  AM_CPPFLAGS += -w
 endif
 
+AM_CXXFLAGS = --std=c++11
+
 # Note that we require glib 2.26 because libzeitgeist
 # expects us to use g_ptr_array_unref instead of g_ptr_array_free.
-unity_applications_daemon_VALAFLAGS = \
+AM_VALAFLAGS = \
   -C \
   --vapidir=$(top_srcdir)/vapi \
   --pkg posix \
@@ -47,23 +49,24 @@
 
 unity_ratings_db_libs = -ldb
 
-unity_applications_daemon_LDADD = \
+unity_scope_applications_la_LIBADD = \
   $(LENS_DAEMON_LIBS) \
   $(unity_package_search_libs) \
   $(unity_ratings_db_libs) \
-  unity-package-search.o \
-  unity-ratings-db.o \
   $(NULL)
 
-unity_applications_daemon_LDFLAGS = -rpath $(PROTOCOLPRIVATELIBDIR) $(COVERAGE_LDFLAGS)
+unity_scope_applications_la_LDFLAGS = \
+  -module -shared -avoid-version \
+  -R $(PROTOCOLPRIVATELIBDIR) $(COVERAGE_LDFLAGS)
 
-unity_applications_daemon_VALASOURCES = \
+unity_scope_applications_la_VALASOURCES = \
   app-watcher.vala \
   config.vala \
   daemon.vala \
   launcher-client.vala \
   main.vala \
-  runner.vala \
+  commands-scope.vala \
+  scopes-scope.vala \
   schemas.vala \
   utils.vala \
   aptd-client.vala \
@@ -75,40 +78,34 @@
   xapian-utils.vala \
   $(NULL)
 
-unity-package-search.o : $(srcdir)/unity-package-search.cc $(srcdir)/unity-package-search.h
-	$(AM_V_GEN)$(CXX) --std=c++11 $(COVERAGE_CFLAGS) -g $(unity_package_search_libs) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus0` -c $(srcdir)/unity-package-search.cc
-
-unity-ratings-db.o : $(srcdir)/unity-ratings-db.c $(srcdir)/unity-ratings-db.h
-	$(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(srcdir)/unity-ratings-db.c
-
-unity_applications_daemon_SOURCES = \
-  $(unity_applications_daemon_VALASOURCES:.vala=.c) \
+unity_scope_applications_la_SOURCES = \
+  $(unity_scope_applications_la_VALASOURCES:.vala=.c) \
+  unity-package-search.cc \
   unity-package-search.h \
+  unity-ratings-db.c \
   unity-ratings-db.h \
   $(NULL)
 
 BUILT_SOURCES += \
-  unity_applications_daemon.vala.stamp \
+  unity-scope-applications.vala.stamp \
   $(NULL)
 
 EXTRA_DIST += \
-  unity_applications_daemon.vala.stamp \
-  $(unity_applications_daemon_VALASOURCES) \
+  unity-scope-applications.vala.stamp \
+  $(unity_scope_applications_la_VALASOURCES) \
   unity-package-search.cc \
   unity-package-search.h \
   unity-ratings-db.c \
   unity-ratings-db.h \
   $(NULL)
 
-unity_applications_daemon.vala.stamp: $(unity_applications_daemon_VALASOURCES)
-	$(AM_V_GEN) $(VALAC) $(unity_applications_daemon_VALAFLAGS) $^
+unity-scope-applications.vala.stamp: $(unity_scope_applications_la_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(AM_VALAFLAGS) $^
 	@touch $@
 
 CLEANFILES += \
   *.stamp \
   *.vapi \
-  $(unity_applications_daemon_VALASOURCES:.vala=.c) \
-  unity-package-search.o \
+  $(unity_scope_applications_la_VALASOURCES:.vala=.c) \
   unity-package-search.h.gch \
-  unity-ratings-db.o \
   $(NULL)

=== renamed file 'src/runner.vala' => 'src/commands-scope.vala'
--- src/runner.vala	2013-07-01 12:17:01 +0000
+++ src/commands-scope.vala	2013-08-06 08:19:29 +0000
@@ -1,5 +1,6 @@
+/* -*- mode: vala; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -38,47 +39,25 @@
     }
   }
 
-  public class Runner: GLib.Object
+  private class CommandsScope : Unity.AbstractScope
   {
-
-    private Unity.ApplicationsLens.Daemon daemon;
-    private const string BUS_NAME_PREFIX = "com.canonical.Unity.ApplicationsLens.Runner";
+    // The ApplicationsScope holds a reference to us, so avoid a
+    // reference cycle.
+    public unowned ApplicationsScope appscope;
 
     /* for now, load the same keys as gnome-panel */
     private const string HISTORY_KEY = "history";
     private const int    MAX_HISTORY = 10;
 
-    public Unity.DeprecatedScope scope;
-
-    private Gee.HashMap<string,AboutEntry> about_entries;
-    private Gee.List<string> history;
-    private ExecSearcher exec_searcher = new ExecSearcher ();
+    public Gee.HashMap<string,AboutEntry> about_entries;
+    public Gee.List<string> history;
+    public ExecSearcher exec_searcher = new ExecSearcher ();
 
     private Settings gp_settings;
 
-    public Runner (Unity.ApplicationsLens.Daemon daemon)
+    public CommandsScope (ApplicationsScope appscope)
     {
-      /* First create scope */
-      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) =>
-      {
-        update_search.begin (lens_search);
-      });
-
-      /* Make sure we ignore extra whitespace on searches */
-      scope.generate_search_key.connect ((lens_search) =>
-      {
-        return lens_search.search_string.strip ();
-      });
-
-      scope.activate_uri.connect (daemon.activate);
+      this.appscope = appscope;
 
       /* create the private about entries */
       about_entries = new Gee.HashMap<string,AboutEntry> ();
@@ -87,20 +66,92 @@
       this.gp_settings = new Settings ("com.canonical.Unity.Runner");
       history = new Gee.ArrayList<string> ();
       load_history ();
-
-      this.daemon = daemon;
-
-      try
-      {
-        scope.export ();
-      }
-      catch (Error err)
-      {
-        error ("Unable to export scope: %s", err.message);
-      }
-    }
-
-    private void populate_categories ()
+    }
+
+    public void add_history (string last_command)
+    {
+
+      // new history list: better, greatest, latest!
+      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++;
+      }
+      this.history = new_history;
+
+      // 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)
+      results_invalidated (SearchType.DEFAULT);
+    }
+
+    private void load_history ()
+    {
+      int i = 0;
+      string[] history_store = this.gp_settings.get_strv (HISTORY_KEY);
+      foreach (var command in history_store)
+      {
+        if (i >= MAX_HISTORY)
+          break;
+        this.history.add((string) command.data);
+        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");
+      }
+      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;
+
+    }
+
+    public override string get_group_name ()
+    {
+      return "com.canonical.Unity.Scope.Applications";
+    }
+
+    public override string get_unique_name ()
+    {
+      return "/com/canonical/unity/scope/commands";
+    }
+
+    public override Unity.CategorySet get_categories ()
     {
       var categories = new Unity.CategorySet ();
       var icon_dir = File.new_for_path (ICON_PATH);
@@ -113,33 +164,98 @@
 
       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;
+      return categories;
+    }
+
+    public override Unity.FilterSet get_filters ()
+    {
+      var filters = new Unity.FilterSet ();
+      return filters;
+    }
+
+    public override Unity.Schema get_schema ()
+    {
+      var schema = new Unity.Schema ();
+      return schema;
+    }
+
+    public override string get_search_hint ()
+    {
+      return _("Run a command");
+    }
+
+    public override string normalize_search_query (string search_query)
+    {
+      return search_query.strip();
+    }
+
+    public override Unity.ScopeSearchBase create_search_for_query (Unity.SearchContext search_context)
+    {
+      return new CommandsSearch (this, search_context);
+    }
+
+    public override Unity.ResultPreviewer create_previewer (Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      return null;
+    }
+
+    public override Unity.ActivationResponse? activate (Unity.ScopeResult result, Unity.SearchMetadata metadata, string? action_id)
+    {
+      return appscope.activate (result, metadata, action_id);
+    }
+  }
+
+  private class CommandsSearch : Unity.ScopeSearchBase
+  {
+    private CommandsScope scope;
+
+    public CommandsSearch (CommandsScope scope, Unity.SearchContext search_context)
+    {
+      this.scope = scope;
+      set_search_context (search_context);
+    }
+
+    public override void run ()
+    {
+      var ml = new MainLoop ();
+      run_async (() => { ml.quit (); });
+      ml.run ();
+    }
+
+    public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
+    {
+      update_search.begin (
+        () => {
+          async_callback (this);
+        });
+    }
+
+    private void add_result (Unity.ResultSet result_set, string uri,
+                             string icon_hint, uint category_id,
+                             string mimetype, string title)
+    {
+      var result = Unity.ScopeResult ();
+      result.uri = uri;
+      result.icon_hint = icon_hint;
+      result.category = category_id;
+      result.result_type = ResultType.DEFAULT;
+      result.mimetype = mimetype;
+      result.title = title;
+      result.comment = "";
+      result.dnd_uri = uri;
+      result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
+      result_set.add_result (result);
+    }
+
+    private async void update_search ()
+    {
+      var context = this.search_context;
+      var result_set = context.result_set;
       var executables_match = new Gee.ArrayList<string> ();
       var dirs_match = new Gee.ArrayList<string> ();
-      model.clear ();
 
-      var search_string = search.search_string;
-      bool has_search = !Utils.is_search_empty (search.search_string);
+      var search_string = context.search_query;
+      bool has_search = !Utils.is_search_empty (search_string);
 
       string uri;
       Icon icon;
@@ -147,16 +263,15 @@
       string display_name;
       var category_id = RunnerCategory.HISTORY;
 
-      foreach (var command in this.history)
+      foreach (var command in scope.history)
       {
         display_name = get_icon_uri_and_mimetype (command, out icon, out uri, out mimetype);
-        add_result (model, uri, icon.to_string (), category_id, mimetype,
+        add_result (result_set, uri, icon.to_string (), category_id, mimetype,
                     display_name);
       }
 
       if (!has_search)
       {
-        search.finished ();
         return;
       }
 
@@ -168,9 +283,8 @@
         uri = "about:blank";
         string commenteaster = _("There is no easter egg in Unity");
         icon = new ThemedIcon ("gnome-panel-fish");
-        add_result (model, uri, icon.to_string (), 0, "text/plain",
+        add_result (result_set, uri, icon.to_string (), 0, "text/plain",
                     commenteaster);
-        search.finished ();
         return;
       }
       else if (search_string == "gegls from outer space")
@@ -178,9 +292,8 @@
         uri = "about:blank";
         string commentnoeaster = _("Still no easter egg in Unity");
         icon = new ThemedIcon ("gnome-panel-fish");
-        add_result (model, uri, icon.to_string (), 0, "text/plain",
+        add_result (result_set, uri, icon.to_string (), 0, "text/plain",
                     commentnoeaster);
-        search.finished ();
         return;
 
       }
@@ -238,7 +351,7 @@
       /* complete again system executables */
       else
       {
-        var matching_executables = yield exec_searcher.find_prefixed (search_string);
+        var matching_executables = yield scope.exec_searcher.find_prefixed (search_string);
         foreach (var matching_exec in matching_executables)
         {
           executables_match.add (matching_exec);
@@ -255,7 +368,7 @@
       if ((executables_match.size == 0) && (dirs_match.size == 0))
       {
         display_name = get_icon_uri_and_mimetype (search_string, out icon, out uri, out mimetype);
-        add_result (model, uri.strip (), icon.to_string (),
+        add_result (result_set, uri.strip (), icon.to_string (),
                     category_id, mimetype, display_name);
       }
 
@@ -265,7 +378,7 @@
       foreach (var dir in dirs_match)
       {
         uri = UNITY_RUNNER_PREFIX + dir;
-        add_result (model, uri, icon.to_string (),
+        add_result (result_set, uri, icon.to_string (),
                     category_id, mimetype, dir);
       }
 
@@ -275,104 +388,13 @@
         // TODO: try to match to a desktop file for the icon
         uri = UNITY_RUNNER_PREFIX + final_exec;
         display_name = get_icon_uri_and_mimetype (final_exec, out icon, out uri, out mimetype);
-        add_result (model, uri, icon.to_string (),
+        add_result (result_set, 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 ()
-      {
-        Object ();
-      }
-
-      private Gee.List<string> executables;
-
-      construct
-      {
-        executables = new Gee.ArrayList<string> ();
-        listing_status = ListingStatus.NOT_STARTED;
-      }
-
-      // TODO: add reload
-      private async void find_system_executables ()
-      {
-        if (this.executables.size > 0)
-          return;
-
-        foreach (var path_directory in Environment.get_variable ("PATH").split(":"))
-        {
-          var dir = File.new_for_path (path_directory);
-          try {
-            var e = yield dir.enumerate_children_async (FileAttribute.STANDARD_NAME + "," + FileAttribute.ACCESS_CAN_EXECUTE,
-                                                        0, Priority.DEFAULT, null);
-            while (true) {
-              var files = yield e.next_files_async (64, Priority.DEFAULT, null);
-              if (files == null)
-                  break;
-
-              foreach (var info in files) {
-                if (info.get_attribute_boolean (FileAttribute.ACCESS_CAN_EXECUTE))
-                {
-                  this.executables.add (info.get_name ());
-                }
-              }
-            }
-          }
-          catch (Error err) {
-            warning("Error listing directory executables: %s\n", err.message);
-          }
-        }
-      }
-
-      private enum ListingStatus
-      {
-        NOT_STARTED,
-        STARTED,
-        FINISHED
-      }
-
-      public int listing_status { get; private set; }
-
-      public async Gee.Collection<string> find_prefixed (string search_string)
-      {
-        // initialize the available binaries lazily
-        if (listing_status == ListingStatus.NOT_STARTED)
-        {
-          listing_status = ListingStatus.STARTED;
-          yield find_system_executables ();
-          listing_status = ListingStatus.FINISHED;
-        }
-        else if (listing_status == ListingStatus.STARTED)
-        {
-          var sig_id = this.notify["listing-status"].connect (() =>
-          {
-            if (listing_status == ListingStatus.FINISHED)
-              find_prefixed.callback ();
-          });
-          yield;
-          SignalHandler.disconnect (this, sig_id);
-        }
-
-        var matching = new Gee.ArrayList<string> ();
-        foreach (var exec_candidate in executables)
-        {
-          if (exec_candidate.has_prefix (search_string))
-          {
-            matching.add (exec_candidate);
-          }
-        }
-
-        return matching;
-      }
     }
 
     private string get_icon_uri_and_mimetype (string exec_string, out Icon? icon, out string? uri, out string? mimetype)
@@ -381,7 +403,7 @@
       AboutEntry? entry = null;
 
       mimetype = "application/x-unity-run";
-      entry = about_entries[exec_string];
+      entry = scope.about_entries[exec_string];
       if (entry != null)
       {
         uri = UNITY_RUNNER_PREFIX + entry.exec;
@@ -401,9 +423,10 @@
       }
 
       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);
+      var appresults = scope.appscope.appsearcher.search (
+        @"type:Application AND exec:$s", 0,
+        Unity.Package.SearchType.EXACT,
+        Unity.Package.Sort.BY_NAME);
       foreach (unowned Unity.Package.PackageInfo pkginfo in appresults.results)
       {
 
@@ -411,7 +434,7 @@
           continue;
 
         // pick the first one
-        icon = this.daemon.find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
+        icon = scope.appscope.find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
         return exec_string;
 
       }
@@ -421,81 +444,93 @@
       return exec_string;
 
     }
-
-
-    public void add_history (string last_command)
-    {
-
-      // new history list: better, greatest, latest!
-      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++;
-      }
-      this.history = new_history;
-
-      // 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;
-      string[] history_store = this.gp_settings.get_strv (HISTORY_KEY);
-      foreach (var command in history_store)
-      {
-        if (i >= MAX_HISTORY)
-          break;
-        this.history.add((string) command.data);
-        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");
-      }
-      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;
-
-    }
-
-  }
-
+  }
+
+  private class ExecSearcher: Object
+  {
+    public ExecSearcher ()
+    {
+      Object ();
+    }
+
+    private Gee.List<string> executables;
+
+    construct
+    {
+      executables = new Gee.ArrayList<string> ();
+      listing_status = ListingStatus.NOT_STARTED;
+    }
+
+    // TODO: add reload
+    private async void find_system_executables ()
+    {
+      if (this.executables.size > 0)
+        return;
+
+      foreach (var path_directory in Environment.get_variable ("PATH").split(":"))
+      {
+        var dir = File.new_for_path (path_directory);
+        try {
+          var e = yield dir.enumerate_children_async (FileAttribute.STANDARD_NAME + "," + FileAttribute.ACCESS_CAN_EXECUTE,
+                                                      0, Priority.DEFAULT, null);
+          while (true) {
+            var files = yield e.next_files_async (64, Priority.DEFAULT, null);
+            if (files == null)
+                break;
+
+            foreach (var info in files) {
+              if (info.get_attribute_boolean (FileAttribute.ACCESS_CAN_EXECUTE))
+              {
+                this.executables.add (info.get_name ());
+              }
+            }
+          }
+        }
+        catch (Error err) {
+          warning("Error listing directory executables: %s\n", err.message);
+        }
+      }
+    }
+
+    private enum ListingStatus
+    {
+      NOT_STARTED,
+      STARTED,
+      FINISHED
+    }
+
+    public int listing_status { get; private set; }
+
+    public async Gee.Collection<string> find_prefixed (string search_string)
+    {
+      // initialize the available binaries lazily
+      if (listing_status == ListingStatus.NOT_STARTED)
+      {
+        listing_status = ListingStatus.STARTED;
+        yield find_system_executables ();
+        listing_status = ListingStatus.FINISHED;
+      }
+      else if (listing_status == ListingStatus.STARTED)
+      {
+        var sig_id = this.notify["listing-status"].connect (() =>
+        {
+          if (listing_status == ListingStatus.FINISHED)
+            find_prefixed.callback ();
+        });
+        yield;
+        SignalHandler.disconnect (this, sig_id);
+      }
+
+      var matching = new Gee.ArrayList<string> ();
+      foreach (var exec_candidate in executables)
+      {
+        if (exec_candidate.has_prefix (search_string))
+        {
+          matching.add (exec_candidate);
+        }
+      }
+
+      return matching;
+    }
+  }
 }

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-07-18 21:11:13 +0000
+++ src/daemon.vala	2013-08-06 08:19:29 +0000
@@ -1,5 +1,6 @@
+/* -*- mode: vala; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -42,66 +43,57 @@
 
   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 class ApplicationsScope : Unity.AbstractScope
   {
-    private Variant empty_asv;
-    private Zeitgeist.Log log;
-    private Zeitgeist.Index zg_index;
+    public Zeitgeist.Log log;
+    public Zeitgeist.Index zg_index;
     private Zeitgeist.Monitor monitor;
 
-    private Map<string, int> popularity_map;
-    private bool popularities_dirty;
+    public Map<string, int> popularity_map;
+    public bool popularities_dirty;
 
     /* 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? pkgsearcher;
     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.DeprecatedScope scope;
+    public Unity.Ratings.Database? ratings = null;
 
     /* Support aptd dbus interface; created when application install/remove was requested by preview action */
     private AptdProxy aptdclient;
     private AptdTransactionProxy aptd_transaction;
 
-    private SoftwareCenterUtils.MangledDesktopFileLookup sc_mangler;
+    public SoftwareCenterUtils.MangledDesktopFileLookup sc_mangler;
 
     /* Used for adding launcher icon on app installation from the preview */
     private LauncherProxy launcherservice;
 
     /* Desktop file & icon name for unity-install:// install candidate displayed in last preview; we store
      * them here to avoid extra query for app details if app install action is activated */
-    private string preview_installable_desktop_file;
-    private string preview_installable_icon_file;
+    public string preview_installable_desktop_file;
+    public string preview_installable_icon_file;
 
-    private string preview_developer_website;
+    public string preview_developer_website;
 
     /* SoftwareCenter data provider used for app preview details */
-    private SoftwareCenterDataProviderProxy sc_data_provider;
-
-    private Unity.ApplicationsLens.Runner runner;
-
-    /* Keep references to the FilterOptions for sources */
-    private FilterOption local_apps_option;
-    private FilterOption usc_apps_option;
+    public SoftwareCenterDataProviderProxy sc_data_provider;
+
+    public Unity.ApplicationsLens.CommandsScope commands_scope;
 
     private Gee.List<string> image_extensions;
     private HashTable<string,Icon> file_icon_cache;
 
     /* Monitor the favorite apps in the launcher, so we can filter them
      * out of the results for Recent Apps */
-    private Unity.LauncherFavorites favorite_apps;
-    private AppWatcher app_watcher;
+    public Unity.LauncherFavorites favorite_apps;
+    public AppWatcher app_watcher;
 
-    private PtrArray zg_templates;
+    public PtrArray zg_templates;
 
     /* Gnome menu structure - also used to check whether apps are installed */
     private uint app_menu_changed_reindex_timeout = 0;
@@ -111,7 +103,6 @@
     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";
@@ -120,10 +111,7 @@
     public bool display_available_apps { get; set; default = true; }
     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;
+    public PurchaseInfoHelper purchase_info = null;
 
     construct
     {
@@ -131,7 +119,6 @@
 
       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);
@@ -168,55 +155,15 @@
       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.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"));
-      if (display_available_apps)
-      {
-        // TRANSLATORS: Please make sure this string is short enough to fit
-        // into the filter button
-        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 ();
-      });
-      /* Listen for changes to the lens scope search */
-      scope.search_changed.connect ((lens_search, search_type, cancellable) =>
-      {
-        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);
-      });
-
-      scope.activate_uri.connect (activate);
-      scope.preview_uri.connect (preview);
-
       /* Listen for changes in the installed applications */
       AppInfoManager.get_default().changed.connect (mark_dirty);
 
       /* Now start the RunEntry */
-      runner = new Unity.ApplicationsLens.Runner (this);
+      commands_scope = new Unity.ApplicationsLens.CommandsScope (this);
 
       try {
         uri_regex = new Regex ("^[a-z]+:.+$");
@@ -234,46 +181,9 @@
 
       aptdclient = new AptdProxy ();
       launcherservice = new LauncherProxy ();
-
-      try
-      {
-        scope.export ();
-      }
-      catch (Error err)
-      {
-        error ("Unable to export scope: %s", err.message);
-      }
-
-      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 ()
+    }
+
+    public void init_ratings_db ()
     {
       if (ratings_db_initialized) return;
       try
@@ -288,35 +198,19 @@
       ratings_db_initialized = true;
     }
 
-    private async void dispatch_search (DeprecatedScopeSearch search,
-                                        SearchType search_type,
-                                        GLib.Cancellable cancellable)
-    {
-      try
-      {
-        if (popularities_dirty)
-        {
-          popularities_dirty = false;
-          // we're not passing the cancellable, cause cancelling this search
-          // shouldn't cancel getting most popular apps
-          yield update_popularities ();
-          if (cancellable.is_cancelled ()) return;
-        }
-
-        if (search_type == SearchType.DEFAULT)
-          yield update_scope_search (search, cancellable);
-        else
-          yield update_global_search (search, cancellable);
-      }
-      finally
-      {
-        search.finished ();
-      }
-    }
-
-    private void populate_categories ()
-    {
-      Unity.CategorySet categories = new Unity.CategorySet ();
+    public override string get_group_name ()
+    {
+      return "com.canonical.Unity.Scope.Applications";
+    }
+
+    public override string get_unique_name ()
+    {
+      return "/com/canonical/unity/scope/applications";
+    }
+
+    public override Unity.CategorySet get_categories ()
+    {
+      var categories = new Unity.CategorySet ();
       File icon_dir = File.new_for_path (ICON_PATH);
 
       var cat = new Unity.Category ("apps", _("Applications"),
@@ -339,12 +233,12 @@
                                 new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")));
       categories.add (cat);
 
-      scope.categories = categories;
+      return categories;
     }
 
-    private void populate_filters()
+    public override Unity.FilterSet get_filters()
     {
-      Unity.FilterSet filters = new Unity.FilterSet ();
+      var filters = new Unity.FilterSet ();
 
       /* Type filter */
       {
@@ -369,23 +263,310 @@
         filters.add (filter);
       }
 
-      scope.filters = filters;
-    }
-
-    private bool local_apps_active (DeprecatedScopeSearch search)
-    {
-      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 (DeprecatedScopeSearch search)
-    {
-      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;
+      /* Sources */
+      {
+        var filter = new CheckOptionFilter ("unity-sources", _("Sources"));
+        filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
+
+        // TRANSLATORS: Please make sure this string is short enough to fit
+        // into the filter button
+        filter.add_option ("local", _("Local apps"));
+        if (display_available_apps)
+        {
+          // TRANSLATORS: Please make sure this string is short enough to fit
+          // into the filter button
+          filter.add_option ("usc", _("Software center"));
+        }
+
+        filters.add (filter);
+      }
+
+      return filters;
+    }
+
+    public override Unity.Schema get_schema ()
+    {
+      var schema = new Unity.Schema ();
+      return schema;
+    }
+
+    public override string get_search_hint ()
+    {
+      return _("Search applications");
+    }
+
+    public override string normalize_search_query (string search_query)
+    {
+      return search_query.strip ();
+    }
+
+    public override Unity.ScopeSearchBase create_search_for_query (Unity.SearchContext search_context)
+    {
+      return new ApplicationsSearch (this, search_context);
+    }
+
+    public override Unity.ResultPreviewer create_previewer (Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      return new ApplicationsResultPreviewer (this, result, metadata);
+    }
+
+    public override Unity.ActivationResponse? activate (Unity.ScopeResult result, Unity.SearchMetadata metadata, string? action_id)
+    {
+      if (action_id == "buy")
+        return start_software_center (result.uri);
+      else if (action_id == "install")
+        return app_preview_install (result.uri);
+      else if (action_id == "install-paid")
+        return start_software_center (result.uri);
+      else if (action_id == "uninstall")
+        return app_preview_uninstall (result.uri);
+      else if (action_id == "website")
+        return app_preview_website (result.uri);
+      else
+        return app_launch (result, metadata);
+    }
+
+    private Unity.ActivationResponse app_launch (Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      string[] args;
+      string exec_or_dir = null;
+      if (result.uri.has_prefix ("unity-install://"))
+      {
+        var prv = create_previewer (result, metadata).run ();
+        if (prv is Unity.Preview)
+        {
+          return new Unity.ActivationResponse.with_preview (
+            prv as Unity.Preview);
+        }
+        else
+        {
+          warning ("Failed to generate preview for %s", result.uri);
+          return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+        }
+      }
+      else if (result.uri.has_prefix (UNITY_RUNNER_PREFIX))
+      {
+        string orig;
+        orig = result.uri.offset (UNITY_RUNNER_PREFIX.length);
+        if (orig.has_prefix("\\\\"))
+          orig = orig.replace ("\\\\","smb://");
+        if (uri_regex != null && uri_regex.match (orig)) {
+          try {
+            /* this code ensures that a file manager will be used
+             * if uri it's a remote location that should be mounted */
+            if (mountable_regex.match (orig)) {
+              var muris = new GLib.List<string>();
+              muris.prepend (orig);
+              var file_manager = AppInfo.get_default_for_type("inode/directory", true);
+              file_manager.launch_uris(muris,null);
+            } else {
+              AppInfo.launch_default_for_uri (orig, null);
+            }
+          } catch (GLib.Error error) {
+            warning ("Failed to launch URI %s", orig);
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+          }
+          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+
+        } else {
+          exec_or_dir = Utils.subst_tilde (orig);
+          args = exec_or_dir.split (" ", 0);
+          for (int i = 0; i < args.length; i++)
+            args[i] = Utils.subst_tilde (args[i]);
+        }
+        this.commands_scope.add_history (orig);
+      }
+      else
+      {
+        /* Activation of standard application:// uris */
+
+        /* Make sure fresh install learns quickly */
+        if (popularity_map.size <= 5) popularities_dirty = true;
+
+        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+      }
+
+      if ((exec_or_dir != null) && FileUtils.test (exec_or_dir, FileTest.IS_DIR))
+      {
+        try {
+          AppInfo.launch_default_for_uri ("file://" + exec_or_dir, null);
+        } catch (GLib.Error err) {
+          warning ("Failed to open current folder '%s' in file manager: %s",
+                   exec_or_dir, err.message);
+          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+        }
+      }
+      else
+      {
+        try {
+          unowned string home_dir = GLib.Environment.get_home_dir ();
+          Process.spawn_async (home_dir, args, null, SpawnFlags.SEARCH_PATH, null, null);
+        } catch (SpawnError e) {
+          warning ("Failed to spawn software-center or direct URI activation '%s': %s",
+                   result.uri, e.message);
+          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+        }
+      }
+
+      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+    }
+
+    private async void call_install_packages (string package_name, out string tid) throws IOError
+    {
+      tid = yield aptdclient.install_packages ({package_name});
+    }
+
+    private async void call_remove_packages (string package_name, out string tid) throws IOError
+    {
+      tid = yield aptdclient.remove_packages ({package_name});
+    }
+
+    /**
+     * Handler for free apps installation.
+     * Triggers package installation via apt-daemon DBus service
+     */
+    private Unity.ActivationResponse app_preview_install (string uri)
+    {
+      if (uri.has_prefix ("unity-install://"))
+      {
+        string app = uri.substring (16); // trim "unity-install://"
+        string[] parts = app.split ("/");
+
+        if (parts.length > 1)
+        {
+          string pkgname = parts[0];
+          string appname = parts[1];
+          try
+          {
+            aptdclient.connect_to_aptd ();
+          }
+          catch (IOError e)
+          {
+            warning ("Failed to connect to aptd: '%s'", e.message);
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+          }
+          call_install_packages.begin (pkgname, (obj, res) =>
+          {
+            try {
+              string tid;
+              call_install_packages.end (res, out tid);
+              debug ("transaction started: %s, pkg: %s\n", tid, pkgname);
+              aptd_transaction = new AptdTransactionProxy ();
+              aptd_transaction.connect_to_aptd (tid);
+              aptd_transaction.simulate ();
+              aptd_transaction.run ();
+
+              launcherservice.connect_to_launcher ();
+              string desktop_file = preview_installable_desktop_file;
+              Icon icon = find_pkg_icon (null, preview_installable_icon_file);
+              launcherservice.add_launcher_item_from_position.begin (appname, icon.to_string (), 0, 0, 32, desktop_file, tid);
+            }
+            catch (IOError e)
+            {
+              warning ("Package '%s' installation failed: %s", pkgname, e.message);
+            }
+          });
+        }
+        else
+        {
+          warning ("Bad install uri: '%s'", uri);
+        }
+      }
+      else
+      {
+        warning ("Can't handle '%s' in app_preview_install handler", uri);
+        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+      }
+      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+    }
+
+    private Unity.ActivationResponse start_software_center (string uri)
+    {
+      unowned string pkg = uri.offset (16); // strip off "unity-install://" prefix
+      debug ("Installing: %s", pkg);
+
+      var args = new string[2];
+      args[0] = "software-center";
+      args[1] = pkg;
+
+      try
+      {
+        Process.spawn_async (GLib.Environment.get_home_dir (), args, null, SpawnFlags.SEARCH_PATH, null, null);
+      }
+      catch (SpawnError e)
+      {
+        warning ("Failed to spawn software-center for uri '%s': %s", uri, e.message);
+        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+      }
+
+      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+    }
+
+    private Unity.ActivationResponse app_preview_website (string uri)
+    {
+      try
+      {
+        AppInfo.launch_default_for_uri (preview_developer_website, null);
+        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+      }
+      catch (Error e)
+      {
+        warning ("Failed to launch a web browser for uri '%s': '%s'", uri, e.message);
+      }
+      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+    }
+
+    private Unity.ActivationResponse app_preview_uninstall (string uri)
+    {
+      if (uri.has_prefix ("application://"))
+      {
+        string desktopfile = uri.substring (14); // trim "application://"
+
+        // de-mangle desktop file names back to what S-C expects
+        if (sc_mangler.contains (desktopfile))
+        {
+          desktopfile = sc_mangler.get (desktopfile);
+        }
+
+        var pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
+
+        if (pkginfo != null && pkginfo.package_name != null)
+        {
+          try
+          {
+            aptdclient.connect_to_aptd ();
+          }
+          catch (IOError e)
+          {
+            warning ("Failed to connect to aptd: '%s'", e.message);
+            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
+          }
+
+          call_remove_packages.begin (pkginfo.package_name, (obj, res) =>
+          {
+            try {
+              string tid;
+              call_remove_packages.end (res, out tid);
+              debug ("transaction started: %s, pkg: %s\n", tid, pkginfo.package_name);
+              aptd_transaction = new AptdTransactionProxy ();
+              aptd_transaction.connect_to_aptd (tid);
+              aptd_transaction.simulate ();
+              aptd_transaction.run ();
+            }
+            catch (IOError e)
+            {
+              warning (@"Package '$(pkginfo.package_name)' removal failed: $(e.message)");
+            }
+          });
+          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+        }
+        else
+        {
+          warning (@"Cannot find package info for $uri");
+        }
+      }
+      warning (@"Can't handle '%s' in app_preview_uninstall handler", uri);
+      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
     }
 
     /* Load xdg menu info and build a Xapian index over it.
@@ -447,22 +628,6 @@
       return false;
     }
 
-    private async void build_scope_index ()
-    {
-      try
-      {
-        var scope_registry = yield Unity.Protocol.ScopeRegistry.find_scopes (
-          Config.PKGDATADIR + "/scopes");
-
-        debug ("Indexing scopes");
-        scopesearcher = new Unity.Package.Searcher.for_scopes (scope_registry);
-      }
-      catch (Error err)
-      {
-        warning ("Unable to find scopes: %s", err.message);
-      }
-    }
-
     private void populate_zg_templates ()
     {
       /* Create a template that activation of applications */
@@ -477,11 +642,11 @@
 
     private void mark_dirty ()
     {
-      scope.queue_search_changed (SearchType.DEFAULT);
-      scope.queue_search_changed (SearchType.GLOBAL);
+      results_invalidated (SearchType.DEFAULT);
+      results_invalidated (SearchType.GLOBAL);
     }
 
-    private async void update_popularities ()
+    public async void update_popularities ()
     {
       try
       {
@@ -515,6 +680,189 @@
       }
     }
 
+    public Icon find_pkg_icon (string? desktop_file, string icon_name)
+    {
+      if (desktop_file != null)
+      {
+        string desktop_id = Path.get_basename (desktop_file);
+        bool installed = AppInfoManager.get_default().lookup (desktop_id) != null;
+
+        /* If the app is already installed we should be able to pull the
+         * icon from the theme */
+        if (installed)
+          return new ThemedIcon (icon_name);
+      }
+
+      /* App is not installed - we need to find the right icon in the bowels
+       * of the software center */
+      if (icon_name.has_prefix ("/"))
+      {
+        return new FileIcon (File.new_for_path (icon_name));
+      }
+      else
+      {
+        Icon icon = file_icon_cache.lookup (icon_name);
+
+        if (icon != null)
+          return icon;
+
+        /* If the icon name contains a . it probably already have a
+         * type postfix - so test icon name directly */
+        string path;
+        if ("." in icon_name)
+        {
+          path = @"$(Config.DATADIR)/app-install/icons/$(icon_name)";
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (icon_name, icon);
+            return icon;
+          }
+          /* Try also software center cache dir */
+          path = Path.build_filename (Environment.get_user_cache_dir (),
+                                      "software-center",
+                                      "icons",
+                                      icon_name);
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (icon_name, icon);
+            return icon;
+          }
+        }
+
+        /* Now try appending all the image extensions we know */
+        foreach (var ext in image_extensions)
+        {
+          path = @"$(Config.DATADIR)/app-install/icons/$(icon_name).$(ext)";
+          if (FileUtils.test (path, FileTest.EXISTS))
+          {
+            /* Got it! Cache the icon path and return the icon */
+            icon = new FileIcon (File.new_for_path (path));
+            file_icon_cache.insert (icon_name, icon);
+            return icon;
+          }
+        }
+      }
+
+      /* Cache the fact that we couldn't find this icon */
+      var icon = new ThemedIcon (GENERIC_APP_ICON);
+      file_icon_cache.insert (icon_name, icon);
+
+      return icon;
+    }
+
+    public async 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);
+      }
+
+      debug ("Requesting pkg info: %s, %s\n", pkgname, appname);
+      return yield sc_data_provider.get_app_details (appname, pkgname);
+    }
+
+    public async bool get_version_and_screenshot (string app_id, out string version, out string screenshot)
+    {
+      version = null;
+      screenshot = null;
+      // de-mangle desktop file names back to what S-C expects
+      string mangled_id;
+      if (sc_mangler.contains (app_id))
+      {
+        mangled_id = sc_mangler.get (app_id);
+      }
+      else
+      {
+        mangled_id = app_id;
+      }
+      var pkginfo = pkgsearcher.get_by_desktop_file (mangled_id);
+      if (pkginfo != null)
+      {
+        SoftwareCenterData.AppDetailsData? details;
+        try {
+          details = yield get_app_details(pkginfo.application_name,
+                                          pkginfo.package_name);
+        } catch (Error e) {
+          return false;
+        }
+        if (details != null) {
+          version = details.version;
+          screenshot = details.screenshot;
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+
+  private class ApplicationsSearch : Unity.ScopeSearchBase
+  {
+    private ApplicationsScope scope;
+
+    public ApplicationsSearch (ApplicationsScope scope, Unity.SearchContext search_context)
+    {
+      this.scope = scope;
+      set_search_context (search_context);
+    }
+
+    public override void run ()
+    {
+      var ml = new MainLoop ();
+      run_async (() => { ml.quit (); });
+      ml.run ();
+    }
+
+    public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
+    {
+      dispatch_search.begin (
+        () => {
+          async_callback (this);
+        });
+    }
+
+    private async void dispatch_search ()
+    {
+      var context = this.search_context;
+
+      if (scope.popularities_dirty)
+      {
+        scope.popularities_dirty = false;
+        // we're not passing the cancellable, cause cancelling this search
+        // shouldn't cancel getting most popular apps
+        yield scope.update_popularities ();
+        if (context.cancellable.is_cancelled ()) return;
+      }
+
+      if (context.search_type == SearchType.DEFAULT)
+        yield search_default ();
+      else
+        yield search_global ();
+    }
+
+    private bool local_apps_active ()
+    {
+      var filter = search_context.filter_state.get_filter_by_id ("unity-sources") as Unity.OptionsFilter;
+      if (filter.filtering)
+      {
+        var option = filter.get_option ("local");
+        return option == null || option.active;
+      }
+      return true;
+    }
+
+    private bool usc_apps_active ()
+    {
+      var filter = search_context.filter_state.get_filter_by_id ("unity-sources") as Unity.OptionsFilter;
+      if (filter.filtering)
+      {
+        var option = filter.get_option ("usc");
+        return option == null || option.active;
+      }
+      return true;
+    }
+
     /* Returns TRUE if application is NOT installed */
     public bool filter_cb (Unity.Package.PackageInfo pkginfo)
     {
@@ -523,41 +871,33 @@
       return app == null;
     }
 
-    private bool is_phablet_ui (DeprecatedScopeSearch search)
+    private bool is_phablet_ui ()
     {
-      // XXX: this will need changing when the hint is finalised.
-      unowned Variant? v = search.hints["form-factor"];
-      if (v != null)
-      {
-        string form_factor = v.get_string();
-        return form_factor == "phone" || form_factor == "tablet";
-      }
-      return false;
+      var form_factor = search_context.search_metadata.form_factor;
+
+      return form_factor == "phone" || form_factor == "tablet";
     }
 
-    private async void update_scope_search (DeprecatedScopeSearch search,
-                                            GLib.Cancellable cancellable)
+    private async void search_default ()
     {
-      var model = search.results_model;
+      var context = this.search_context;
+      var result_set = context.result_set;
       /* We'll clear the model once we finish waiting for the dbus-call
        * to finish, to prevent flicker. */
 
-      var search_string = search.search_string.strip ();
+      var search_string = context.search_query;
       debug ("Searching for: %s", search_string);
 
-      var type_filter = search.get_filter ("type") as OptionsFilter;
+      var type_filter = context.filter_state.get_filter_by_id ("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);
-      bool running_on_phablet = is_phablet_ui (search);
+      bool running_on_phablet = is_phablet_ui ();
 
       Timer timer = new Timer ();
 
-      var transaction = new Dee.Transaction (model);
-      transaction.clear ();
-
       /* Even though the Installed apps search is super fast, we wait here
        * for the Most Popular search to finish, because otherwise we'll update
        * the Installed category too soon and this will cause flicker
@@ -565,16 +905,16 @@
 
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
-      var appresults = appsearcher.search (pkg_search_string, 0,
-                                           Unity.Package.SearchType.PREFIX,
-                                           has_search ?
-                                              Unity.Package.Sort.BY_RELEVANCY :
-                                              Unity.Package.Sort.BY_NAME);
-      if (local_apps_active (search))
+      var appresults = scope.appsearcher.search (
+        pkg_search_string, 0, Unity.Package.SearchType.PREFIX,
+        has_search ?
+          Unity.Package.Sort.BY_RELEVANCY :
+          Unity.Package.Sort.BY_NAME);
+      if (local_apps_active ())
       {
         if (has_search) resort_pkg_search_results (appresults);
         add_pkg_search_result (appresults, installed_uris, available_uris,
-                               transaction, Category.INSTALLED,
+                               result_set, Category.INSTALLED,
                                0, running_on_phablet);
       }
 
@@ -582,7 +922,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 (search) && display_recent_apps)
+      if (local_apps_active () && scope.display_recent_apps)
       {
         try
         {
@@ -592,15 +932,16 @@
            * the search query */
           var zg_search_string = XapianUtils.prepare_zg_search_string ("", type_filter);
 
-          var results = yield zg_index.search (zg_search_string,
-                                               new Zeitgeist.TimeRange.anytime(),
-                                               zg_templates,
-                                               0,
-                                               20,
-                                               Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
-                                               cancellable);
+          var results = yield scope.zg_index.search (
+            zg_search_string,
+            new Zeitgeist.TimeRange.anytime (),
+            scope.zg_templates,
+            0,
+            20,
+            Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
+            context.cancellable.get_gcancellable ());
 
-          append_events_with_category (results, transaction, Category.RECENT,
+          append_events_with_category (results, result_set, Category.RECENT,
                                        false, 6, installed_uris);
 
           timer.stop ();
@@ -616,36 +957,21 @@
         }
       }
 
-      // FIXME: use the new API and ResultSet.flush () instead
-      try
-      {
-        transaction.commit ();
-      }
-      catch (Error err)
-      {
-        warning ("Unable to commit transaction: %s", err.message);
-      }
-
-      // 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 ();
+      result_set.flush ();
+
+      scope.purchase_info = new PurchaseInfoHelper ();
 
       /* If we don't have a search we display 6 random apps */
-      if (usc_apps_active (search) && display_available_apps && pkgsearcher != null)
+      if (usc_apps_active () && scope.display_available_apps && scope.pkgsearcher != null)
       {
         if (has_search)
         {
           timer.start ();
-          var pkgresults = pkgsearcher.search (pkg_search_string, 50,
-                                               Unity.Package.SearchType.PREFIX,
-                                               Unity.Package.Sort.BY_RELEVANCY);
+          var pkgresults = scope.pkgsearcher.search (
+            pkg_search_string, 50, Unity.Package.SearchType.PREFIX,
+            Unity.Package.Sort.BY_RELEVANCY);
           add_pkg_search_result (pkgresults, installed_uris, available_uris,
-                                 model, Category.AVAILABLE,
+                                 result_set, Category.AVAILABLE,
                                  0, running_on_phablet);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms for query: %s",
@@ -656,9 +982,9 @@
           timer.start ();
           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);
-          add_pkg_search_result (pkgresults, installed_uris, available_uris, model, Category.AVAILABLE, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, running_on_phablet);
+          var pkgresults = scope.pkgsearcher.get_apps (filter_query, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, filter_cb);
+          scope.purchase_info.from_pkgresults (pkgresults);
+          add_pkg_search_result (pkgresults, installed_uris, available_uris, result_set, Category.AVAILABLE, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, running_on_phablet);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms",
                  pkgresults.num_hits, timer.elapsed ()*1000);
@@ -672,20 +998,20 @@
           {
             Set<string> duplicates_lookup = new HashSet<string> ();
 
-            if (sc_data_provider == null)
-              sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
-
-            var whats_new = sc_data_provider.get_items_for_category ("unity-whats-new");
-            var query = purchase_info.create_pkgsearch_query (whats_new);
-            var tmpresults = pkgsearcher.get_by_exact_names (query);
-            purchase_info.from_pkgresults (tmpresults);
-            hits = add_sc_category_results (whats_new, model, Category.AVAILABLE, ref duplicates_lookup, MAX_WHATS_NEW_APPS_FOR_EMPTY_QUERY);
-
-            var top_rated = sc_data_provider.get_items_for_category ("unity-top-rated");
-            query = purchase_info.create_pkgsearch_query (top_rated);
-            tmpresults = pkgsearcher.get_by_exact_names (query);
-            purchase_info.from_pkgresults (tmpresults);
-            hits += add_sc_category_results (top_rated, model, Category.AVAILABLE, ref duplicates_lookup, MAX_TOP_RATED_APPS_FOR_EMPTY_QUERY);
+            if (scope.sc_data_provider == null)
+              scope.sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
+
+            var whats_new = yield scope.sc_data_provider.get_items_for_category ("unity-whats-new");
+            var query = scope.purchase_info.create_pkgsearch_query (whats_new);
+            var tmpresults = scope.pkgsearcher.get_by_exact_names (query);
+            scope.purchase_info.from_pkgresults (tmpresults);
+            hits = add_sc_category_results (whats_new, result_set, Category.AVAILABLE, ref duplicates_lookup, MAX_WHATS_NEW_APPS_FOR_EMPTY_QUERY);
+
+            var top_rated = yield scope.sc_data_provider.get_items_for_category ("unity-top-rated");
+            query = scope.purchase_info.create_pkgsearch_query (top_rated);
+            tmpresults = scope.pkgsearcher.get_by_exact_names (query);
+            scope.purchase_info.from_pkgresults (tmpresults);
+            hits += add_sc_category_results (top_rated, result_set, Category.AVAILABLE, ref duplicates_lookup, MAX_TOP_RATED_APPS_FOR_EMPTY_QUERY);
           }
           catch (GLib.Error e)
           {
@@ -698,61 +1024,63 @@
         }
       }
 
+      /* XXX:
       if (model.get_n_rows () == 0)
       {
         search.set_reply_hint ("no-results-hint",
           _("Sorry, there are no applications that match your search."));
       }
+      */
     }
 
-    private async void update_global_search (DeprecatedScopeSearch search,
-                                             GLib.Cancellable cancellable)
+    private async void search_global ()
     {
+      var context = this.search_context;
+      var result_set = context.result_set;
       /*
        * In global search, with a non-empty search string, we collate all
        * hits under one Applications category
        */
-      var search_string = search.search_string.strip ();
+      var search_string = context.search_query;
 
       if (Utils.is_search_empty (search_string))
       {
-        yield update_global_without_search (search, cancellable);
+        yield update_global_without_search ();
         return;
       }
 
-      bool running_on_phablet = is_phablet_ui (search);
-      var model = search.results_model;
-
-      model.clear ();
+      bool running_on_phablet = is_phablet_ui ();
 
       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 (pkg_search_string, 0,
-                                           Unity.Package.SearchType.PREFIX,
-                                           Unity.Package.Sort.BY_RELEVANCY);
+      var appresults = scope.appsearcher.search (
+        pkg_search_string, 0,
+        Unity.Package.SearchType.PREFIX,
+        Unity.Package.Sort.BY_RELEVANCY);
       resort_pkg_search_results (appresults);
-      add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Category.APPLICATIONS, 0, running_on_phablet);
+      add_pkg_search_result (appresults, installed_uris, available_uris,
+                             result_set, Category.APPLICATIONS, 0,
+                             running_on_phablet);
 
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
     }
 
-    private async void update_global_without_search (DeprecatedScopeSearch search,
-                                                     GLib.Cancellable cancellable)
+    private async void update_global_without_search ()
     {
       /*
        * In global search, with an empty search string, we show just Recent Apps
        * Excluding apps with icons in the launcher (be they running or faves)
        */
-      var model = search.results_model;
+      var context = this.search_context;
+      var result_set = context.result_set;
 
       Timer timer = new Timer ();
 
-      if (local_apps_active (search) && display_recent_apps)
+      if (local_apps_active () && scope.display_recent_apps)
       {
         try
         {
@@ -760,16 +1088,16 @@
                                                                        null);
 
           var time_range = new Zeitgeist.TimeRange.anytime ();
-          var results = yield log.find_events (time_range,
-                                               zg_templates,
-                                               Zeitgeist.StorageState.ANY,
-                                               40,
-                                               Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
-                                               cancellable);
+          var results = yield scope.log.find_events (
+            time_range,
+            scope.zg_templates,
+            Zeitgeist.StorageState.ANY,
+            40,
+            Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
+            context.cancellable.get_gcancellable ());
 
-          model.clear ();
-          append_events_with_category (results, model, Category.RECENT_APPS,
-                                       false);
+          append_events_with_category (results, result_set,
+                                       Category.RECENT_APPS, false);
 
           timer.stop ();
           debug ("Entry search found %u/%u Recently Used apps in %fms for query '%s'",
@@ -781,81 +1109,9 @@
           return;
         } catch (GLib.Error e) {
           warning ("Error performing search '%s': %s",
-                   search.search_string, e.message);
-        }
-      }
-    }
-
-    public Icon find_pkg_icon (string? desktop_file, string icon_name)
-    {
-      if (desktop_file != null)
-      {
-        string desktop_id = Path.get_basename (desktop_file);
-        bool installed = AppInfoManager.get_default().lookup (desktop_id) != null;
-
-        /* If the app is already installed we should be able to pull the
-         * icon from the theme */
-        if (installed)
-          return new ThemedIcon (icon_name);
-      }
-
-      /* App is not installed - we need to find the right icon in the bowels
-       * of the software center */
-      if (icon_name.has_prefix ("/"))
-      {
-        return new FileIcon (File.new_for_path (icon_name));
-      }
-      else
-      {
-        Icon icon = file_icon_cache.lookup (icon_name);
-
-        if (icon != null)
-          return icon;
-
-        /* If the icon name contains a . it probably already have a
-         * type postfix - so test icon name directly */
-        string path;
-        if ("." in icon_name)
-        {
-          path = @"$(Config.DATADIR)/app-install/icons/$(icon_name)";
-          if (FileUtils.test (path, FileTest.EXISTS))
-          {
-            icon = new FileIcon (File.new_for_path (path));
-            file_icon_cache.insert (icon_name, icon);
-            return icon;
-          }
-          /* Try also software center cache dir */
-          path = Path.build_filename (Environment.get_user_cache_dir (),
-                                      "software-center",
-                                      "icons",
-                                      icon_name);
-          if (FileUtils.test (path, FileTest.EXISTS))
-          {
-            icon = new FileIcon (File.new_for_path (path));
-            file_icon_cache.insert (icon_name, icon);
-            return icon;
-          }
-        }
-
-        /* Now try appending all the image extensions we know */
-        foreach (var ext in image_extensions)
-        {
-          path = @"$(Config.DATADIR)/app-install/icons/$(icon_name).$(ext)";
-          if (FileUtils.test (path, FileTest.EXISTS))
-          {
-            /* Got it! Cache the icon path and return the icon */
-            icon = new FileIcon (File.new_for_path (path));
-            file_icon_cache.insert (icon_name, icon);
-            return icon;
-          }
-        }
-      }
-
-      /* Cache the fact that we couldn't find this icon */
-      var icon = new ThemedIcon (GENERIC_APP_ICON);
-      file_icon_cache.insert (icon_name, icon);
-
-      return icon;
+                   search_context.search_query, e.message);
+        }
+      }
     }
 
     /*
@@ -877,10 +1133,10 @@
         int delta = (rel_a - rel_b).abs ();
         if (delta < 10)
         {
-          string id_a = sc_mangler.extract_desktop_id (a.desktop_file);
-          string id_b = sc_mangler.extract_desktop_id (b.desktop_file);
-          rel_a = popularity_map["application://" + id_a];
-          rel_b = popularity_map["application://" + id_b];
+          string id_a = scope.sc_mangler.extract_desktop_id (a.desktop_file);
+          string id_b = scope.sc_mangler.extract_desktop_id (b.desktop_file);
+          rel_a = scope.popularity_map["application://" + id_a];
+          rel_b = scope.popularity_map["application://" + id_b];
         }
         return rel_b - rel_a; // we want higher relevancy first
       });
@@ -910,7 +1166,7 @@
       {
         annotated_icon.ribbon = _("Free");
       }
-      if (force_small_icons_for_suggestions || use_small_icon
+      if (scope.force_small_icons_for_suggestions || use_small_icon
           || app_icon.to_string () == GENERIC_APP_ICON)
       {
         annotated_icon.size_hint = IconSizeHint.SMALL;
@@ -923,7 +1179,7 @@
      * Add all results obtained from SoftwareCenterDataProvider
      */
     private uint add_sc_category_results (SoftwareCenterData.AppInfo?[] results,
-                                          Dee.Model model,
+                                          Unity.ResultSet result_set,
                                           Category category,
                                           ref Set<string> duplicates_lookup,
                                           uint max_results)
@@ -936,8 +1192,9 @@
           continue;
 
         string icon_obj;
-        Icon app_icon = find_pkg_icon (app.desktop_file, app.icon);
-        var pinfo = purchase_info.find (app.application_name, app.package_name);
+        Icon app_icon = scope.find_pkg_icon (app.desktop_file, app.icon);
+        var pinfo = scope.purchase_info.find (
+          app.application_name, app.package_name);
         if (pinfo != null)
         {
           // magazines need to use large icons
@@ -954,14 +1211,19 @@
           icon_obj = app_icon.to_string ();
         }
 
-        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,
-                      empty_asv);
+        var result = Unity.ScopeResult ();
+        result.uri = uri;
+        result.icon_hint = icon_obj;
+        result.category = category;
+        result.result_type = pinfo != null && pinfo.paid ?
+          Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT;
+        result.mimetype = "application/x-desktop";
+        result.title = app.application_name;
+        result.comment = "";
+        result.dnd_uri = "file://" + app.desktop_file;
+        result.metadata = new HashTable<string,Variant> (str_hash, str_equal);
+
+        result_set.add_result (result);
         duplicates_lookup.add (uri);
         i++;
         if (i == max_results)
@@ -973,7 +1235,7 @@
     private void add_pkg_search_result (Unity.Package.SearchResult results,
                                         Set<string> installed_uris,
                                         Set<string> available_uris,
-                                        Dee.Model model,
+                                        Unity.ResultSet result_set,
                                         Category category,
                                         uint max_add,
                                         bool running_on_phablet)
@@ -986,8 +1248,8 @@
         if (pkginfo.desktop_file == null)
           continue;
 
-        string desktop_id = sc_mangler.extract_desktop_id (pkginfo.desktop_file,
-                                                category == Category.AVAILABLE);
+        string desktop_id = scope.sc_mangler.extract_desktop_id (
+          pkginfo.desktop_file, category == Category.AVAILABLE);
         string full_path;
 
         AppInfo? app = appmanager.lookup (desktop_id);
@@ -1026,25 +1288,34 @@
           continue;
 
         /* Extract basic metadata and register de-dupe keys */
-        string display_name;
-        string comment;
+        var res = Unity.ScopeResult();
+        res.uri = uri;
+        res.category = category;
+        res.result_type = (category != Category.AVAILABLE &&
+                           !results.fuzzy_search) ?
+          Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT;
+        res.mimetype = "application/x-desktop";
+        res.dnd_uri = full_path != null ? "file://" + full_path : "";
+        res.metadata = new HashTable<string, Variant> (str_hash, str_equal);
         switch (category)
         {
           case Category.INSTALLED:
           case Category.APPLICATIONS:
             installed_uris.add (uri);
-            display_name = app.get_display_name ();
-            comment = sanitize_binary_name (app.get_executable ());
+            res.title =  app.get_display_name ();
+            res.comment = sanitize_binary_name (app.get_executable ());
             break;
           case Category.AVAILABLE:
             available_uris.add (uri);
-            display_name = pkginfo.application_name;
-            comment = "";
+            res.title = pkginfo.application_name;
+            res.comment = "";
             break;
           default:
             warning (@"Illegal category for package search $(category)");
             continue;
         }
+        if (res.title == null) res.title = "";
+        if (res.comment == null) res.comment = "";
 
         /* We can only chuck out NoDisplay and OnlyShowIn app infos after
          * we have registered a de-dupe key for them - which is done in the
@@ -1052,8 +1323,7 @@
         if (app != null && !app.should_show ())
           continue;
 
-        Icon icon = find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
-        string icon_str;
+        Icon icon = scope.find_pkg_icon (pkginfo.desktop_file, pkginfo.icon);
         if (category == Category.AVAILABLE)
         {
           /* If we have an available item, which is not a dupe, but is
@@ -1067,30 +1337,21 @@
            * use the 'unity-install://pkgname/Full App Name' URI scheme,
            * but only use that after we've de-duped the results.
            * But only change the URI *after* we've de-duped the results! */
-          uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
+          res.uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
           available_uris.add (uri);
 
           // magazines need to use large icons
           bool use_small_icon = pkginfo.desktop_file.has_suffix (".desktop");
-          icon_str = get_annotated_icon (icon, pkginfo.price,
-                                         !pkginfo.needs_purchase,
-                                         use_small_icon);
+          res.icon_hint = get_annotated_icon (icon, pkginfo.price,
+                                              !pkginfo.needs_purchase,
+                                              use_small_icon);
         }
         else
         {
-          icon_str = icon.to_string ();
+          res.icon_hint = icon.to_string ();
         }
 
-        var result_type = (category != Category.AVAILABLE && !results.fuzzy_search) ?
-          Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT;
-        model.append (uri, icon_str,
-                      category,
-                      result_type,
-                      "application/x-desktop",
-                      display_name != null ? display_name : "",
-                      comment != null ? comment : "",
-                      full_path != null ? "file://" + full_path : "",
-                      empty_asv);
+        result_set.add_result (res);
 
         /* Stop if we added the number of items requested */
         n_added++;
@@ -1099,329 +1360,131 @@
       }
     }
 
-    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});
-    }
-
-    private async void call_remove_packages (string package_name, out string tid) throws IOError
-    {
-      tid = yield aptdclient.remove_packages ({package_name});
-    }
-
-    /**
-     * Handler for free apps installation.
-     * Triggers package installation via apt-daemon DBus service
-     */
-    private Unity.ActivationResponse app_preview_install (string uri)
-    {
-      if (uri.has_prefix ("unity-install://"))
-      {
-        string app = uri.substring (16); // trim "unity-install://"
-        string[] parts = app.split ("/");
-
-        if (parts.length > 1)
-        {
-          string pkgname = parts[0];
-          string appname = parts[1];
-          try
-          {
-            aptdclient.connect_to_aptd ();
-          }
-          catch (IOError e)
-          {
-            warning ("Failed to connect to aptd: '%s'", e.message);
-            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-          }
-          call_install_packages.begin (pkgname, (obj, res) =>
-          {
-            try {
-              string tid;
-              call_install_packages.end (res, out tid);
-              debug ("transaction started: %s, pkg: %s\n", tid, pkgname);
-              aptd_transaction = new AptdTransactionProxy ();
-              aptd_transaction.connect_to_aptd (tid);
-              aptd_transaction.simulate ();
-              aptd_transaction.run ();
-
-              launcherservice.connect_to_launcher ();
-              string desktop_file = preview_installable_desktop_file;
-              Icon icon = find_pkg_icon (null, preview_installable_icon_file);
-              launcherservice.add_launcher_item_from_position.begin (appname, icon.to_string (), 0, 0, 32, desktop_file, tid);
-            }
-            catch (IOError e)
-            {
-              warning ("Package '%s' installation failed: %s", pkgname, e.message);
-            }
-          });
-        }
-        else
-        {
-          warning ("Bad install uri: '%s'", uri);
-        }
-      }
-      else
-      {
-        warning ("Can't handle '%s' in app_preview_install handler", uri);
-        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-      }
-      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-    }
-
-    private Unity.ActivationResponse start_software_center (string uri)
-    {
-      unowned string pkg = uri.offset (16); // strip off "unity-install://" prefix
-      debug ("Installing: %s", pkg);
-
-      var args = new string[2];
-      args[0] = "software-center";
-      args[1] = pkg;
-
-      try
-      {
-        Process.spawn_async (GLib.Environment.get_home_dir (), args, null, SpawnFlags.SEARCH_PATH, null, null);
-      }
-      catch (SpawnError e)
-      {
-        warning ("Failed to spawn software-center for uri '%s': %s", uri, e.message);
-        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-      }
-
-      return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-    }
-
-    private Unity.ActivationResponse app_preview_website (string uri)
-    {
-      try
-      {
-        AppInfo.launch_default_for_uri (preview_developer_website, null);
-        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-      }
-      catch (Error e)
-      {
-        warning ("Failed to launch a web browser for uri '%s': '%s'", uri, e.message);
-      }
-      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-    }
-
-    private Unity.ActivationResponse app_preview_uninstall (string uri)
-    {
-      if (uri.has_prefix ("application://"))
-      {
-        string desktopfile = uri.substring (14); // trim "application://"
-
-        // de-mangle desktop file names back to what S-C expects
-        if (sc_mangler.contains (desktopfile))
-        {
-          desktopfile = sc_mangler.get (desktopfile);
-        }
-
-        var pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
-
-        if (pkginfo != null && pkginfo.package_name != null)
-        {
-          try
-          {
-            aptdclient.connect_to_aptd ();
-          }
-          catch (IOError e)
-          {
-            warning ("Failed to connect to aptd: '%s'", e.message);
-            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-          }
-
-          call_remove_packages.begin (pkginfo.package_name, (obj, res) =>
-          {
-            try {
-              string tid;
-              call_remove_packages.end (res, out tid);
-              debug ("transaction started: %s, pkg: %s\n", tid, pkginfo.package_name);
-              aptd_transaction = new AptdTransactionProxy ();
-              aptd_transaction.connect_to_aptd (tid);
-              aptd_transaction.simulate ();
-              aptd_transaction.run ();
-            }
-            catch (IOError e)
-            {
-              warning (@"Package '$(pkginfo.package_name)' removal failed: $(e.message)");
-            }
-          });
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-        }
-        else
-        {
-          warning (@"Cannot find package info for $uri");
-        }
-      }
-      warning (@"Can't handle '%s' in app_preview_uninstall handler", uri);
-      return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-    }
-
-    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);
-      }
+    /* 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_category (Zeitgeist.ResultSet events,
+                                             Unity.ResultSet result_set,
+                                             uint category_id,
+                                             bool include_favorites,
+                                             int max_results = int.MAX,
+                                             Set<string>? allowed_uris = null)
+    {
+      int num_results = 0;
+      foreach (var ev in events)
+      {
+        string? app_uri = null;
+        if (ev.num_subjects () > 0)
+          app_uri = ev.get_subject (0).get_uri ();
+
+        if (app_uri == null)
+        {
+          warning ("Unexpected event without subject");
+          continue;
+        }
+
+        /* Assert that we indeed have a known application as actor */
+        string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
+
+        /* Discard Recently Used apps that are in the launcher */
+        if ((category_id == Category.RECENT ||
+             category_id == Category.RECENT_APPS) &&
+            !include_favorites &&
+            (scope.favorite_apps.has_app_id (desktop_id)
+            || scope.app_watcher.has_app_id (desktop_id)))
+          continue;
+
+        var appmanager = AppInfoManager.get_default ();
+        AppInfo? app = appmanager.lookup (desktop_id);
+
+        if (app == null)
+          continue;
+
+        if (!app.should_show ())
+          continue;
+
+        /* HACK! when using the max_results together with allowed_uris,
+         * the limit serves as a truncation point - therefore results which
+         * are not displayed the first time won't be displayed later
+         * (consider results A, B, C - all of them are allowed and we use
+         *  limit 2 - so only A and B is displayed, later we change allowed to
+         *  B and C, so normally we would display both B and C, but that's not
+         *  desired because C wasn't shown in the first place, so we display
+         *  only B) */
+        if (num_results++ >= max_results) break;
+
+        if (allowed_uris != null && !(app_uri in allowed_uris)) continue;
+
+        var result = Unity.ScopeResult ();
+        result.uri = app_uri;
+        result.icon_hint = app.get_icon ().to_string ();
+        result.category = category_id;
+        result.result_type = Unity.ResultType.DEFAULT;
+        result.mimetype = "application/x-desktop";
+        result.title = app.get_display_name ();
+        result.comment = sanitize_binary_name (app.get_executable ());
+        string full_path = appmanager.get_path (desktop_id);
+        result.dnd_uri = full_path != null ? "file://" + full_path : app_uri;
+        result.metadata = new HashTable<string,Variant> (str_hash, str_equal);
+
+        result_set.add_result (result);
+      }
+    }
+  }
+
+  private class ApplicationsResultPreviewer : Unity.ResultPreviewer
+  {
+    private ApplicationsScope scope;
+
+    public ApplicationsResultPreviewer (ApplicationsScope scope, Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      this.scope = scope;
+      set_scope_result (result);
+      set_search_metadata (metadata);
+    }
+
+    public override Unity.AbstractPreview? run ()
+    {
+      var ml = new MainLoop ();
+      Unity.AbstractPreview? preview = null;
+      run_async ((obj, p) =>
+        {
+          preview = p;
+          ml.quit ();
+        });
+      ml.run ();
       return preview;
     }
 
-    private SoftwareCenterData.AppDetailsData get_app_details (string appname, string pkgname) throws Error
+    public override void run_async (Unity.AbstractPreviewCallback callback)
     {
-      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);
+      make_preview.begin ((obj, res) =>
+        {
+          var preview = make_preview.end (res);
+          callback (this, preview);
+        });
     }
 
-    private Unity.Preview make_app_preview (string uri, bool installed)
+    private async Unity.AbstractPreview? make_preview ()
     {
       Unity.ApplicationPreview? preview = null;
       string desktopfile = null;
       string pkgname = "";
       string appname = "";
 
+      var uri = result.uri;
+      bool installed = uri.has_prefix ("application://");
+
       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))
+        if (scope.sc_mangler.contains (desktopfile))
         {
-          desktopfile = sc_mangler.get (desktopfile);
+          desktopfile = scope.sc_mangler.get (desktopfile);
         }
 
-        Unity.Package.PackageInfo pkginfo = pkgsearcher.get_by_desktop_file (desktopfile);
+        var pkginfo = scope.pkgsearcher.get_by_desktop_file (desktopfile);
         if (pkginfo != null)
         {
           appname = pkginfo.application_name;
@@ -1442,14 +1505,14 @@
       if (pkgname != "")
       {
         try {
-          var details = get_app_details (appname, pkgname);
+          var details = yield scope.get_app_details (appname, pkgname);
 
           Icon? icon = null;
           if (installed)
             icon = new GLib.ThemedIcon (details.icon);
           else
           {
-            icon = find_pkg_icon (null, details.icon);
+            icon = scope.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));
@@ -1476,11 +1539,11 @@
           preview = new Unity.ApplicationPreview (details.name, subtitle, details.description, icon, screenshot);
           preview.license = details.license;
 
-          init_ratings_db ();
-          if (ratings != null)
+          scope.init_ratings_db ();
+          if (scope.ratings != null)
           {
             Unity.Ratings.Result result;
-            ratings.query (pkgname, out result);
+            scope.ratings.query (pkgname, out result);
             preview.set_rating (result.average_rating / 5.0f, result.total_rating);
           }
 
@@ -1498,7 +1561,6 @@
                 buy_action.extra_text = details.price;
               }
 
-              buy_action.activated.connect (start_software_center);
               preview.add_action (buy_action);
             }
             else // uninstalled, purchased before
@@ -1508,21 +1570,18 @@
               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);
+                install_action = new Unity.PreviewAction ("install-paid", _("Install"), null);
               }
               preview.add_action (install_action);
             }
 
             if (details.website != null && details.website != "")
             {
-              preview_developer_website = details.website;
+              scope.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);
             }
           }
@@ -1534,13 +1593,12 @@
             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;
+          scope.preview_installable_desktop_file = details.desktop_file;
+          scope.preview_installable_icon_file = details.icon;
         }
         catch (Error e)
         {
@@ -1568,335 +1626,6 @@
       }
       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 {
-            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);
-            }
-          }
-        }
-
-        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);
-      }
-      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
-     */
-    public Unity.ActivationResponse activate (string uri)
-    {
-      string[] args;
-      string exec_or_dir = null;
-      if (uri.has_prefix ("unity-install://") || uri.has_prefix ("scope://"))
-      {
-        var prv = preview (uri);
-        if (prv != null)
-        {
-          return new Unity.ActivationResponse.with_preview (prv);
-        }
-        else
-        {
-          warning ("Failed to generate preview for %s", uri);
-          return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
-        }
-      }
-      else if (uri.has_prefix (UNITY_RUNNER_PREFIX))
-      {
-        string orig;
-        orig = uri.offset (UNITY_RUNNER_PREFIX.length);
-        if (orig.has_prefix("\\\\"))
-          orig = orig.replace ("\\\\","smb://");
-        if (uri_regex != null && uri_regex.match (orig)) {
-          try {
-            /* this code ensures that a file manager will be used
-             * if uri it's a remote location that should be mounted */
-            if (mountable_regex.match (orig)) {
-              var muris = new GLib.List<string>();
-              muris.prepend (orig);
-              var file_manager = AppInfo.get_default_for_type("inode/directory", true);
-              file_manager.launch_uris(muris,null);
-            } else {
-              AppInfo.launch_default_for_uri (orig, null);
-            }
-          } catch (GLib.Error error) {
-            warning ("Failed to launch URI %s", orig);
-            return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-          }
-          return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-
-        } else {
-          exec_or_dir = Utils.subst_tilde (orig);
-          args = exec_or_dir.split (" ", 0);
-          for (int i = 0; i < args.length; i++)
-            args[i] = Utils.subst_tilde (args[i]);
-        }
-        this.runner.add_history (orig);
-      }
-      else
-      {
-        /* Activation of standard application:// uris */
-
-        /* Make sure fresh install learns quickly */
-        if (popularity_map.size <= 5) popularities_dirty = true;
-
-        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-      }
-
-      if ((exec_or_dir != null) && FileUtils.test (exec_or_dir, FileTest.IS_DIR))
-      {
-        try {
-          AppInfo.launch_default_for_uri ("file://" + exec_or_dir, null);
-        } catch (GLib.Error err) {
-          warning ("Failed to open current folder '%s' in file manager: %s",
-                   exec_or_dir, err.message);
-          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-        }
-      }
-      else
-      {
-        try {
-          unowned string home_dir = GLib.Environment.get_home_dir ();
-          Process.spawn_async (home_dir, args, null, SpawnFlags.SEARCH_PATH, null, null);
-        } catch (SpawnError e) {
-          warning ("Failed to spawn software-center or direct URI activation '%s': %s",
-                   uri, e.message);
-          return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
-        }
-      }
-
-      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_category (Zeitgeist.ResultSet events,
-                                             Dee.Model results,
-                                             uint category_id,
-                                             bool include_favorites,
-                                             int max_results = int.MAX,
-                                             Set<string>? allowed_uris = null)
-    {
-      int num_results = 0;
-      foreach (var ev in events)
-      {
-        string? app_uri = null;
-        if (ev.num_subjects () > 0)
-          app_uri = ev.get_subject (0).get_uri ();
-
-        if (app_uri == null)
-        {
-          warning ("Unexpected event without subject");
-          continue;
-        }
-
-        /* Assert that we indeed have a known application as actor */
-        string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
-
-        /* Discard Recently Used apps that are in the launcher */
-        if ((category_id == Category.RECENT ||
-             category_id == Category.RECENT_APPS) &&
-            !include_favorites &&
-            (favorite_apps.has_app_id (desktop_id)
-            || app_watcher.has_app_id (desktop_id)))
-          continue;
-
-        var appmanager = AppInfoManager.get_default ();
-        AppInfo? app = appmanager.lookup (desktop_id);
-
-        if (app == null)
-          continue;
-
-        if (!app.should_show ())
-          continue;
-
-        /* HACK! when using the max_results together with allowed_uris,
-         * the limit serves as a truncation point - therefore results which
-         * are not displayed the first time won't be displayed later
-         * (consider results A, B, C - all of them are allowed and we use
-         *  limit 2 - so only A and B is displayed, later we change allowed to
-         *  B and C, so normally we would display both B and C, but that's not
-         *  desired because C wasn't shown in the first place, so we display
-         *  only B) */
-        if (num_results++ >= max_results) break;
-
-        if (allowed_uris != null && !(app_uri in allowed_uris)) continue;
-
-        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, Unity.ResultType.DEFAULT,
-                        "application/x-desktop", app.get_display_name (),
-                        sanitize_binary_name (app.get_executable ()),
-                        full_uri,
-                        empty_asv);
-      }
-    }
-
-  } /* END: class Daemon */
+  }
 
 } /* namespace */

=== modified file 'src/main.vala'
--- src/main.vala	2013-07-01 11:20:42 +0000
+++ src/main.vala	2013-08-06 08:19:29 +0000
@@ -1,5 +1,6 @@
+/* -*- mode: vala; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -20,90 +21,25 @@
 using GLib;
 using Config;
 
-namespace Unity.ApplicationsLens {
-
-  const string DBUS_NAME = "com.canonical.Unity.Scope.Applications";
-  static Application? app = null;
-  static Daemon? daemon = null;
-
-  /* Check if a given well known DBus is owned.
-   * WARNING: This does sync IO!  */
-  public static bool dbus_name_has_owner (string name)
-  {
-    try {
-      bool has_owner;
-      DBusConnection bus = Bus.get_sync (BusType.SESSION);
-      Variant result = bus.call_sync ("org.freedesktop.DBus",
-                                      "/org/freedesktop/dbus",
-                                      "org.freedesktop.DBus",
-                                      "NameHasOwner",
-                                      new Variant ("(s)", name),
-                                      new VariantType ("(b)"),
-                                      DBusCallFlags.NO_AUTO_START,
-                                      -1);
-      result.get ("(b)", out has_owner);
-      return has_owner;
-    } catch (Error e) {
-      warning ("Unable to decide whether '%s' is running: %s", name, e.message);
-    }
-    
-    return false;
-  }
-
-  public static int main (string[] args)
-  {
-    /* Sort up locale to get translations but also sorting and
-     * punctuation right */
-    GLib.Intl.textdomain (Config.PACKAGE);
-    GLib.Intl.bindtextdomain (Config.PACKAGE, Config.LOCALEDIR);
-    GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
-    GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
-  
-    /* Make sure the desktop appinfos are picked up correctly */
-    DesktopAppInfo.set_desktop_env ("Unity");
-    
-    /* Sub processes inheriting our environment may be confused if they
-     * see a starter bus set */
-    Environment.unset_variable ("DBUS_STARTER_ADDRESS");
-    Environment.unset_variable ("DBUS_STARTER_BUS_TYPE");
-    
-    /* Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=640714 
-     * GApplication.register() call owns our DBus name in a sync manner
-     * 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 (DBUS_NAME))
-      {
-        print ("Another instance of the Unity Applications Daemon " +
-               "already appears to be running.\nBailing out.\n");
-        return 2;
-      }
-    
-    /* Now register our DBus objects *before* acquiring the name!
-     * See above for reasons */
-    daemon = new Daemon ();
-    
-    /* Use GApplication directly for single instance app functionality */
-    app = new Application (DBUS_NAME, ApplicationFlags.IS_SERVICE);
-    try {
-      app.register ();
-    } catch (Error e) {
-      /* FIXME: We get this error if another daemon is already running,
-       * but it uses a generic error so we can't detect this reliably... */
-      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 " +
-               "already appears to be running.\nBailing out.\n");
-        return 2;
-      }
-    
-    /* Hold()ing the app makes sure the GApplication doesn't exit */
-    app.hold();
-    return app.run ();
-  }
-  
-} /* namespace */
+public int unity_scope_module_get_version ()
+{
+  return Unity.SCOPE_API_VERSION;
+}
+
+public List<Unity.AbstractScope> unity_scope_module_load_scopes () throws Error
+{
+  /* Sort up locale to get translations but also sorting and
+   * punctuation right */
+  GLib.Intl.bindtextdomain (Config.PACKAGE, Config.LOCALEDIR);
+  GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
+  GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
+
+  var scopes = new List<Unity.AbstractScope> ();
+  var apps_scope = new Unity.ApplicationsLens.ApplicationsScope ();
+  var scopes_scope = new Unity.ApplicationsLens.ScopesScope (apps_scope);
+
+  scopes.append(apps_scope);
+  scopes.append(apps_scope.commands_scope);
+  scopes.append(scopes_scope);
+  return scopes;
+}

=== added file 'src/scopes-scope.vala'
--- src/scopes-scope.vala	1970-01-01 00:00:00 +0000
+++ src/scopes-scope.vala	2013-08-06 08:19:29 +0000
@@ -0,0 +1,510 @@
+/* -*- mode: vala; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by James Henstridge <[e-mail]>
+ *
+ */
+
+namespace Unity.ApplicationsLens {
+  const string GENERIC_SCOPE_ICON = ICON_PATH + "service-generic.svg";
+
+  private class ScopesScope : Unity.AbstractScope
+  {
+    public ApplicationsScope appscope;
+    public Unity.Package.Searcher? searcher;
+    public HashTable<unowned string, unowned string> disabled_scope_ids;
+    public Dee.Model remote_scopes_model;
+    public Dee.Index scopes_index;
+    public Dee.Analyzer analyzer;
+
+    public ScopesScope (ApplicationsScope appscope)
+    {
+      this.appscope = appscope;
+      // Track the remote scopes
+      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);
+
+      build_scope_index.begin ();
+    }
+
+    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 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);
+    }
+
+    private async void build_scope_index ()
+    {
+      try
+      {
+        var scope_registry = yield Unity.Protocol.ScopeRegistry.find_scopes (
+          Config.PKGDATADIR + "/scopes");
+        searcher = new Unity.Package.Searcher.for_scopes (scope_registry);
+      }
+      catch (Error err)
+      {
+        warning ("Unable to find scopes: %s", err.message);
+      }
+    }
+
+    public override string get_group_name ()
+    {
+      return "com.canonical.Unity.Scope.Applications";
+    }
+
+    public override string get_unique_name ()
+    {
+      return "/com/canonical/unity/scope/scopes";
+    }
+
+    public override Unity.FilterSet get_filters ()
+    {
+      var filters = new Unity.FilterSet ();
+
+      /* Type filter */
+      {
+        var filter = new CheckOptionFilter ("type", _("Type"));
+        filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
+
+        filter.add_option ("accessories", _("Accessories"));
+        filter.add_option ("education", _("Education"));
+        filter.add_option ("game", _("Games"));
+        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 ("scopes", _("Search plugins"));
+        filter.add_option ("system", _("System"));
+
+        filters.add (filter);
+      }
+      return filters;
+    }
+
+    public override Unity.CategorySet get_categories ()
+    {
+      Unity.CategorySet categories = new Unity.CategorySet ();
+      File icon_dir = File.new_for_path (ICON_PATH);
+
+      var cat = new Unity.Category ("apps", _("Applications"),
+                                    new FileIcon (icon_dir.get_child ("group-apps.svg")));
+      categories.add (cat);
+
+      cat = new Unity.Category ("recently-used", _("Recently used"),
+                                new FileIcon (icon_dir.get_child ("group-recent.svg")));
+      categories.add (cat);
+
+      cat = new Unity.Category ("recent", _("Recent apps"),
+                                new FileIcon (icon_dir.get_child ("group-apps.svg")));
+      categories.add (cat);
+
+      cat = new Unity.Category ("installed", _("Installed"),
+                                new FileIcon (icon_dir.get_child ("group-installed.svg")));
+      categories.add (cat);
+
+      cat = new Unity.Category ("more", _("More suggestions"),
+                                new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")));
+      categories.add (cat);
+
+      return categories;
+    }
+
+    public override Unity.Schema get_schema ()
+    {
+      var schema = new Unity.Schema ();
+      schema.add_field ("is_scope", "u", Schema.FieldType.OPTIONAL);
+      return schema;
+    }
+
+    public override string normalize_search_query (string search_query)
+    {
+      return search_query.strip ();
+    }
+
+    public override Unity.ScopeSearchBase create_search_for_query (Unity.SearchContext search_context)
+    {
+      return new ScopesSearch (this, search_context);
+    }
+
+    public override Unity.ResultPreviewer create_previewer (Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      return new ScopesResultPreviewer (this, result, metadata);
+    }
+
+    public override Unity.ActivationResponse? activate (Unity.ScopeResult result, Unity.SearchMetadata metadata, string? action_id)
+    {
+      var scope_id = result.uri.substring (8);
+      if (action_id == "enable-scope")
+      {
+        enable_scope (scope_id);
+      }
+      else if (action_id == "disable-scope")
+      {
+        disable_scope (scope_id);
+      }
+      /* Make a preview */
+      var preview = create_previewer (result, metadata).run ();
+      if (preview is Unity.Preview)
+      {
+        return new Unity.ActivationResponse.with_preview (preview as Unity.Preview);
+      }
+      else
+      {
+        warning ("Failed to generate preview for %s", result.uri);
+        return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+      }
+    }
+
+    public static Icon? get_default_icon ()
+    {
+      try
+      {
+        return Icon.new_for_string (GENERIC_SCOPE_ICON);
+      }
+      catch (Error err)
+      {
+        warning ("%s", err.message);
+      }
+      return null;
+    }
+  }
+
+  private class ScopesSearch : Unity.ScopeSearchBase
+  {
+    private ScopesScope scope;
+
+    public ScopesSearch (ScopesScope scope, Unity.SearchContext search_context)
+    {
+      this.scope = scope;
+      this.search_context = search_context;
+    }
+
+    public override void run ()
+    {
+      if (this.scope.searcher == null)
+        return;
+
+      var context = this.search_context;
+      // Don't add results to global searches
+      if (context.search_type == SearchType.GLOBAL)
+        return;
+
+      var filter = context.filter_state.get_filter_by_id ("type") as OptionsFilter;
+      if (filter != null && filter.filtering &&
+          !filter.get_option ("scopes").active)
+        return;
+
+      add_local_results (context.search_query, context.result_set);
+      add_remote_results (context.search_query, context.result_set);
+    }
+
+    private void add_local_results (string search_query, Unity.ResultSet result_set)
+    {
+      bool has_search = !Utils.is_search_empty (search_query);
+      var pkg_search_string = XapianUtils.prepare_pkg_search_string (
+        search_query, null);
+
+      var search_result = this.scope.searcher.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 search_result.results)
+      {
+        /* 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 result = Unity.ScopeResult ();
+        result.uri = @"scope://$(info.desktop_file)";
+        result.category = info.desktop_file in scope.disabled_scope_ids ?
+          Category.AVAILABLE : Category.INSTALLED;
+        result.result_type = Unity.ResultType.DEFAULT;
+        result.mimetype = "application/x-unity-scope";
+        result.title = info.application_name;
+        if (result.title == null)
+          result.title = "";
+        result.comment = "";
+        result.dnd_uri = "";
+        result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
+        result.metadata["is_scope"] = new Variant.uint32 (1);
+
+        var icon_hint = info.icon;
+        try
+        {
+          Icon base_icon = icon_hint == null || icon_hint == "" ?
+            ScopesScope.get_default_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 = "";
+        }
+        result.icon_hint = icon_hint;
+
+        result_set.add_result (result);
+      }
+    }
+
+    private void add_remote_results (string search_query, Unity.ResultSet result_set)
+    {
+      var results = Utils.search_index (
+        scope.scopes_index, scope.analyzer, search_query);
+      foreach (var iter in results)
+      {
+        var result = Unity.ScopeResult ();
+        unowned string scope_id =
+          scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.SCOPE_ID);
+        result.uri = @"scope://$(scope_id)";
+        result.category = scope_id in scope.disabled_scope_ids ?
+          Category.AVAILABLE : Category.INSTALLED;
+        result.result_type = Unity.ResultType.DEFAULT;
+        result.mimetype = "application/x-unity-scope";
+        result.title =
+          scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.NAME);
+        result.comment = "";
+        result.dnd_uri = "";
+        result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
+        result.metadata["is_scope"] = new Variant.uint32 (1);
+
+        var icon_hint =
+          scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.ICON_HINT);
+        try
+        {
+          Icon base_icon = icon_hint == null || icon_hint == "" ?
+            ScopesScope.get_default_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 = "";
+        }
+        result.icon_hint = icon_hint;
+
+        result_set.add_result (result);
+      }
+    }
+  }
+
+  private class ScopesResultPreviewer : Unity.ResultPreviewer
+  {
+    private ScopesScope scope;
+
+    public ScopesResultPreviewer (ScopesScope scope, Unity.ScopeResult result, Unity.SearchMetadata metadata)
+    {
+      this.scope = scope;
+      set_scope_result (result);
+      set_search_metadata (metadata);
+    }
+
+    public override Unity.AbstractPreview? run ()
+    {
+      var ml = new MainLoop ();
+      Unity.AbstractPreview? preview = null;
+      run_async ((obj, p) =>
+        {
+          preview = p;
+          ml.quit ();
+        });
+      ml.run ();
+      return preview;
+    }
+
+    public override void run_async (Unity.AbstractPreviewCallback callback)
+    {
+      make_preview.begin ((obj, res) =>
+        {
+          var preview = make_preview.end (res);
+          callback (this, preview);
+        });
+    }
+
+    private async Unity.AbstractPreview? make_preview ()
+    {
+      Unity.ApplicationPreview? preview = null;
+      var scope_id = result.uri.substring (8);
+      bool scope_disabled = scope_id in scope.disabled_scope_ids;
+
+      // figure out if the scope is remote
+      bool is_remote_scope = false;
+      var info = scope.searcher.get_by_desktop_file (scope_id);
+
+      Dee.ModelIter found_iter = null;
+      if (info == null)
+      {
+        var iter = scope.remote_scopes_model.get_first_iter ();
+        var end_iter = scope.remote_scopes_model.get_last_iter ();
+        while (iter != end_iter)
+        {
+          if (scope.remote_scopes_model.get_string (iter, 0) == scope_id)
+          {
+            is_remote_scope = true;
+            found_iter = iter;
+            break;
+          }
+          iter = scope.remote_scopes_model.next (iter);
+        }
+      }
+
+      if (is_remote_scope)
+      {
+        var name = scope.remote_scopes_model.get_string (found_iter, 1);
+        if (name == null || name == "")
+          name = scope.remote_scopes_model.get_string (found_iter, 0);
+        var description = scope.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 = scope.remote_scopes_model.get_string (found_iter, 3);
+        var screenshot_url = scope.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 = ScopesScope.get_default_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 = ScopesScope.get_default_icon ();
+
+        string version, screenshot_uri;
+        if (yield scope.appscope.get_version_and_screenshot (
+              scope_id, out version, out screenshot_uri))
+        {
+          if (version != "")
+            subtitle = _("Version %s").printf (version);
+          if (screenshot_uri != null)
+          {
+            File scr_file = File.new_for_uri (screenshot_uri);
+            screenshot = new FileIcon (scr_file);
+          }
+        }
+
+        preview = new Unity.ApplicationPreview (name,
+                                                subtitle,
+                                                description,
+                                                icon,
+                                                screenshot);
+      }
+      if (preview != null && scope_id != "home.scope" &&
+          scope_id != "applications/applications.scope" &&
+          scope_id != "applications/scopes.scope")
+      {
+        PreviewAction action;
+        preview.set_rating(-1.0f, 0);
+        if (scope_disabled)
+        {
+          action = new Unity.PreviewAction ("enable-scope", _("Enable"), null);
+        }
+        else
+        {
+          action = new Unity.PreviewAction ("disable-scope", _("Disable"), null);
+        }
+        preview.add_action (action);
+      }
+      return preview;
+    }
+  }
+}

=== modified file 'src/software-center-data-cache.vala'
--- src/software-center-data-cache.vala	2012-10-04 16:15:09 +0000
+++ src/software-center-data-cache.vala	2013-08-06 08:19:29 +0000
@@ -43,7 +43,7 @@
     return false;
   }
 
-  public override SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
+  public override async SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
   {
     int64 last_update = 0;
     if (category_items_last_update.contains (category_name))
@@ -55,7 +55,7 @@
     {
       category_items_last_update[category_name] = last_update;
 
-      var data = base.get_items_for_category (category_name);
+      var data = yield base.get_items_for_category (category_name);
       var results = new Gee.ArrayList<SoftwareCenterData.AppInfo?> ();
       foreach (var item in data)
       {
@@ -68,4 +68,4 @@
   }
 }
 
-}
\ No newline at end of file
+}

=== modified file 'src/software-center-data-provider.vala'
--- src/software-center-data-provider.vala	2012-10-04 16:15:09 +0000
+++ src/software-center-data-provider.vala	2013-08-06 08:19:29 +0000
@@ -24,10 +24,10 @@
   [DBus (name = "com.ubuntu.SoftwareCenterDataProvider")]
   public interface SoftwareCenterDataProviderService: GLib.Object
   {
-    public abstract HashTable<string, Variant> get_app_details (string appname, string pkgname) throws Error;
-    public abstract string[] get_available_categories () throws Error;
-    public abstract string[] get_available_subcategories () throws Error;
-    public abstract SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error;
+    public abstract async HashTable<string, Variant> get_app_details (string appname, string pkgname) throws Error;
+    public abstract async string[] get_available_categories () throws Error;
+    public abstract async string[] get_available_subcategories () throws Error;
+    public abstract async SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error;
   }
 
   public class SoftwareCenterDataProviderProxy: GLib.Object
@@ -37,9 +37,9 @@
       Bus.watch_name (BusType.SESSION, SCDP_DBUS_NAME, BusNameWatcherFlags.NONE, null, on_sc_dbus_name_vanished);
     }
 
-    public void connect_to () throws Error
+    private async void connect_to () throws Error
     {
-      _service = Bus.get_proxy_sync (BusType.SESSION, SCDP_DBUS_NAME, SCDP_DBUS_PATH);
+      _service = yield Bus.get_proxy (BusType.SESSION, SCDP_DBUS_NAME, SCDP_DBUS_PATH);
     }
 
     private void on_sc_dbus_name_vanished (DBusConnection conn, string name)
@@ -47,22 +47,22 @@
       _service = null;
     }
 
-    public SoftwareCenterData.AppDetailsData get_app_details (string appname, string pkgname) throws Error
+    public async SoftwareCenterData.AppDetailsData get_app_details (string appname, string pkgname) throws Error
     {
       if (_service == null)
-        connect_to ();
+        yield connect_to ();
 
-      HashTable<string, Variant> data = _service.get_app_details (appname, pkgname);
+      HashTable<string, Variant> data = yield _service.get_app_details (appname, pkgname);
       var details = new SoftwareCenterData.AppDetailsData (data);
       return details;
     }
 
-    public virtual SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
+    public virtual async SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
     {
       if (_service == null)
-        connect_to ();
+        yield connect_to ();
 
-      SoftwareCenterData.AppInfo?[] data = _service.get_items_for_category (category_name);
+      SoftwareCenterData.AppInfo?[] data = yield _service.get_items_for_category (category_name);
       return data;
     }
 

=== modified file 'tests/unit/software-center-data-provider-mock.vala'
--- tests/unit/software-center-data-provider-mock.vala	2012-10-09 16:38:12 +0000
+++ tests/unit/software-center-data-provider-mock.vala	2013-08-06 08:19:29 +0000
@@ -45,9 +45,9 @@
       data[category].clear ();
     }
 
-    public virtual SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
+    public virtual async SoftwareCenterData.AppInfo?[] get_items_for_category (string category_name) throws Error
     {
       return data[category_name].to_array ();
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'tests/unit/test-software-center-data-cache.vala'
--- tests/unit/test-software-center-data-cache.vala	2012-10-08 15:48:54 +0000
+++ tests/unit/test-software-center-data-cache.vala	2013-08-06 08:19:29 +0000
@@ -40,6 +40,37 @@
     return false;
   }
 
+  internal static bool run_with_timeout (MainLoop ml, uint timeout_ms = 5000)
+  {
+    bool timeout_reached = false;
+    var t_id = Timeout.add (timeout_ms, () =>
+    {
+      timeout_reached = true;
+      debug ("Timeout reached");
+      ml.quit ();
+      return false;
+    });
+
+    ml.run ();
+
+    if (!timeout_reached) Source.remove (t_id);
+
+    return !timeout_reached;
+  }
+
+  internal static SoftwareCenterData.AppInfo?[] get_items (SoftwareCenterDataCache cache, string category)
+  {
+    var ml = new MainLoop ();
+    SoftwareCenterData.AppInfo?[] items = null;
+    cache.get_items_for_category.begin (category, (obj, result) =>
+      {
+        items = cache.get_items_for_category.end (result);
+        ml.quit ();
+      });
+    assert (run_with_timeout (ml));
+    return items;
+  }
+
   internal static void test_category_cache ()
   {
     var cache = new SoftwareCenterDataCache (1); // lifetime of cache items = 1s
@@ -48,7 +79,7 @@
     cache.mock_add (TOP_RATED, "Evince", "evince");
 
     // at this point items are fetched by cache and kept for 1s
-    var items = cache.get_items_for_category (TOP_RATED);
+    var items = get_items (cache, TOP_RATED);
     assert (items.length == 1);
 
     // remove & add new items to the mock, but get_items_for_category should still
@@ -57,7 +88,7 @@
     cache.mock_add (TOP_RATED, "Blender", "blender");
     cache.mock_add (TOP_RATED, "Firefox", "firefox");
     cache.mock_add (TOP_RATED, "Thunderbird", "thunderbird");
-    var items_2 = cache.get_items_for_category (TOP_RATED);
+    var items_2 = get_items (cache, TOP_RATED);
     assert (items_2.length == 1);
 
     assert (has_app (items_2, "Evince", "evince") == true);
@@ -66,10 +97,10 @@
     GLib.Thread.usleep (2 * 1000000);
 
     // cache will fetch new items now.
-    var items_3 = cache.get_items_for_category (TOP_RATED);
+    var items_3 = get_items (cache, TOP_RATED);
     assert (items_3.length == 3);
     assert (has_app (items_3, "Blender", "blender") == true);
     assert (has_app (items_3, "Firefox", "firefox") == true);
     assert (has_app (items_3, "Thunderbird", "thunderbird") == true);
   }
-}
\ No newline at end of file
+}