Merge lp:~unity-team/libunity/fix-latest-glib-unity7 into lp:libunity

[Didier Roche-Tolomelli]

Fix tests failing due to latest glib

Fix tests failing due to latest glib (see https://git.gnome.org/browse/glib/commit/?id=f641699299ed2713cf247e3465bb1a21612b36f7)

[lp:~unity-team/libunity/fix-latest-glib-unity7]

345. By Didier Roche-Tolomelli on 2013-03-25

fix typo

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2012-06-08 08:53:07 +0000
+++ .bzrignore	2013-03-25 11:25:26 +0000
@@ -18,50 +18,47 @@
 missing
 py-compile
 stamp-h1
-unity.pc
+*.pc
+*.stamp
+m4/intltool.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
 bindings/Makefile
 bindings/Makefile.in
 bindings/python/Makefile
 bindings/python/Makefile.in
 data/Makefile
 data/Makefile.in
+data/com.canonical.Unity.Lenses.gschema.valid
+data/com.canonical.Unity.Lenses.gschema.xml
+data/com.canonical.Unity.Lenses.gschema.xml.in
+data/gschemas.compiled
 doc/Makefile
 doc/Makefile.in
 doc/reference/Makefile
 doc/reference/Makefile.in
+doc/reference/devhelp/
+doc/reference/doctool/
+doc/reference/gtkdoc/
+doc/reference/valadoc/
 examples/Makefile
 examples/Makefile.in
-src/.deps/
-src/.libs/
+extras/*.gir
+extras/*.typelib
+*/.deps/
+*/.libs/
 src/Makefile
 src/Makefile.in
-src/Unity-4.0.gir
-src/Unity-4.0.typelib
+src/*.gir
+src/*.typelib
 src/libunity.la
-src/libunity_la-unity-appinfo-manager.lo
-src/libunity_la-unity-inspector.lo
-src/libunity_la-unity-io.lo
-src/libunity_la-unity-launcher.lo
-src/libunity_la-unity-lens-category.lo
-src/libunity_la-unity-lens-filters.lo
-src/libunity_la-unity-lens-private.lo
-src/libunity_la-unity-lens.lo
-src/libunity_la-unity-sound-menu-mpris.lo
-src/libunity_la-unity-sound-menu.lo
-src/libunity_la_vala.stamp
-src/unity-appinfo-manager.c
-src/unity-inspector.c
-src/unity-io.c
-src/unity-launcher.c
-src/unity-lens-category.c
-src/unity-lens-filters.c
-src/unity-lens-private.c
-src/unity-lens.c
-src/unity-sound-menu-mpris.c
-src/unity-sound-menu.c
 src/unity.deps
-src/unity.h
-src/unity.vapi
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
 test/Makefile
 test/Makefile.in
 test/test
@@ -71,43 +68,32 @@
 test/vala/.libs/
 test/vala/Makefile
 test/vala/Makefile.in
-test/vala/test-appinfo-manager.c
-test/vala/test-filters.c
-test/vala/test-io.c
-test/vala/test-launcher.c
-test/vala/test-launcher-integration.c
 test/vala/test-lens
-test/vala/test-lens.c
 test/vala/test-mpris-backend
 test/vala/test-mpris-backend-client
-test/vala/test-mpris-backend-client.c
 test/vala/test-mpris-backend-prop-updates
 test/vala/test-mpris-backend-prop-updates-client
-test/vala/test-mpris-backend-prop-updates-client.c
 test/vala/test-mpris-backend-prop-updates-server
-test/vala/test-mpris-backend-prop-updates-server.c
 test/vala/test-mpris-backend-server
-test/vala/test-mpris-backend-server.c
-test/vala/test-previews.c
 test/vala/test-remote-scope
-test/vala/test-remote-scope.c
-test/vala/test-scope-signals.c
 test/vala/test-vala
-test/vala/test-vala.c
 test/vala/test-lens-scope-interactions
 test/vala/test-sound-menu
-test/vala/test_lens_vala.stamp
-test/vala/test_mpris_backend_client_vala.stamp
-test/vala/test_mpris_backend_prop_updates_client_vala.stamp
-test/vala/test_mpris_backend_prop_updates_server_vala.stamp
-test/vala/test_mpris_backend_server_vala.stamp
-test/vala/test_remote_scope_vala.stamp
-test/vala/test_sound_menu_vala.stamp
-test/vala/test_vala_vala.stamp
-src/*.lo
+test/vala/test-blacklist-crash
+test/vala/test-extras
+test/vala/test-launcher-integration
+test/vala/test-scope
+tools/libunity-tool
+*.la
+*.lo
+extras/*.c
+extras/*.h
+extras/*.vapi
+protocol/*.c
+protocol/*.h
+protocol/*.vapi
 src/*.c
-test/test-scope
-src/Unity-5.0.gir
-src/Unity-5.0.typelib
-test/vala/test-place-browser.c
-test/vala/test-place.c
+src/*.h
+src/*.vapi
+tools/*.c
+test/vala/*.c

=== modified file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	2011-02-17 15:38:06 +0000
+++ bindings/python/Makefile.am	2013-03-25 11:25:26 +0000
@@ -1,3 +1,4 @@
+NULL =
 PLATFORM_VERSION = 2.0
 
 pkgpyexecdir = $(pyexecdir)/gi
@@ -6,4 +7,11 @@
 pygioverrides_PYTHON = \
         Unity.py
 
-EXTRA_DIST = Unity.py
+scopesdir = $(datadir)/unity-scopes
+scopes_PYTHON = scope-runner-dbus.py
+
+EXTRA_DIST = \
+	Unity.py \
+	scope-runner-dbus.py \
+	$(NULL)
+

=== modified file 'bindings/python/Unity.py'
--- bindings/python/Unity.py	2011-02-17 15:38:06 +0000
+++ bindings/python/Unity.py	2013-03-25 11:25:26 +0000
@@ -1,17 +1,92 @@
-from ..overrides import override
-from ..importer import modules
+from gi.overrides import override
+from gi.importer import modules
+import threading
 
 Unity = modules['Unity']._introspection_module
 from gi.repository import GLib
 
 __all__ = []
 
-#class Foo(Unity.Foo):
-#
-#    def __init__(self):
-#        Unity.Foo.__init__(self)
-#
-#Foo = override(Foo)
-#__all__.append('Foo')
-
-
+class ScopeSearchBase(Unity.ScopeSearchBase):
+
+    def __init__(self):
+        Unity.ScopeSearchBase.__init__(self)
+
+    def do_run_async(self, callback, callback_data=None):
+        def thread_method():
+            try:
+                self.run()
+            finally:
+                callback(self)
+
+        t = threading.Thread(target=thread_method, name="python-search-thread")
+        t.start()
+
+
+class ResultPreviewer(Unity.ResultPreviewer):
+
+    def __init__(self):
+        Unity.ResultPreviewer.__init__(self)
+
+    def do_run_async(self, callback, callback_data=None):
+        def thread_method():
+            preview = None
+            try:
+                preview = self.run()
+            finally:
+                callback(self, preview)
+
+        t = threading.Thread(target=thread_method, name="python-preview-thread")
+        t.start()
+
+
+class ResultSet(Unity.ResultSet):
+
+    def __init__ (self):
+        Unity.ResultSet.__init__(self)
+
+    def add_result(self, *args, **kwargs):
+        if len(args) > 0:
+            Unity.ResultSet.add_result(self, *args)
+        elif len(kwargs) > 0:
+            uri = None
+            icon = None
+            category = 0
+            result_type = 0
+            mimetype = None
+            title = None
+            comment = None
+            dnd_uri = None
+            metadata = {}
+
+            for col_name, value in kwargs.items():
+                if col_name == "uri": uri = value
+                elif col_name == "icon": icon = value
+                elif col_name == "category": category = value
+                elif col_name == "result_type": result_type = value
+                elif col_name == "mimetype": mimetype = value
+                elif col_name == "title": title = value
+                elif col_name == "comment": comment = value
+                elif col_name == "dnd_uri": dnd_uri = value
+                else:
+                    if isinstance(value, GLib.Variant):
+                        metadata[col_name] = value
+                    elif isinstance(value, str) or isinstance(value, unicode):
+                        metadata[col_name] = GLib.Variant("s", value)
+                    elif isinstance(value, int):
+                        metadata[col_name] = GLib.Variant("i", value)
+
+            result = GLib.Variant("(ssuussssa{sv})", (uri, icon, category,
+                                                      result_type, mimetype,
+                                                      title, comment, dnd_uri,
+                                                      metadata))
+
+            Unity.ResultSet.add_result_from_variant(self, result)
+
+
+ScopeSearchBase = override(ScopeSearchBase)
+__all__.append('ScopeSearchBase')
+ResultPreviewer = override(ResultPreviewer)
+__all__.append('ResultPreviewer')
+ResultSet = override(ResultSet)
+__all__.append('ResultSet')

=== added file 'bindings/python/scope-runner-dbus.py'
--- bindings/python/scope-runner-dbus.py	1970-01-01 00:00:00 +0000
+++ bindings/python/scope-runner-dbus.py	2013-03-25 11:25:26 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+# Copyright (C) 2013 Canonical
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import sys
+import os
+import imp
+from gi.repository import Unity
+from gi.repository import GLib
+
+def main(args):
+  GLib.threads_init()
+  scope_path = args[1]
+  scope_module = imp.load_source('scope', scope_path)
+  scope = scope_module.load_scope()
+  connector = Unity.ScopeDBusConnector.new(scope)
+  connector.export()
+  ml = GLib.MainLoop()
+  ml.run()
+
+if __name__ == "__main__":
+  main (sys.argv)
+

=== modified file 'configure.ac'
--- configure.ac	2012-12-07 10:54:09 +0000
+++ configure.ac	2013-03-25 11:25:26 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 6.90.2)
+AC_INIT(libunity, 6.91.7)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -192,13 +192,13 @@
 ####################################################################
 # Check library deps
 ####################################################################
-GLIB_REQUIRED=2.26
+GLIB_REQUIRED=2.32
 PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GOBJECT2, [gobject-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GIO2, [gio-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0])
 PKG_CHECK_MODULES(GEE, [gee-1.0 >= 0.6.0])
-PKG_CHECK_MODULES(DEE, [dee-1.0 >= 1.0.4])
+PKG_CHECK_MODULES(DEE, [dee-1.0 >= 1.2.3])
 PKG_CHECK_MODULES(DBUSMENU, [dbusmenu-glib-0.4 >= 0.3.93])
 PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= 3.4.1])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.32.1])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-03-01 08:16:49 +0000
+++ data/Makefile.am	2013-03-25 11:25:26 +0000
@@ -1,3 +1,5 @@
+NULL=
+
 #############################################################
 # GSettings schemas
 #############################################################
@@ -10,7 +12,9 @@
 @INTLTOOL_XML_NOMERGE_RULE@
 
 EXTRA_DIST = \
-  com.canonical.Unity.Lenses.gschema.xml.in.in
+  client-scopes.json \
+  com.canonical.Unity.Lenses.gschema.xml.in.in \
+  $(NULL)
 
 jsonscopedir = $(PKGDATADIR)
 jsonscope_DATA = client-scopes.json

=== modified file 'data/client-scopes.json'
--- data/client-scopes.json	2013-03-01 09:48:40 +0000
+++ data/client-scopes.json	2013-03-25 11:25:26 +0000
@@ -1,7 +1,40 @@
-{"unity-lens-applications": ["scope1", "scope2"],
- "unity-lens-files": [],
- "unity-lens-music": [],
+{"unity-lens-applications": ["applications.scope"],
+ "unity-lens-files": ["files-files-local.scope"],
+ "unity-lens-gwibber": [],
+ "unity-lens-music": ["music-music-banshee.scope", "music-music-rhythmbox.scope"],
  "unity-lens-photos": [],
- "unity-lens-shopping": [],
- "unity-lens-video": []
+ "unity-lens-video": ["video-video-local.scope"],
+ "unity-scope-gdrive": [],
+ "unity-scope-musicstores": ["music-musicstore.scope"],
+ "unity-scope-video-remote": ["video-video-remote.scope"],
+ "unity-scope-audacious": ["music-audacious.scope"],
+ "unity-scope-calculator": ["info-calculator.scope"],
+ "unity-scope-chromiumbookmarks": ["web-chromiumbookmarks.scope"],
+ "unity-scope-clementine": ["music-clementine.scope"],
+ "unity-scope-colourlovers": ["graphics-colourlovers.scope"],
+ "unity-scope-devhelp": ["code-devhelp.scope"],
+ "unity-scope-deviantart": ["graphics-deviantart.scope"],
+ "unity-scope-evolution": ["calendar-evolution.scope"],
+ "unity-scope-firefoxbookmarks": ["web-firefoxbookmarks.scope"],
+ "unity-scope-gallica": ["reference-gallica.scope"],
+ "unity-scope-github": ["code-github.scope"],
+ "unity-scope-gmusicbrowser": ["music-gmusicbrowser.scope"],
+ "unity-scope-googlenews": ["news-googlenews.scope"],
+ "unity-scope-gourmet": ["recipes-gourmet.scope"],
+ "unity-scope-guayadeque": ["music-guayadeque.scope"],
+ "unity-scope-home": ["home.scope"],
+ "unity-scope-imdb": ["reference-imdb.scope"],
+ "unity-scope-launchpad": ["code-launchpad.scope"],
+ "unity-scope-manpages": ["help-manpages.scope"],
+ "unity-scope-musique": ["music-musique.scope"],
+ "unity-scope-openclipart": ["graphics-openclipart.scope"],
+ "unity-scope-openweathermap": ["info-openweathermap.scope"],
+ "unity-scope-soundcloud": ["music-soundcloud.scope"],
+ "unity-scope-sshsearch": ["boxes-sshsearch.scope"],
+ "unity-scope-texdoc": ["help-texdoc.scope"],
+ "unity-scope-tomboy": ["notes-tomboy.scope"],
+ "unity-scope-virtualbox": ["boxes-virtualbox.scope"],
+ "unity-scope-yahoostock": ["news-yahoostock.scope"],
+ "unity-scope-yelp": ["help-yelp.scope"],
+ "unity-scope-zotero": ["reference-zotero.scope"]
 }

=== modified file 'data/com.canonical.Unity.Lenses.gschema.xml.in.in'
--- data/com.canonical.Unity.Lenses.gschema.xml.in.in	2012-09-25 15:10:07 +0000
+++ data/com.canonical.Unity.Lenses.gschema.xml.in.in	2013-03-25 11:25:26 +0000
@@ -6,5 +6,25 @@
       <summary>Content fetching from remote source preference.</summary>
       <description>"all" is to enable the supported default lens to search from remote and commercial sources. "none" will indicate the lenses to not perform that remote search at all.</description>
     </key>
+    <key type="as" name="always-search">
+      <default>['applications.scope','music.scope','videos.scope','files.scope']</default>
+      <summary>Scopes that will always be searched from Home Lens.</summary>
+      <description>List of scope IDs that will always be running and searched by Unity Dash - Home Lens.</description>
+    </key>
+    <key type="as" name="disabled-scopes">
+      <default>[]</default>
+      <summary>Scopes that will be ignored during queries.</summary>
+      <description>List of scope IDs that will be ignored when master scopes are querying their subscopes.</description>
+    </key>
+    <key type="as" name="home-lens-priority">
+      <default>['applications.scope', 'files.scope', 'music.scope' ]</default>
+      <summary>List of scope ids specifying how categories should be ordered in the Dash home screen.</summary>
+      <description>The ordering of categories listed on the Dash home screen will be influenced by this list.</description>
+    </key>
+    <key type="as" name="home-lens-default-view">
+      <default>['applications.scope', 'files.scope']</default>
+      <summary>Scopes in default Dash Home Lens view, when there is no search query entered.</summary>
+      <description>List of scopes IDs which will be queried in the default view of Home Lens.</description>
+    </key>
   </schema>
 </schemalist>

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-06 13:25:56 +0000
+++ debian/changelog	2013-03-25 11:25:26 +0000
@@ -1,3 +1,22 @@
+libunity (6.91.7~-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Didier Roche ]
+  * debian/control:
+    - bump dee build-dep
+    - add unity-scopes-runner packages
+
+  [ Sebastien Bacher ]
+  * debian/libunity9.symbols:
+    - updated for the new version. The abi/api changed but only in 
+      the parts concerning scope/lenses, which are considered semi-private,
+      we don't update the soname but will update lenses in locked steps
+
+  [ Michal Hruby ]
+  * debian/libunity9.symbols:
+    - updated because of new symbols.
+
+ -- Michal Hruby <[e-mail]>  Thu, 21 Mar 2013 23:22:18 +0100
+
 libunity (6.90.2daily13.03.06.1-0ubuntu1) raring; urgency=low
 
   [ Didier Roche ]

=== modified file 'debian/control'
--- debian/control	2013-03-05 10:57:33 +0000
+++ debian/control	2013-03-25 11:25:26 +0000
@@ -12,7 +12,7 @@
                valac-0.18 (>= 0.16.0),
                libglib2.0-dev (>= 2.32.1),
                libgee-dev (>= 0.6.0),
-               libdee-dev (>= 0.9),
+               libdee-dev (>= 1.2.3~),
                libdbusmenu-glib-dev (>= 0.4.90),
                libgirepository1.0-dev (>= 0.10),
                libgtk-3-dev (>= 3.4.1),
@@ -71,6 +71,14 @@
  .
  This package contains common files for scopes.
 
+Package: unity-scopes-runner
+Architecture: all
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Description: desktop runner for misceallenous scopes
+ The scope runner is a handy tool for wrapping on a desktop the various
+ scoped installed on the system.
+
 Package: libunity-dev
 Section: libdevel
 Architecture: any

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-01-11 04:01:53 +0000
+++ debian/libunity9.symbols	2013-03-25 11:25:26 +0000
@@ -9,11 +9,6 @@
  unity_extras_preview_player_close@Base 6.10.0-0ubuntu2
  unity_extras_preview_player_close_finish@Base 6.10.0-0ubuntu2
  unity_extras_preview_player_construct@Base 6.10.0-0ubuntu2
- unity_extras_preview_player_controller_construct@Base 6.10.0-0ubuntu2
- unity_extras_preview_player_controller_get_active_preview@Base 6.10.0-0ubuntu2
- unity_extras_preview_player_controller_get_type@Base 6.10.0-0ubuntu2
- unity_extras_preview_player_controller_new@Base 6.10.0-0ubuntu2
- unity_extras_preview_player_controller_set_active_preview@Base 6.10.0-0ubuntu2
  unity_extras_preview_player_get_type@Base 6.10.0-0ubuntu2
  unity_extras_preview_player_new@Base 6.10.0-0ubuntu2
  unity_extras_preview_player_on_progress_signal@Base 6.10.0-0ubuntu2
@@ -49,6 +44,21 @@
  unity_extras_show_in_folder@Base 6.10.0-0ubuntu2
  unity_extras_show_in_folder_finish@Base 6.10.0-0ubuntu2
 libunity.so.9 libunity9 #MINVER#
+ unity_abstract_preview_construct@Base 0replaceme
+ unity_abstract_preview_get_type@Base 0replaceme
+ unity_abstract_preview_serialize_as@Base 0replaceme
+ unity_abstract_scope_activate@Base 0replaceme
+ unity_abstract_scope_construct@Base 0replaceme
+ unity_abstract_scope_create_previewer@Base 0replaceme
+ unity_abstract_scope_create_search_for_query@Base 0replaceme
+ unity_abstract_scope_get_categories@Base 0replaceme
+ unity_abstract_scope_get_filters@Base 0replaceme
+ unity_abstract_scope_get_group_name@Base 0replaceme
+ unity_abstract_scope_get_schema@Base 0replaceme
+ unity_abstract_scope_get_search_hint@Base 0replaceme
+ unity_abstract_scope_get_type@Base 0replaceme
+ unity_abstract_scope_get_unique_name@Base 0replaceme
+ unity_abstract_scope_normalize_search_query@Base 0replaceme
  unity_activation_response_construct@Base 4.0.0
  unity_activation_response_construct_with_preview@Base 5.90.0
  unity_activation_response_get_goto_uri@Base 4.0.0
@@ -65,6 +75,45 @@
  unity_active_playlist_container_dup@Base 4.0.0
  unity_active_playlist_container_free@Base 4.0.0
  unity_active_playlist_container_get_type@Base 4.0.0
+ unity_aggregated_scope_search_construct@Base 0replaceme
+ unity_aggregated_scope_search_get_type@Base 0replaceme
+ unity_aggregated_scope_search_new@Base 0replaceme
+ unity_aggregated_scope_search_push_filter_settings@Base 0replaceme
+ unity_aggregated_scope_search_push_results@Base 0replaceme
+ unity_aggregated_scope_search_push_results_finish@Base 0replaceme
+ unity_aggregated_scope_search_search_scope@Base 0replaceme
+ unity_aggregated_scope_search_search_scope_finish@Base 0replaceme
+ unity_aggregator_activation_construct@Base 0replaceme
+ unity_aggregator_activation_get_action_type@Base 0replaceme
+ unity_aggregator_activation_get_channel_id@Base 0replaceme
+ unity_aggregator_activation_get_scope_id@Base 0replaceme
+ unity_aggregator_activation_get_scope_result@Base 0replaceme
+ unity_aggregator_activation_get_type@Base 0replaceme
+ unity_aggregator_activation_new@Base 0replaceme
+ unity_aggregator_activation_set_action_type@Base 0replaceme
+ unity_aggregator_activation_set_channel_id@Base 0replaceme
+ unity_aggregator_activation_set_scope_id@Base 0replaceme
+ unity_aggregator_activation_set_scope_result@Base 0replaceme
+ unity_aggregator_scope_activate@Base 0replaceme
+ unity_aggregator_scope_activate_finish@Base 0replaceme
+ unity_aggregator_scope_add_constraint@Base 0replaceme
+ unity_aggregator_scope_add_sorter@Base 0replaceme
+ unity_aggregator_scope_category_index_for_scope_id@Base 0replaceme
+ unity_aggregator_scope_construct@Base 0replaceme
+ unity_aggregator_scope_get_merge_mode@Base 0replaceme
+ unity_aggregator_scope_get_proxy_filter_hints@Base 0replaceme
+ unity_aggregator_scope_get_type@Base 0replaceme
+ unity_aggregator_scope_merge_mode_get_type@Base 0replaceme
+ unity_aggregator_scope_push_filter_settings@Base 0replaceme
+ unity_aggregator_scope_push_results@Base 0replaceme
+ unity_aggregator_scope_push_results_finish@Base 0replaceme
+ unity_aggregator_scope_search@Base 0replaceme
+ unity_aggregator_scope_search_finish@Base 0replaceme
+ unity_aggregator_scope_search_scope@Base 0replaceme
+ unity_aggregator_scope_search_scope_finish@Base 0replaceme
+ unity_aggregator_scope_set_merge_mode@Base 0replaceme
+ unity_aggregator_scope_set_proxy_filter_hints@Base 0replaceme
+ unity_aggregator_scope_sort_flags_get_type@Base 0replaceme
  unity_annotated_icon_construct@Base 5.94.0
  unity_annotated_icon_get_category@Base 5.94.0
  unity_annotated_icon_get_icon@Base 5.94.0
@@ -99,30 +148,31 @@
  unity_application_preview_set_last_update@Base 5.90.0
  unity_application_preview_set_license@Base 5.90.0
  unity_application_preview_set_rating@Base 5.90.0
- unity_async_preview_construct@Base 5.90.0
- unity_async_preview_construct_with_cancellable@Base 5.96.0
- unity_async_preview_get_cancellable@Base 5.90.0
- unity_async_preview_get_type@Base 5.90.0
- unity_async_preview_new@Base 5.90.0
- unity_async_preview_new_with_cancellable@Base 5.96.0
- unity_async_preview_preview_ready@Base 6.10.0-0ubuntu2
- unity_async_preview_set_cancellable@Base 5.96.0
- unity_async_preview_wait_for_signal@Base 5.96.0
- unity_async_preview_wait_for_signal_finish@Base 5.96.0
  unity_blacklist_manager_check_presence@Base 4.0.0
  unity_blacklist_manager_construct@Base 4.0.0
  unity_blacklist_manager_get_type@Base 4.0.0
  unity_blacklist_manager_new@Base 4.0.0
+ unity_cancellable_cancel@Base 0replaceme
+ unity_cancellable_construct@Base 0replaceme
+ unity_cancellable_create@Base 0replaceme
+ unity_cancellable_get_type@Base 0replaceme
+ unity_cancellable_is_cancelled@Base 0replaceme
  unity_category_construct@Base 4.0.0
  unity_category_get_default_renderer@Base 4.0.0
  unity_category_get_hints@Base 4.0.0
  unity_category_get_icon_hint@Base 4.0.0
+ unity_category_get_id@Base 0replaceme
  unity_category_get_name@Base 4.0.0
  unity_category_get_renderer@Base 4.0.0
  unity_category_get_type@Base 4.0.0
  unity_category_new@Base 4.0.0
  unity_category_renderer_get_type@Base 4.0.0
+ unity_category_set_add@Base 0replaceme
+ unity_category_set_construct@Base 0replaceme
+ unity_category_set_get_categories@Base 0replaceme
+ unity_category_set_get_type@Base 0replaceme
  unity_category_set_hints@Base 4.0.0
+ unity_category_set_new@Base 0replaceme
  unity_category_type_get_type@Base 5.94.0
  unity_check_option_filter_compact_construct@Base 5.2.0
  unity_check_option_filter_compact_get_type@Base 5.2.0
@@ -131,8 +181,61 @@
  unity_check_option_filter_get_type@Base 4.0.0
  unity_check_option_filter_new@Base 4.0.0
  unity_collect_launcher_entry_properties@Base 3.4.6
- unity_filter_column_get_type@Base 4.0.0
+ unity_dee_result_set_construct@Base 0replaceme
+ unity_dee_result_set_construct_with_model@Base 0replaceme
+ unity_dee_result_set_get_results_model@Base 0replaceme
+ unity_dee_result_set_get_type@Base 0replaceme
+ unity_dee_result_set_new@Base 0replaceme
+ unity_dee_result_set_new_with_model@Base 0replaceme
+ unity_dee_result_set_set_results_model@Base 0replaceme
+ unity_deprecated_scope_base_construct@Base 0replaceme
+ unity_deprecated_scope_base_create_impl@Base 0replaceme
+ unity_deprecated_scope_base_export@Base 0replaceme
+ unity_deprecated_scope_base_get_categories@Base 0replaceme
+ unity_deprecated_scope_base_get_dbus_path@Base 0replaceme
+ unity_deprecated_scope_base_get_filters@Base 0replaceme
+ unity_deprecated_scope_base_get_id@Base 0replaceme
+ unity_deprecated_scope_base_get_impl@Base 0replaceme
+ unity_deprecated_scope_base_get_is_master@Base 0replaceme
+ unity_deprecated_scope_base_get_schema@Base 0replaceme
+ unity_deprecated_scope_base_get_search_hint@Base 0replaceme
+ unity_deprecated_scope_base_get_search_in_global@Base 0replaceme
+ unity_deprecated_scope_base_get_sources@Base 0replaceme
+ unity_deprecated_scope_base_get_type@Base 0replaceme
+ unity_deprecated_scope_base_get_visible@Base 0replaceme
+ unity_deprecated_scope_base_handle_search@Base 0replaceme
+ unity_deprecated_scope_base_handle_search_finish@Base 0replaceme
+ unity_deprecated_scope_base_set_active_sources_internal@Base 0replaceme
+ unity_deprecated_scope_base_set_categories@Base 0replaceme
+ unity_deprecated_scope_base_set_filters@Base 0replaceme
+ unity_deprecated_scope_base_set_schema@Base 0replaceme
+ unity_deprecated_scope_base_set_search_hint@Base 0replaceme
+ unity_deprecated_scope_base_set_search_in_global@Base 0replaceme
+ unity_deprecated_scope_base_set_sources@Base 0replaceme
+ unity_deprecated_scope_base_set_view_type_internal@Base 0replaceme
+ unity_deprecated_scope_base_set_visible@Base 0replaceme
+ unity_deprecated_scope_base_unexport@Base 0replaceme
+ unity_deprecated_scope_construct@Base 0replaceme
+ unity_deprecated_scope_get_type@Base 0replaceme
+ unity_deprecated_scope_new@Base 0replaceme
+ unity_deprecated_scope_preview_result@Base 0replaceme
+ unity_deprecated_scope_preview_result_finish@Base 0replaceme
+ unity_deprecated_scope_queue_search_changed@Base 0replaceme
+ unity_deprecated_scope_search_construct@Base 0replaceme
+ unity_deprecated_scope_search_equals@Base 0replaceme
+ unity_deprecated_scope_search_get_channel_id@Base 0replaceme
+ unity_deprecated_scope_search_get_filter@Base 0replaceme
+ unity_deprecated_scope_search_get_hints@Base 0replaceme
+ unity_deprecated_scope_search_get_owner@Base 0replaceme
+ unity_deprecated_scope_search_get_reply_hints@Base 0replaceme
+ unity_deprecated_scope_search_get_results_model@Base 0replaceme
+ unity_deprecated_scope_search_get_search_string@Base 0replaceme
+ unity_deprecated_scope_search_get_search_type@Base 0replaceme
+ unity_deprecated_scope_search_get_type@Base 0replaceme
+ unity_deprecated_scope_search_new@Base 0replaceme
+ unity_deprecated_scope_search_set_reply_hint@Base 0replaceme
  unity_filter_construct@Base 4.0.0
+ unity_filter_for_filter_model_row@Base 0replaceme
  unity_filter_get_collapsed@Base 4.0.0
  unity_filter_get_display_name@Base 4.0.0
  unity_filter_get_filtering@Base 4.0.0
@@ -153,17 +256,18 @@
  unity_filter_option_set_active@Base 4.0.0
  unity_filter_renderer_for_name@Base 5.0.0
  unity_filter_renderer_get_type@Base 5.0.0
+ unity_filter_set_add@Base 0replaceme
+ unity_filter_set_collapsed@Base 0replaceme
+ unity_filter_set_construct@Base 0replaceme
  unity_filter_set_display_name@Base 5.0.0
  unity_filter_set_filtering@Base 4.0.0
+ unity_filter_set_get_filter_by_id@Base 0replaceme
+ unity_filter_set_get_filters@Base 0replaceme
+ unity_filter_set_get_type@Base 0replaceme
  unity_filter_set_model_and_iter@Base 4.0.0
+ unity_filter_set_new@Base 0replaceme
  unity_filter_set_visible@Base 4.0.0
  unity_filter_update@Base 4.0.0
- unity_filters_synchronizer_add_receiver@Base 4.0.0
- unity_filters_synchronizer_construct@Base 4.0.0
- unity_filters_synchronizer_get_provider@Base 4.0.0
- unity_filters_synchronizer_get_type@Base 4.0.0
- unity_filters_synchronizer_new@Base 4.0.0
- unity_filters_synchronizer_remove_receiver@Base 5.12.0
  unity_generic_preview_construct@Base 4.0.0
  unity_generic_preview_empty@Base 5.96.0
  unity_generic_preview_get_type@Base 4.0.0
@@ -183,15 +287,125 @@
  unity_inspector_get_type@Base 3.4.6
  unity_inspector_get_unity_bus_name@Base 3.4.6
  unity_inspector_get_unity_running@Base 3.4.6
- unity_io_get_system_data_dirs@Base 3.4.6
- unity_io_open_from_data_dirs@Base 3.4.6
- unity_io_open_from_data_dirs_finish@Base 3.4.6
- unity_io_open_from_dirs@Base 3.4.6
- unity_io_open_from_dirs_finish@Base 3.4.6
- unity_io_read_stream_async@Base 3.4.6
- unity_io_read_stream_finish@Base 3.4.6
- unity_io_system_data_dirs@Base 3.4.6
- unity_io_system_data_dirs_length1@Base 3.4.6
+ unity_internal_aggregator_scope_impl_add_constraint@Base 0replaceme
+ unity_internal_aggregator_scope_impl_add_sorter@Base 0replaceme
+ unity_internal_aggregator_scope_impl_construct@Base 0replaceme
+ unity_internal_aggregator_scope_impl_get_merge_strategy@Base 0replaceme
+ unity_internal_aggregator_scope_impl_get_type@Base 0replaceme
+ unity_internal_aggregator_scope_impl_get_view_type@Base 0replaceme
+ unity_internal_aggregator_scope_impl_invalidate_search@Base 0replaceme
+ unity_internal_aggregator_scope_impl_new@Base 0replaceme
+ unity_internal_aggregator_scope_impl_push_filter_settings@Base 0replaceme
+ unity_internal_aggregator_scope_impl_push_results_to_scope@Base 0replaceme
+ unity_internal_aggregator_scope_impl_push_results_to_scope_finish@Base 0replaceme
+ unity_internal_aggregator_scope_impl_search_scope@Base 0replaceme
+ unity_internal_aggregator_scope_impl_search_scope_finish@Base 0replaceme
+ unity_internal_aggregator_scope_impl_set_active_sources@Base 0replaceme
+ unity_internal_aggregator_scope_impl_set_active_sources_finish@Base 0replaceme
+ unity_internal_aggregator_scope_impl_set_merge_strategy@Base 0replaceme
+ unity_internal_aggregator_scope_impl_set_view_type@Base 0replaceme
+ unity_internal_aggregator_scope_impl_subscope_ids@Base 0replaceme
+ unity_internal_category_column_get_type@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_construct@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_get_type@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_get_view_type@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_new@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_preview_internal@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_preview_internal_finish@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_set_active_sources@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_set_active_sources_finish@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_set_categories@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_set_filters@Base 0replaceme
+ unity_internal_default_scope_dbus_impl_set_view_type@Base 0replaceme
+ unity_internal_deprecated_scope_dbus_impl_get_type@Base 0replaceme
+ unity_internal_deprecated_scope_dbus_impl_set_categories@Base 0replaceme
+ unity_internal_deprecated_scope_dbus_impl_set_filters@Base 0replaceme
+ unity_internal_deprecated_scope_impl_activate_action@Base 0replaceme
+ unity_internal_deprecated_scope_impl_construct@Base 0replaceme
+ unity_internal_deprecated_scope_impl_get_type@Base 0replaceme
+ unity_internal_deprecated_scope_impl_get_view_type@Base 0replaceme
+ unity_internal_deprecated_scope_impl_new@Base 0replaceme
+ unity_internal_deprecated_scope_impl_set_active_sources@Base 0replaceme
+ unity_internal_deprecated_scope_impl_set_active_sources_finish@Base 0replaceme
+ unity_internal_deprecated_scope_impl_set_view_type@Base 0replaceme
+ unity_internal_filter_column_get_type@Base 0replaceme
+ unity_internal_glib_cancellable_construct@Base 0replaceme
+ unity_internal_glib_cancellable_get_inner@Base 0replaceme
+ unity_internal_glib_cancellable_get_type@Base 0replaceme
+ unity_internal_glib_cancellable_new@Base 0replaceme
+ unity_internal_io_get_system_data_dirs@Base 0replaceme
+ unity_internal_io_open_from_data_dirs@Base 0replaceme
+ unity_internal_io_open_from_data_dirs_finish@Base 0replaceme
+ unity_internal_io_open_from_dirs@Base 0replaceme
+ unity_internal_io_open_from_dirs_finish@Base 0replaceme
+ unity_internal_io_read_stream_async@Base 0replaceme
+ unity_internal_io_read_stream_finish@Base 0replaceme
+ unity_internal_io_system_data_dirs@Base 0replaceme
+ unity_internal_io_system_data_dirs_length1@Base 0replaceme
+ unity_internal_merge_strategy_get_type@Base 0replaceme
+ unity_internal_merge_strategy_merge_result@Base 0replaceme
+ unity_internal_result_column_get_type@Base 0replaceme
+ unity_internal_results_synchronizer_add_provider@Base 0replaceme
+ unity_internal_results_synchronizer_clear@Base 0replaceme
+ unity_internal_results_synchronizer_clear_provider_model@Base 0replaceme
+ unity_internal_results_synchronizer_construct@Base 0replaceme
+ unity_internal_results_synchronizer_copy_model@Base 0replaceme
+ unity_internal_results_synchronizer_get_merge_strategy@Base 0replaceme
+ unity_internal_results_synchronizer_get_receiver@Base 0replaceme
+ unity_internal_results_synchronizer_get_type@Base 0replaceme
+ unity_internal_results_synchronizer_new@Base 0replaceme
+ unity_internal_results_synchronizer_prepare_row_buf@Base 0replaceme
+ unity_internal_results_synchronizer_remove_provider@Base 0replaceme
+ unity_internal_results_synchronizer_set_merge_strategy@Base 0replaceme
+ unity_internal_scope_channel_construct@Base 0replaceme
+ unity_internal_scope_channel_create_channel@Base 0replaceme
+ unity_internal_scope_channel_get_filter_by_id@Base 0replaceme
+ unity_internal_scope_channel_get_search_type@Base 0replaceme
+ unity_internal_scope_channel_get_type@Base 0replaceme
+ unity_internal_scope_channel_new@Base 0replaceme
+ unity_internal_scope_dbus_impl_export@Base 0replaceme
+ unity_internal_scope_dbus_impl_get_categories_model@Base 0replaceme
+ unity_internal_scope_dbus_impl_get_filters_model@Base 0replaceme
+ unity_internal_scope_dbus_impl_get_type@Base 0replaceme
+ unity_internal_scope_dbus_impl_queue_property_notification@Base 0replaceme
+ unity_internal_scope_dbus_impl_queue_search_for_type@Base 0replaceme
+ unity_internal_scope_dbus_impl_set_categories_model@Base 0replaceme
+ unity_internal_scope_dbus_impl_set_filters_model@Base 0replaceme
+ unity_internal_scope_dbus_impl_unexport@Base 0replaceme
+ unity_internal_utils_async_mutex_construct@Base 0replaceme
+ unity_internal_utils_async_mutex_get_type@Base 0replaceme
+ unity_internal_utils_async_mutex_lock@Base 0replaceme
+ unity_internal_utils_async_mutex_lock_finish@Base 0replaceme
+ unity_internal_utils_async_mutex_new@Base 0replaceme
+ unity_internal_utils_async_mutex_ref@Base 0replaceme
+ unity_internal_utils_async_mutex_try_lock@Base 0replaceme
+ unity_internal_utils_async_mutex_unlock@Base 0replaceme
+ unity_internal_utils_async_mutex_unref@Base 0replaceme
+ unity_internal_utils_async_once_construct@Base 0replaceme
+ unity_internal_utils_async_once_enter@Base 0replaceme
+ unity_internal_utils_async_once_enter_finish@Base 0replaceme
+ unity_internal_utils_async_once_get_data@Base 0replaceme
+ unity_internal_utils_async_once_get_type@Base 0replaceme
+ unity_internal_utils_async_once_is_initialized@Base 0replaceme
+ unity_internal_utils_async_once_leave@Base 0replaceme
+ unity_internal_utils_async_once_new@Base 0replaceme
+ unity_internal_utils_async_once_ref@Base 0replaceme
+ unity_internal_utils_async_once_reset@Base 0replaceme
+ unity_internal_utils_async_once_unref@Base 0replaceme
+ unity_internal_utils_delegate_wrapper_dup@Base 0replaceme
+ unity_internal_utils_delegate_wrapper_free@Base 0replaceme
+ unity_internal_utils_delegate_wrapper_get_type@Base 0replaceme
+ unity_internal_utils_delegate_wrapper_init@Base 0replaceme
+ unity_internal_utils_hash_table_to_asv@Base 0replaceme
+ unity_internal_utils_icon_to_string@Base 0replaceme
+ unity_internal_utils_param_spec_async_mutex@Base 0replaceme
+ unity_internal_utils_param_spec_async_once@Base 0replaceme
+ unity_internal_utils_value_get_async_mutex@Base 0replaceme
+ unity_internal_utils_value_get_async_once@Base 0replaceme
+ unity_internal_utils_value_set_async_mutex@Base 0replaceme
+ unity_internal_utils_value_set_async_once@Base 0replaceme
+ unity_internal_utils_value_take_async_mutex@Base 0replaceme
+ unity_internal_utils_value_take_async_once@Base 0replaceme
  unity_launcher_entry_dbus_impl_construct@Base 3.4.6
  unity_launcher_entry_dbus_impl_get_type@Base 3.4.6
  unity_launcher_entry_dbus_impl_new@Base 3.4.6
@@ -223,63 +437,9 @@
  unity_launcher_favorites_has_app_info@Base 5.0.0
  unity_launcher_favorites_lookup@Base 5.0.0
  unity_layout_hint_get_type@Base 5.90.0
- unity_lens_add_local_scope@Base 4.0.0
- unity_lens_construct@Base 4.0.0
- unity_lens_export@Base 4.0.0
- unity_lens_get_active@Base 4.0.0
- unity_lens_get_categories@Base 4.0.0
- unity_lens_get_dbus_path@Base 4.0.0
- unity_lens_get_exported@Base 4.0.0
- unity_lens_get_filters@Base 4.0.0
- unity_lens_get_global_merge_strategy@Base 5.0.0
- unity_lens_get_home_lens_default_name@Base 6.5.2
- unity_lens_get_id@Base 4.0.0
- unity_lens_get_merge_strategy@Base 5.0.0
- unity_lens_get_model_internal@Base 5.0.0
- unity_lens_get_search_hint@Base 4.0.0
- unity_lens_get_search_in_global@Base 4.0.0
- unity_lens_get_searching@Base 4.0.0
- unity_lens_get_sources_display_name@Base 5.0.0
- unity_lens_get_sources_internal@Base 5.0.0
- unity_lens_get_type@Base 4.0.0
- unity_lens_get_visible@Base 4.0.0
- unity_lens_impl_add_local_scope@Base 4.0.0
- unity_lens_impl_construct@Base 4.0.0
- unity_lens_impl_export@Base 4.0.0
- unity_lens_impl_get_global_results_sync@Base 5.0.0
- unity_lens_impl_get_model@Base 5.0.0
- unity_lens_impl_get_results_sync@Base 5.0.0
- unity_lens_impl_get_sources@Base 5.0.0
- unity_lens_impl_get_type@Base 4.0.0
- unity_lens_impl_load_categories@Base 4.0.0
- unity_lens_impl_load_filters@Base 4.0.0
- unity_lens_impl_new@Base 4.0.0
- unity_lens_impl_update_active_sources@Base 5.0.0
- unity_lens_impl_update_active_sources_finish@Base 5.0.0
- unity_lens_new@Base 4.0.0
- unity_lens_search_construct@Base 4.0.0
- unity_lens_search_equals@Base 4.0.0
- unity_lens_search_finished@Base 5.0.0
- unity_lens_search_get_hints@Base 4.0.0
- unity_lens_search_get_reply_hints@Base 5.0.0
- unity_lens_search_get_results_model@Base 5.0.0
- unity_lens_search_get_search_string@Base 4.0.0
- unity_lens_search_get_type@Base 4.0.0
- unity_lens_search_new@Base 4.0.0
- unity_lens_search_set_reply_hint@Base 5.0.0
- unity_lens_search_was_finished@Base 5.4.0
- unity_lens_set_active_internal@Base 4.0.0
- unity_lens_set_categories@Base 4.0.0
- unity_lens_set_filters@Base 4.0.0
- unity_lens_set_global_merge_strategy@Base 5.0.0
- unity_lens_set_home_lens_default_name@Base 6.5.2
- unity_lens_set_merge_strategy@Base 5.0.0
- unity_lens_set_search_hint@Base 4.0.0
- unity_lens_set_search_in_global@Base 4.0.0
- unity_lens_set_sources_display_name@Base 5.0.0
- unity_lens_set_visible@Base 4.0.0
- unity_merge_strategy_get_type@Base 5.0.0
- unity_merge_strategy_merge_result@Base 5.0.0
+ unity_master_scope_construct@Base 0replaceme
+ unity_master_scope_get_type@Base 0replaceme
+ unity_master_scope_new@Base 0replaceme
  unity_movie_preview_construct@Base 5.90.0
  unity_movie_preview_get_type@Base 5.90.0
  unity_movie_preview_get_year@Base 5.92.0
@@ -377,28 +537,22 @@
  unity_music_player_unexport@Base 5.0.0
  unity_music_preview_add_track@Base 5.90.0
  unity_music_preview_construct@Base 5.90.0
- unity_music_preview_get_current_progress@Base 5.92.0
- unity_music_preview_get_current_track_state@Base 5.92.0
- unity_music_preview_get_current_track_uri@Base 5.92.0
  unity_music_preview_get_type@Base 5.90.0
  unity_music_preview_new@Base 5.90.0
- unity_music_preview_set_current_progress@Base 5.92.0
- unity_music_preview_set_current_track_state@Base 5.92.0
- unity_music_preview_set_current_track_uri@Base 5.92.0
  unity_music_preview_track_state_get_type@Base 5.92.0
  unity_options_filter_add_option@Base 4.0.0
  unity_options_filter_construct@Base 4.0.0
  unity_options_filter_find_and_update_option@Base 4.0.0
  unity_options_filter_get_option@Base 4.0.0
+ unity_options_filter_get_show_all_button@Base 0replaceme
  unity_options_filter_get_sort_type@Base 4.0.4
  unity_options_filter_get_type@Base 4.0.0
  unity_options_filter_load_or_update_options@Base 4.0.0
  unity_options_filter_new@Base 4.0.0
  unity_options_filter_remove_option@Base 5.0.0
+ unity_options_filter_set_show_all_button@Base 0replaceme
  unity_options_filter_set_sort_type@Base 4.0.4
  unity_options_filter_sort_type_get_type@Base 4.0.4
- unity_param_spec_string_array_wrapper@Base 3.4.6
- unity_param_spec_tools@Base 4.0.0
  unity_payment_preview_construct@Base 6.90.2daily13.01.11
  unity_payment_preview_construct_for_application@Base 6.90.2daily13.01.11
  unity_payment_preview_construct_for_error@Base 6.90.2daily13.01.11
@@ -443,17 +597,22 @@
  unity_playlist_set_last_play_date@Base 4.0.0
  unity_playlist_set_modification_date@Base 4.0.0
  unity_playlist_set_name@Base 4.0.0
+ unity_preferences_manager_get_always_search@Base 0replaceme
  unity_preferences_manager_get_default@Base 6.8.0
+ unity_preferences_manager_get_disabled_scopes@Base 0replaceme
+ unity_preferences_manager_get_home_lens_default_view@Base 0replaceme
+ unity_preferences_manager_get_home_lens_priority@Base 0replaceme
  unity_preferences_manager_get_remote_content_search@Base 6.8.0
  unity_preferences_manager_get_type@Base 6.8.0
  unity_preferences_manager_remote_content_get_type@Base 6.8.0
+ unity_preferences_manager_set_always_search@Base 0replaceme
+ unity_preferences_manager_set_disabled_scopes@Base 0replaceme
+ unity_preferences_manager_set_home_lens_default_view@Base 0replaceme
+ unity_preferences_manager_set_home_lens_priority@Base 0replaceme
  unity_preferences_manager_set_remote_content_search@Base 6.8.0
  unity_preview_action_construct@Base 5.90.0
  unity_preview_action_construct_with_layout_hint@Base 5.90.0
- unity_preview_action_dummy1@Base 5.90.0
- unity_preview_action_dummy2@Base 5.90.0
- unity_preview_action_dummy3@Base 5.90.0
- unity_preview_action_dummy4@Base 5.90.0
+ unity_preview_action_construct_with_uri@Base 0replaceme
  unity_preview_action_get_display_name@Base 5.90.0
  unity_preview_action_get_extra_text@Base 5.96.0
  unity_preview_action_get_hints@Base 5.96.0
@@ -464,15 +623,12 @@
  unity_preview_action_get_type@Base 5.90.0
  unity_preview_action_new@Base 5.90.0
  unity_preview_action_new_with_layout_hint@Base 5.90.0
+ unity_preview_action_new_with_uri@Base 0replaceme
  unity_preview_action_set_extra_text@Base 5.96.0
  unity_preview_add_action@Base 5.90.0
  unity_preview_add_info@Base 5.90.0
  unity_preview_construct@Base 4.0.0
  unity_preview_create_raw@Base 5.90.0
- unity_preview_dummy1@Base 5.90.0
- unity_preview_dummy2@Base 5.90.0
- unity_preview_dummy3@Base 5.90.0
- unity_preview_dummy4@Base 5.90.0
  unity_preview_get_actions@Base 5.90.0
  unity_preview_get_description_markup@Base 5.90.0
  unity_preview_get_image@Base 5.94.0
@@ -486,8 +642,6 @@
  unity_preview_set_image_source_uri@Base 5.94.0
  unity_preview_set_subtitle@Base 5.90.0
  unity_preview_set_title@Base 5.90.0
- unity_preview_update_property@Base 5.92.0
- unity_preview_update_property_finish@Base 5.96.0
  unity_property_update_manager_construct@Base 4.0.0
  unity_property_update_manager_emit_dbus_signal@Base 4.0.0
  unity_property_update_manager_get_connection@Base 4.0.0
@@ -503,114 +657,60 @@
  unity_ratings_filter_get_type@Base 4.0.0
  unity_ratings_filter_new@Base 4.0.0
  unity_ratings_filter_set_rating@Base 4.0.0
- unity_results_synchronizer_add_provider@Base 4.0.0
- unity_results_synchronizer_construct@Base 4.0.0
- unity_results_synchronizer_get_merge_strategy@Base 5.0.0
- unity_results_synchronizer_get_receiver@Base 4.0.0
- unity_results_synchronizer_get_type@Base 4.0.0
- unity_results_synchronizer_new@Base 4.0.0
- unity_results_synchronizer_set_merge_strategy@Base 5.0.0
- unity_scope_activate@Base 4.0.0
- unity_scope_activate_finish@Base 4.0.4
- unity_scope_construct@Base 4.0.0
- unity_scope_export@Base 4.0.0
- unity_scope_factory_add_local_scope@Base 4.0.0
- unity_scope_factory_construct@Base 4.0.0
- unity_scope_factory_get_lens_id@Base 4.0.0
- unity_scope_factory_get_lenses_directory@Base 4.0.0
- unity_scope_factory_get_type@Base 4.0.0
- unity_scope_factory_new@Base 4.0.0
- unity_scope_get_active@Base 4.0.0
- unity_scope_get_dbus_path@Base 4.0.0
- unity_scope_get_exported@Base 4.0.0
- unity_scope_get_filter@Base 4.0.0
- unity_scope_get_filter_model@Base 4.0.0
- unity_scope_get_filters@Base 4.0.0
- unity_scope_get_global_results_model@Base 4.0.0
- unity_scope_get_last_search@Base 5.0.0
- unity_scope_get_provides_personal_content@Base 6.5.2
- unity_scope_get_results_model@Base 4.0.0
- unity_scope_get_search_in_global@Base 4.0.0
- unity_scope_get_sources@Base 4.0.0
- unity_scope_get_type@Base 4.0.0
- unity_scope_global_search@Base 4.0.0
- unity_scope_global_search_finish@Base 4.0.4
- unity_scope_impl_activate_action@Base 5.90.0
- unity_scope_impl_construct@Base 4.0.0
- unity_scope_impl_export@Base 4.0.0
- unity_scope_impl_get_type@Base 4.0.0
- unity_scope_impl_get_view_type@Base 5.0.0
- unity_scope_impl_invalidate_search@Base 5.0.0
- unity_scope_impl_new@Base 4.0.0
- unity_scope_impl_preview_internal@Base 5.90.0
- unity_scope_impl_schedule_search_changed@Base 5.0.0
- unity_scope_impl_schedule_search_changed_finish@Base 5.0.0
- unity_scope_impl_set_view_type@Base 5.0.0
- unity_scope_impl_update_search_key@Base 5.0.0
- unity_scope_invalidate_search@Base 5.0.0
- unity_scope_new@Base 4.0.0
- unity_scope_proxy_activate@Base 4.0.0
- unity_scope_proxy_activate_finish@Base 4.0.0
- unity_scope_proxy_get_filters_model@Base 4.0.0
- unity_scope_proxy_get_global_results_model@Base 4.0.0
- unity_scope_proxy_get_provides_personal_content@Base 6.5.2
- unity_scope_proxy_get_results_model@Base 4.0.0
- unity_scope_proxy_get_search_in_global@Base 4.0.0
- unity_scope_proxy_get_sources@Base 4.0.0
- unity_scope_proxy_get_type@Base 4.0.0
- unity_scope_proxy_get_view_type@Base 5.0.0
- unity_scope_proxy_global_search@Base 4.0.0
- unity_scope_proxy_global_search_finish@Base 4.0.0
- unity_scope_proxy_local_construct@Base 4.0.0
- unity_scope_proxy_local_get_scope@Base 4.0.0
- unity_scope_proxy_local_get_type@Base 4.0.0
- unity_scope_proxy_local_new@Base 4.0.0
- unity_scope_proxy_remote_construct@Base 4.0.0
- unity_scope_proxy_remote_get_dbus_name@Base 4.0.0
- unity_scope_proxy_remote_get_dbus_path@Base 4.0.0
- unity_scope_proxy_remote_get_type@Base 4.0.0
- unity_scope_proxy_remote_new@Base 4.0.0
- unity_scope_proxy_remote_on_changed@Base 4.0.0
- unity_scope_proxy_remote_set_view_type@Base 5.0.0
- unity_scope_proxy_remote_set_view_type_finish@Base 5.0.0
- unity_scope_proxy_search@Base 4.0.0
- unity_scope_proxy_search_finish@Base 4.0.0
- unity_scope_proxy_set_active_sources@Base 4.0.0
- unity_scope_proxy_set_active_sources_finish@Base 4.0.0
- unity_scope_proxy_set_filters_model@Base 4.0.0
- unity_scope_proxy_set_global_results_model@Base 4.0.0
- unity_scope_proxy_set_provides_personal_content@Base 6.5.2
- unity_scope_proxy_set_results_model@Base 4.0.0
- unity_scope_proxy_set_search_in_global@Base 4.0.0
- unity_scope_proxy_set_sources@Base 4.0.0
- unity_scope_proxy_set_view_type@Base 5.0.0
- unity_scope_proxy_update_preview_property@Base 5.92.0
- unity_scope_proxy_update_preview_property_finish@Base 5.92.0
- unity_scope_queue_search_changed@Base 5.0.0
- unity_scope_search@Base 4.0.0
- unity_scope_search_finish@Base 4.0.4
- unity_scope_set_active@Base 4.0.0
- unity_scope_set_active_sources_internal@Base 4.0.0
- unity_scope_set_last_search@Base 5.0.0
- unity_scope_set_local@Base 4.0.0
- unity_scope_set_provides_personal_content@Base 6.5.2
- unity_scope_set_search_in_global@Base 4.0.0
- unity_scope_set_sources@Base 4.0.0
- unity_scope_set_view_type_internal@Base 5.0.0
- unity_scope_update_preview_property@Base 5.92.0
- unity_scope_update_preview_property_finish@Base 5.92.0
+ unity_result_previewer_construct@Base 0replaceme
+ unity_result_previewer_get_type@Base 0replaceme
+ unity_result_previewer_run@Base 0replaceme
+ unity_result_previewer_run_async@Base 0replaceme
+ unity_result_previewer_set_scope_result@Base 0replaceme
+ unity_result_previewer_set_search_metadata@Base 0replaceme
+ unity_result_set_add_result@Base 0replaceme
+ unity_result_set_add_result_from_variant@Base 0replaceme
+ unity_result_set_construct@Base 0replaceme
+ unity_result_set_get_type@Base 0replaceme
+ unity_result_type_get_type@Base 0replaceme
+ unity_schema_add_field@Base 0replaceme
+ unity_schema_construct@Base 0replaceme
+ unity_schema_field_info_copy@Base 0replaceme
+ unity_schema_field_info_destroy@Base 0replaceme
+ unity_schema_field_info_dup@Base 0replaceme
+ unity_schema_field_info_free@Base 0replaceme
+ unity_schema_field_info_get_type@Base 0replaceme
+ unity_schema_field_type_get_type@Base 0replaceme
+ unity_schema_get_fields@Base 0replaceme
+ unity_schema_get_type@Base 0replaceme
+ unity_schema_new@Base 0replaceme
+ unity_scope_dbus_connector_construct@Base 0replaceme
+ unity_scope_dbus_connector_export@Base 0replaceme
+ unity_scope_dbus_connector_get_scope@Base 0replaceme
+ unity_scope_dbus_connector_get_type@Base 0replaceme
+ unity_scope_dbus_connector_new@Base 0replaceme
+ unity_scope_dbus_connector_quit@Base 0replaceme
+ unity_scope_dbus_connector_run@Base 0replaceme
+ unity_scope_dbus_connector_unexport@Base 0replaceme
+ unity_scope_result_copy@Base 0replaceme
+ unity_scope_result_create@Base 0replaceme
+ unity_scope_result_destroy@Base 0replaceme
+ unity_scope_result_dup@Base 0replaceme
+ unity_scope_result_free@Base 0replaceme
+ unity_scope_result_get_type@Base 0replaceme
+ unity_scope_search_base_construct@Base 0replaceme
+ unity_scope_search_base_get_type@Base 0replaceme
+ unity_scope_search_base_run@Base 0replaceme
+ unity_scope_search_base_run_async@Base 0replaceme
+ unity_scope_search_base_set_search_context@Base 0replaceme
+ unity_search_context_copy@Base 0replaceme
+ unity_search_context_create@Base 0replaceme
+ unity_search_context_destroy@Base 0replaceme
+ unity_search_context_dup@Base 0replaceme
+ unity_search_context_free@Base 0replaceme
+ unity_search_context_get_type@Base 0replaceme
+ unity_search_metadata_construct@Base 0replaceme
+ unity_search_metadata_create@Base 0replaceme
+ unity_search_metadata_get_locale@Base 0replaceme
+ unity_search_metadata_get_type@Base 0replaceme
+ unity_search_metadata_new@Base 0replaceme
  unity_search_type_get_type@Base 5.0.0
- unity_series_item_construct@Base 5.92.0
- unity_series_item_get_icon_hint@Base 5.92.0
- unity_series_item_get_title@Base 5.92.0
- unity_series_item_get_type@Base 5.92.0
- unity_series_item_get_uri@Base 5.92.0
- unity_series_item_new@Base 5.92.0
- unity_series_preview_construct@Base 5.90.0
- unity_series_preview_get_active_preview@Base 5.90.0
- unity_series_preview_get_current_item_uri@Base 5.92.0
- unity_series_preview_get_type@Base 5.90.0
- unity_series_preview_new@Base 5.90.0
+ unity_serialization_type_get_type@Base 0replaceme
  unity_social_preview_add_comment@Base 6.5.2
  unity_social_preview_comment_construct@Base 6.5.2
  unity_social_preview_comment_get_id@Base 6.5.2
@@ -639,18 +739,9 @@
  unity_specific_item_manager_get_consumer@Base 4.0.0
  unity_specific_item_manager_get_type@Base 4.0.0
  unity_specific_item_manager_new@Base 4.0.0
- unity_string_array_wrapper_construct@Base 3.4.6
- unity_string_array_wrapper_get_type@Base 3.4.6
+ unity_string_array_wrapper_free@Base 0replaceme
  unity_string_array_wrapper_new@Base 3.4.6
- unity_string_array_wrapper_ref@Base 3.4.6
  unity_string_array_wrapper_take_strings@Base 4.0.6
- unity_string_array_wrapper_unref@Base 3.4.6
- unity_tools_construct@Base 4.0.0
- unity_tools_get_type@Base 4.0.0
- unity_tools_hash_table_to_asv@Base 4.0.0
- unity_tools_new@Base 4.0.0
- unity_tools_ref@Base 4.0.0
- unity_tools_unref@Base 4.0.0
  unity_trace_log_object_real@Base 5.0.0
  unity_trace_log_object_va@Base 5.0.0
  unity_track_metadata_construct@Base 4.0.0
@@ -674,9 +765,3 @@
  unity_track_metadata_set_title@Base 4.0.0
  unity_track_metadata_set_track_no@Base 5.92.0
  unity_track_metadata_set_uri@Base 5.92.0
- unity_value_get_string_array_wrapper@Base 3.4.6
- unity_value_get_tools@Base 4.0.0
- unity_value_set_string_array_wrapper@Base 3.4.6
- unity_value_set_tools@Base 4.0.0
- unity_value_take_string_array_wrapper@Base 3.4.6
- unity_value_take_tools@Base 4.0.0

=== modified file 'debian/rules'
--- debian/rules	2012-11-16 16:37:17 +0000
+++ debian/rules	2013-03-25 11:25:26 +0000
@@ -20,6 +20,8 @@
 	rm debian/tmp/usr/lib/*/libunity/*.*a
 	rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
 	rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
+	rm debian/tmp/usr/share/unity-scopes/*.pyc
+	rm debian/tmp/usr/share/unity-scopes/*.pyo
 	dh_install --fail-missing
 
 override_dh_gencontrol:

=== added file 'debian/unity-scopes-runner.install'
--- debian/unity-scopes-runner.install	1970-01-01 00:00:00 +0000
+++ debian/unity-scopes-runner.install	2013-03-25 11:25:26 +0000
@@ -0,0 +1,1 @@
+usr/share/unity-scopes/scope-runner-dbus.py

=== modified file 'doc/reference/Makefile.am'
--- doc/reference/Makefile.am	2012-10-17 11:49:15 +0000
+++ doc/reference/Makefile.am	2013-03-25 11:25:26 +0000
@@ -13,6 +13,7 @@
 
 VALADOC_FLAGS = \
 	--force \
+	--target-glib=2.32 \
 	--driver "$(DRIVER_VERSION)" \
 	$(LIBUNITY_PACKAGES) \
 	--vapidir $(top_builddir)/protocol \

=== modified file 'extras/Makefile.am'
--- extras/Makefile.am	2012-12-03 12:28:26 +0000
+++ extras/Makefile.am	2013-03-25 11:25:26 +0000
@@ -44,7 +44,6 @@
 
 libunity_extras_la_VALASOURCES = \
 	unity-extra-preview-player-client.vala \
-	unity-extra-preview-player-controller.vala \
 	unity-extra-utils.vala \
 	$(NULL)
 
@@ -85,6 +84,7 @@
 	$(AM_V_GEN) $(VALAC) $(libunity_extras_la_VALAFLAGS) $^
 	@sed -i -e 's/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="Unity" shared-library="libunity-extras.so.@LIBUNITY_LT_CURRENT@">/g' UnityExtras-@GIR_VERSION@.gir
 	@sed -i -e 's/"Extras/"/;s/"extras_/"/' UnityExtras-@GIR_VERSION@.gir
+	@sed -i -e 's/<parameter name="scope_creation_cb" transfer-ownership="none"/<parameter name="scope_creation_cb" transfer-ownership="none" scope="call"/' UnityExtras-@GIR_VERSION@.gir
 	@touch $@
 
 BUILT_SOURCES += libunity_extras_la_vala.stamp

=== removed file 'extras/unity-extra-preview-player-controller.vala'
--- extras/unity-extra-preview-player-controller.vala	2012-10-17 09:06:50 +0000
+++ extras/unity-extra-preview-player-controller.vala	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2012 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 Pawel Stolowski <[e-mail]>
- */
-
-[CCode (gir_namespace = "UnityExtras", gir_version = "1.0")]
-namespace Unity.Extras
-{
-  /**
-   * Helper class for controlling PreviewPlayer and keeping MusicPreview up-to-date
-   * with playback progress. It maintans an instance of PreviewPlayer, connects it
-   * to active_preview signals, subscribes to progress signal and updates preview
-   * state accordingly during playback. Playback is controlled by play/pause
-   * signals from active_preview.
-   */
-  public class PreviewPlayerController: GLib.Object
-  {
-    private PreviewPlayer preview_player;
-    private Unity.MusicPreview active_preview_;
-    private ulong play_sig_id_;
-    private ulong pause_sig_id_;
-    private ulong closed_sig_id_;
-
-    public Unity.MusicPreview active_preview
-    {
-      get
-      {
-        return active_preview_;
-      }
-      set
-      {
-        disconnect_signals ();
-
-        active_preview_ = value;
-        if (value != null)
-        {
-          play_sig_id_ = active_preview_.play.connect (play);
-          pause_sig_id_ = active_preview_.pause.connect (pause);
-          closed_sig_id_ = active_preview_.closed.connect (closed);
-        }
-      }
-    }
-
-    public PreviewPlayerController ()
-    {
-    }
-
-    ~PreviewPlayerController ()
-    {
-      disconnect_signals ();
-    }
-
-    private void disconnect_signals ()
-    {
-      if (active_preview_ != null)
-      {
-        if (play_sig_id_ > 0)
-        {
-          active_preview_.disconnect (play_sig_id_);
-          play_sig_id_ = 0;
-        }
-        if (pause_sig_id_ > 0)
-        {
-          active_preview_.disconnect (pause_sig_id_);
-          pause_sig_id_ = 0;
-        }
-        if (closed_sig_id_ > 0)
-        {
-          active_preview_.disconnect (closed_sig_id_);
-          closed_sig_id_ = 0;
-        }
-      }
-    }
-
-    private void on_progress_changed (string uri, Unity.MusicPreview.TrackState state, double progress)
-    {
-      if (active_preview_ != null)
-      {
-          active_preview_.current_track_uri = uri;
-          active_preview_.current_track_state = state;
-          active_preview_.current_progress = (float)progress;
-        }
-      }
-
-    private void closed (Unity.Preview preview)
-    {
-      if (preview_player != null)
-      {
-        try
-        {
-          preview_player.close ();
-        }
-        catch (Error e)
-        {
-          warning ("Failed to close preview player: %s", e.message);
-        }
-      }
-    }
-
-    private void play (Unity.Preview preview, string uri)
-    {
-      debug ("play request: '%s'", uri);
-
-      try
-      {
-        if (preview_player == null)
-        {
-          preview_player = new PreviewPlayer ();
-          preview_player.progress.connect (on_progress_changed);
-        }
-
-        // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
-        active_preview_.current_track_uri = uri;
-        active_preview_.current_progress = 0.0f;
-        active_preview_.current_track_state = Unity.MusicPreview.TrackState.PLAYING;
-
-        preview_player.play (uri);
-      }
-      catch (Error e)
-      {
-        warning ("Failed to play '%s': %s", uri, e.message);
-      }
-    }
-
-    private void pause (Unity.Preview preview, string uri)
-    {
-      debug ("pause request: '%s'", uri);
-
-      try
-      {
-        if (preview_player != null)
-        {
-          // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
-          active_preview_.current_track_uri = uri;
-          active_preview_.current_track_state = Unity.MusicPreview.TrackState.PAUSED;
-
-          preview_player.pause ();
-        }
-      }
-      catch (Error e)
-      {
-        warning ("Failed to pause '%s': %s", uri, e.message);
-      }
-    }
-  }
-}

=== modified file 'extras/unity-extra-utils.vala'
--- extras/unity-extra-utils.vala	2012-11-27 15:57:49 +0000
+++ extras/unity-extra-utils.vala	2013-03-25 11:25:26 +0000
@@ -104,15 +104,15 @@
    * still fail even after executing the callback.
    *
    * @param name DBus name to own
-   * @param cb callback that creates Lens/Scope object
+   * @param scope_creation_cb callback that creates Lens/Scope object
    * @return application instance (on success)
    */
-  public static GLib.Application? dbus_own_name (string name, CreateScopeCallback cb) throws Error
+  public static GLib.Application? dbus_own_name (string name, CreateScopeCallback scope_creation_cb) throws Error
   {
     GLib.Application? app = null;
     if (!dbus_name_has_owner (name))
     {
-      cb ();
+      scope_creation_cb ();
 
       app = new Application (name, ApplicationFlags.IS_SERVICE);
       app.register ();
@@ -128,4 +128,4 @@
     }
     return app;
   }
-}
\ No newline at end of file
+}

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-09-26 07:34:03 +0000
+++ po/POTFILES.in	2013-03-25 11:25:26 +0000
@@ -1,4 +1,4 @@
 [encoding: UTF-8]
-tools/dbus-lens-connect.ui
+tools/dbus-scope-connect.ui
 tools/unity-tool.vala
 tools/unity-tool.ui

=== modified file 'protocol/Makefile.am'
--- protocol/Makefile.am	2012-08-07 12:31:44 +0000
+++ protocol/Makefile.am	2013-03-25 11:25:26 +0000
@@ -2,7 +2,7 @@
 BUILT_SOURCES =
 CLEANFILES =
 EXTRA_DIST =
-EXTRA_FLAGS =
+EXTRA_FLAGS = -g
 
 protolibdir = $(libdir)/libunity
 protolib_LTLIBRARIES = \
@@ -59,9 +59,12 @@
 
 libunity_protocol_private_la_VALASOURCES = \
   protocol-icon.vala \
-  protocol-lens-interface.vala \
   protocol-scope-interface.vala \
   protocol-previews.vala \
+  protocol-scope-discovery.vala \
+  protocol-preview-player.vala \
+  unity-scope-proxy.vala \
+  unity-scope-proxy-remote.vala \
   $(NULL)
 
 libunity_protocol_private_la_GENERATED = \
@@ -85,4 +88,3 @@
   $(libunity_protocol_private_la_GENERATED) \
   $(libunity_protocol_private_la_VALASOURCES:.vala=.c) \
   $(NULL)
-

=== removed file 'protocol/protocol-lens-interface.vala'
--- protocol/protocol-lens-interface.vala	2012-11-05 21:09:31 +0000
+++ protocol/protocol-lens-interface.vala	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library 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 Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-using GLib;
-using Dee;
-
-namespace Unity.Protocol {
-
-/* The raw type that get's passed over DBus to Unity */
-public struct LensInfo
-{
-  public string dbus_path;
-  public bool search_in_global;
-  public bool visible;
-  public string search_hint;
-  public string private_connection_name;
-  public string results_model_name;
-  public string global_results_model_name;
-  public string categories_model_name;
-  public string filters_model_name;
-  public HashTable<string, Variant> hints;
-}
-
-/* The error types that can be thrown from DBus methods */
-[DBus (name = "com.canonical.Unity.LensError")]
-public errordomain LensError
-{
-  FAILED,
-  INVALID_SCOPE
-}
-
-
-public enum HandledType
-{
-  NOT_HANDLED,
-  SHOW_DASH,
-  HIDE_DASH,
-  GOTO_DASH_URI,
-  SHOW_PREVIEW
-}
-
-public enum ActionType
-{
-  ACTIVATE_RESULT,
-  PREVIEW_RESULT,
-  PREVIEW_ACTION,
-  PREVIEW_BUILTIN_ACTION
-}
-
-public enum ViewType
-{
-  HIDDEN,
-  HOME_VIEW,
-  LENS_VIEW
-}
-
-/**
- * LensService:
- *
- * The Lens interface exported on DBus
- */
-[DBus (name = "com.canonical.Unity.Lens")]
-public interface LensService : GLib.Object
-{
-  public async abstract void info_request () throws IOError;
-
-  // FIXME: should have the hints param and activate_with_hints should go away
-  public async abstract ActivationReplyRaw activate (
-      string uri, uint action_type) throws IOError, LensError;
-
-  public async abstract ActivationReplyRaw activate_with_hints (
-      string uri, uint action_type, HashTable<string, Variant> hints) throws IOError, LensError;
-
-  public async abstract HashTable<string, Variant> update_preview_property (string uri, HashTable<string, Variant> values) throws IOError, LensError;
-
-  public async abstract HashTable<string, Variant> search (
-      string search_string, HashTable<string, Variant> hints) throws IOError;
-
-  public async abstract HashTable<string, Variant> global_search (
-      string search_string, HashTable<string, Variant> hints) throws IOError;
-  
-  public async abstract void update_filter (string filter_name,
-                                            HashTable<string, Variant> properties) throws IOError;
-  
-  public async abstract void set_view_type (uint view_type) throws IOError;
-  
-  public signal void changed (LensInfo lens_info);
-}
-
-} /* namespace unity */

=== added file 'protocol/protocol-preview-player.vala'
--- protocol/protocol-preview-player.vala	1970-01-01 00:00:00 +0000
+++ protocol/protocol-preview-player.vala	2013-03-25 11:25:26 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2012 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 Pawel Stolowski <[e-mail]>
+ */
+
+namespace Unity.Protocol
+{
+
+[DBus (name = "com.canonical.Unity.Lens.Music.PreviewPlayer")]
+internal interface PreviewPlayerService: GLib.Object
+{
+  public signal void progress (string uri, uint32 state, double progress);
+
+  public abstract async void play (string uri) throws Error;
+  public abstract async void pause () throws Error;
+  public abstract async void pause_resume () throws Error;
+  public abstract async void resume () throws Error;
+  public abstract async void stop () throws Error;
+  public abstract async void close () throws Error;
+  public abstract async HashTable<string, Variant> video_properties (string uri) throws Error;
+}
+
+/**
+ * Client class for preview player DBus interface (com.canonical.Unity.Lens.Music.PreviewPlayer).
+ */
+public class PreviewPlayer: GLib.Object
+{
+  static const string PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer";
+  static const string PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer";
+
+  /**
+   * Reports progress of playback for given track uri.
+   */
+  public signal void progress (string uri, PlayState state, double progress);
+
+  private async void connect_to () throws Error
+  {
+    _preview_player_service = yield Bus.get_proxy (BusType.SESSION, PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH);
+    _preview_player_service.progress.connect (on_progress_signal);
+  }
+
+  public async void play (string uri) throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.play (uri);
+  }
+
+  public async void pause () throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.pause ();
+  }
+
+  public async void pause_resume () throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.pause_resume ();
+  }
+
+  public async void resume () throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.resume ();
+  }
+
+  public async void stop () throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.stop ();
+  }
+
+  public async void close () throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    yield _preview_player_service.close ();
+  }
+
+  public async HashTable<string, Variant> video_properties (string uri) throws Error
+  {
+    if (_preview_player_service == null)
+    {
+      yield connect_to ();
+    }
+    var props = yield _preview_player_service.video_properties (uri);
+    return props;
+  }
+
+  internal void on_progress_signal (string uri, uint32 state, double progress_value)
+  {
+    progress (uri, (PlayState) state, progress_value);
+  }
+
+  private PreviewPlayerService _preview_player_service;
+}
+}

=== modified file 'protocol/protocol-previews.vala'
--- protocol/protocol-previews.vala	2012-12-10 14:44:07 +0000
+++ protocol/protocol-previews.vala	2013-03-25 11:25:26 +0000
@@ -476,6 +476,7 @@
 
   public string track_data_swarm_name { get; set; }
   public string track_data_address { get; set; }
+  public Dee.SerializableModel track_model { get; set; }
 
   public MusicPreview ()
   {
@@ -496,18 +497,9 @@
 
     if (track_data_address != null)
       properties["track-data-address"] = track_data_address;
-  }
-
-  public void play_uri (string uri)
-  {
-    add_update ("action", "play");
-    add_update ("uri", uri);
-  }
-
-  public void pause_uri (string uri)
-  {
-    add_update ("action", "pause");
-    add_update ("uri", uri);
+
+    if (track_model != null)
+      properties["track-model"] = track_model.serialize ();
   }
 
   static construct
@@ -527,6 +519,11 @@
         (v) => { result.track_data_swarm_name = v.get_string (); });
       Preview.checked_set (properties["track-data-address"],
         (v) => { result.track_data_address= v.get_string (); });
+      Preview.checked_set (properties["track-model"], (v) =>
+      {
+        var model = Dee.Serializable.parse (v, typeof (Dee.SequenceModel));
+        result.track_model = model as Dee.SerializableModel;
+      });
 
       return result;
     });

=== added file 'protocol/protocol-scope-discovery.vala'
--- protocol/protocol-scope-discovery.vala	1970-01-01 00:00:00 +0000
+++ protocol/protocol-scope-discovery.vala	2013-03-25 11:25:26 +0000
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Pawel Stolowski <[e-mail]>
+ *
+ */
+
+namespace Unity.Protocol
+{
+
+  private static const string SCOPES_DIR = "unity/scopes";
+
+  errordomain ParseError
+  {
+    INVALID_METADATA,
+    FILE_NOT_FOUND,
+    INVALID_PATH,
+    UNKNOWN_FILE
+  }
+
+  public class MetaDataColumnInfo
+  {
+    public string name { get; internal set; }
+    public string type_id { get; internal set; }
+
+    /**
+     * Creates MetaDataColumnInfo from a string in format "name[t]", where 't' is GVariant type.
+     */
+    public MetaDataColumnInfo (string v) throws Error
+    {
+      int idx = v.index_of ("[");
+      if (idx > 0 && v.index_of ("]") == v.length - 1) //there must be at least 1 character preceding [, thus > 0
+      {
+        name = v.substring (0, idx);
+        type_id = v.slice (idx + 1, v.length - 1);
+      }
+      else
+      {
+        throw new ParseError.INVALID_METADATA ("Invalid format of meta data string");
+      }
+    }
+
+    public virtual bool equals (MetaDataColumnInfo m)
+    {
+      return name == m.name && type_id == m.type_id;
+    }
+  }
+
+  public class MetaDataSchemaInfo
+  {
+    public GLib.GenericArray<MetaDataColumnInfo> columns;
+
+    /**
+     * Creates a list of MetaDataColumnInfo objects from a semicolon-separated strings, e.g. "name1[type];name2[type2]...".
+     *
+     * @param mdinfo_str semicolon-separated name[type] entries
+     * @return list of MetaDataColumnInfo objects
+     */
+    public static MetaDataSchemaInfo from_string (string mdinfo_str) throws Error
+    {
+      var schema_info = new MetaDataSchemaInfo ();
+      schema_info.columns = new GLib.GenericArray<MetaDataColumnInfo> ();
+
+      foreach (var m in mdinfo_str.split (";"))
+      {
+        if (m.length > 0)
+        {
+          var info = new MetaDataColumnInfo (m);
+          schema_info.columns.add (info);
+        }
+      }
+      return schema_info;
+    }
+
+    public HashTable<string, string> as_hash_table ()
+    {
+      HashTable<string, string> ret = new HashTable<string, string> (str_hash, str_equal);
+
+      for (int i = 0; i < columns.length; i++)
+      {
+        unowned MetaDataColumnInfo info = columns[i];
+        ret[info.name] = info.type_id;
+      }
+
+      return ret;
+    }
+
+    public bool equals (MetaDataSchemaInfo s)
+    {
+      if (columns.length != s.columns.length)
+        return false;
+      for (int i = 0; i < columns.length; i++)
+      {
+        if (!columns[i].equals (s.columns[i]))
+          return false;
+      }
+      return true;
+    }
+  }
+
+  public class ScopeRegistry
+  {
+    private static const string SCOPE_GROUP = "Scope";
+
+    public class ScopeMetadata
+    {
+      public string id;
+      public string full_path;
+      public string name;
+      public string dbus_path;
+      public string dbus_name;
+      public string icon;
+      public string category_icon;
+      public MetaDataSchemaInfo? required_metadata;
+      public MetaDataSchemaInfo? optional_metadata;
+      public GLib.SList<string> keywords;
+      public string type;
+      public string description;
+      public string search_hint;
+      public bool is_master;
+      public bool global_searches;
+      public bool visible;
+      public bool remote_content;
+      public string query_binary;
+      public string query_pattern;
+      public string shortcut;
+
+      public void load_from_key_file (KeyFile file) throws Error
+      {
+        // required fields
+        this.name = file.get_string (SCOPE_GROUP, "Name");
+        this.dbus_name = file.get_string (SCOPE_GROUP, "DBusName");
+        this.dbus_path = file.get_string (SCOPE_GROUP, "DBusPath");
+        this.icon = file.get_string (SCOPE_GROUP, "Icon");
+        this.type = file.get_string (SCOPE_GROUP, "Type");
+
+        // optional fields
+        if (file.has_key (SCOPE_GROUP, "IsMaster"))
+          this.is_master = file.get_boolean (SCOPE_GROUP, "IsMaster");
+        else
+          this.is_master = false;
+
+        if (file.has_key (SCOPE_GROUP, "Visible"))
+          this.visible = file.get_boolean (SCOPE_GROUP, "Visible");
+        else
+          this.visible = true;
+
+        if (file.has_key (SCOPE_GROUP, "GlobalSearches"))
+          this.global_searches = file.get_boolean (SCOPE_GROUP, "GlobalSearches");
+        else
+          this.global_searches = false;
+
+        if (file.has_key (SCOPE_GROUP, "RemoteContent"))
+          this.remote_content = file.get_boolean (SCOPE_GROUP, "RemoteContent");
+        else
+          this.remote_content = false;
+
+        if (file.has_key (SCOPE_GROUP, "QueryBinary"))
+          this.query_binary = file.get_string (SCOPE_GROUP, "QueryBinary");
+
+        if (file.has_key (SCOPE_GROUP, "CategoryIcon"))
+          this.category_icon = file.get_string (SCOPE_GROUP, "CategoryIcon");
+
+        if (file.has_key (SCOPE_GROUP, "QueryPattern"))
+          this.query_pattern = file.get_string (SCOPE_GROUP, "QueryPattern");
+
+        if (file.has_key (SCOPE_GROUP, "Description"))
+          this.description = file.get_string (SCOPE_GROUP, "Description");
+
+        if (file.has_key (SCOPE_GROUP, "SearchHint"))
+          this.search_hint = file.get_string (SCOPE_GROUP, "SearchHint");
+
+        if (file.has_key (SCOPE_GROUP, "RequiredMetadata"))
+          this.required_metadata = MetaDataSchemaInfo.from_string (file.get_string (SCOPE_GROUP, "RequiredMetadata"));
+
+        if (file.has_key (SCOPE_GROUP, "OptionalMetadata"))
+          this.optional_metadata = MetaDataSchemaInfo.from_string (file.get_string (SCOPE_GROUP, "OptionalMetadata"));
+
+        if (file.has_key (SCOPE_GROUP, "Keywords"))
+        {
+          // split keywords
+          this.keywords = new GLib.SList<string> ();
+          foreach (var k in file.get_string (SCOPE_GROUP, "Keywords").split (";"))
+          {
+            if (k.length > 0)
+              this.keywords.append (k);
+          }
+        }
+
+        if (file.has_key (SCOPE_GROUP, "Shortcut"))
+        {
+          this.shortcut = file.get_string (SCOPE_GROUP, "Shortcut");
+        }
+      }
+
+      public static ScopeMetadata for_id (string scope_id) throws Error
+      {
+        debug ("for_id: %s", scope_id);
+
+        string full_path;
+        var file = new KeyFile ();
+        var path = "%s/%s".printf (SCOPES_DIR, scope_id);
+        bool loaded = file.load_from_data_dirs (path, out full_path,
+                                                KeyFileFlags.NONE);
+
+        if (!loaded)
+            throw new ParseError.FILE_NOT_FOUND ("Scope not found: %s", scope_id);
+
+        ScopeMetadata data = new ScopeMetadata ();
+        data.id = scope_id;
+        data.full_path = full_path;
+
+        data.load_from_key_file (file);
+
+        return data;
+      }
+    }
+
+    // node representing single scope, with optional sub-scopes (if master scope)
+    public class ScopeRegistryNode
+    {
+      public ScopeMetadata scope_info;
+      public GLib.SList<ScopeMetadata?>? sub_scopes;
+    }
+
+    // list of top-level scopes
+    private SList<ScopeRegistryNode> scopes_ = new SList<ScopeRegistryNode> ();
+    public GLib.SList<ScopeRegistryNode>? scopes
+    {
+      get { return scopes_; }
+    }
+
+    private ScopeRegistry ()
+    {
+    }
+
+    internal static async ScopeMetadata? parse_scope_file (string path, string? master_prefix) throws Error
+    {
+      debug ("parse_scope_file: %s, master_prefix = %s", path, master_prefix);
+
+      bool loaded = true;
+      ScopeMetadata data = new ScopeMetadata ();
+
+      var file = new KeyFile ();
+      if (GLib.Path.is_absolute (path))
+      {
+        loaded = file.load_from_file (path, KeyFileFlags.NONE);
+        data.full_path = path;
+      }
+      else
+      {
+        loaded = file.load_from_data_dirs (path, out data.full_path, KeyFileFlags.NONE);
+      }
+
+      if (!loaded)
+        throw new ParseError.FILE_NOT_FOUND ("File not found: %s", path);
+
+      data.load_from_key_file (file);
+
+      var basename = GLib.Path.get_basename (path);
+      data.id = basename;
+      if (master_prefix != null && master_prefix.length > 0)
+        data.id = "%s-%s".printf (master_prefix, basename);
+
+      debug ("parse_scope_file: %s finished", path);
+      return data;
+    }
+
+    /**
+     * Process .scope file and scopes in a subdirectory if it's master scope.
+     *
+     * @param filename path of a .scope file
+     */
+    private async void process_scope (string filename, string? master_scope_prefix = null) throws Error
+    {
+      debug ("process_scope: %s", filename);
+
+      ScopeMetadata? scope_data = null;
+      scope_data = yield parse_scope_file (filename, master_scope_prefix); // this may throw, in such case don't process this scope (and possibly its subscopes if it was master scope)
+
+      if (scope_data != null)
+      {
+        var scope_node = new ScopeRegistryNode ()
+        {
+          scope_info = scope_data,
+          sub_scopes = null
+        };
+
+        if (scope_data.is_master)
+        {
+          // check if there is a subdirectory with the name of master scope.
+          // note that failure on single sub-scope shouldn't disable master & valid sub-scopes.
+          var scopefile = GLib.File.new_for_path (scope_data.full_path);
+          string scope_name = remove_scope_extension (scope_data.id);
+          var parent = scopefile.get_parent ();
+          if (parent != null)
+          {
+            string check_path = Path.build_filename (parent.get_path (), scope_name);
+
+            if (FileUtils.test (check_path, FileTest.IS_DIR))
+            {
+              GLib.Dir? scope_subdir = null;
+              try
+              {
+                scope_subdir = GLib.Dir.open (check_path);
+              }
+              catch (FileError e)
+              {
+                warning ("Error accessing directory %s", check_path);
+              }
+
+              if (scope_subdir != null)
+              {
+                // iterate over all files, find .*scope
+                string slave_scope_filename;
+                while ((slave_scope_filename = scope_subdir.read_name ()) != null)
+                {
+                  slave_scope_filename = Path.build_filename (check_path, slave_scope_filename);
+                  ScopeMetadata? slave_scope_data = null;
+                  try
+                  {
+                    slave_scope_data = yield parse_scope_file (slave_scope_filename, scope_name);
+                  }
+                  catch (Error e)
+                  {
+                    warning ("Failed to process '%s': %s", slave_scope_filename, e.message);
+                  }
+                  if (slave_scope_data != null)
+                  {
+                    if (scope_node.sub_scopes == null)
+                      scope_node.sub_scopes = new GLib.SList<ScopeMetadata?> ();
+
+                    scope_node.sub_scopes.append (slave_scope_data);
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        scopes_.append (scope_node);
+      }
+    }
+
+    /**
+     * Build registry of all scopes in start_path.
+     * start_path can be a directory, a .scope file path or just scope id (.scope file name, including extenstion).
+     *
+     * @param start_path starting directory or specific .scope file
+     * @return registry of all scopes (if start_path is a dir) or just one scope and its subscopes.
+     */
+    public static async ScopeRegistry find_scopes (string start_path) throws Error
+    {
+      var reg = yield find_scopes_for_master (start_path, null);
+      return reg;
+    }
+
+    /**
+     * Build registry of all scopes in start_path.
+     * start_path can be a directory, a .scope file path or just scope id (.scope file name, including extenstion).
+     *
+     * @param start_path starting directory or specific .scope file
+     * @return registry of all scopes (if start_path is a dir) or just one scope and its subscopes.
+     */
+    private static async ScopeRegistry find_scopes_for_master (string start_path, string? master_prefix) throws Error
+    {
+      debug ("find_scopes_for_master: %s\n", start_path);
+
+      var reg = new ScopeRegistry ();
+
+      if (FileUtils.test (start_path, FileTest.IS_DIR))
+      {
+        var dir = GLib.Dir.open (start_path);
+        string name;
+
+        while ((name = dir.read_name ()) != null)
+        {
+          string filename = Path.build_filename (start_path, name);
+          if (filename.has_suffix (".scope"))
+          {
+            debug ("Found scope file: %s", filename);
+            try // failure of single scope shouldn't break processing of others scopes
+            {
+              yield reg.process_scope (filename, master_prefix);
+            }
+            catch (Error e)
+            {
+              warning ("Failed to process '%s': %s", filename, e.message);
+            }
+          }
+        }
+      }
+      else
+      {
+        if (start_path.has_suffix (".scope"))
+        {
+          yield reg.process_scope (start_path); // no try-catch here, as request for specific scope file should fail on error
+        }
+        else
+        {
+          throw new ParseError.UNKNOWN_FILE ("Unknown file type");
+        }
+      }
+      debug ("find_scopes_for_master finished");
+      return reg;
+    }
+
+    internal static string remove_scope_extension (string scope_id)
+    {
+      if (scope_id.has_suffix (".scope"))
+        return scope_id.substring (0, scope_id.last_index_of ("."));
+      return scope_id;
+    }
+
+    /**
+     * Find sub-scopes for given master scope id in unity/scopes subdirectory
+     * of XDG_DATA_DIRS dirs or in root_path.
+     * @param scope_id id of a master scope (with or without .scope suffix)
+     * @param root_path base directory of scopes, defaults to XDG_DATA_DIRS paths + "/unity/scopes"
+     * @return scope registry with scopes property populated with all sub-scopes of the master scope.
+     */
+    public static async ScopeRegistry find_scopes_for_id (string scope_id, string? root_path = null) throws Error
+    {
+      debug ("find_scopes_for_id: %s", scope_id);
+
+      string[]? dirs = null;
+      if (root_path == null)
+      {
+        dirs = GLib.Environment.get_system_data_dirs ();
+      }
+      else
+      {
+        dirs = new string [1] {root_path};
+      }
+
+      if (dirs == null || dirs.length == 0)
+      {
+        throw new ParseError.INVALID_PATH ("Invalid scopes path");
+      }
+
+      var sc = remove_scope_extension (scope_id);
+      foreach (var path in dirs)
+      {
+        var check_path = root_path == null ? Path.build_path (Path.DIR_SEPARATOR_S, path, SCOPES_DIR, sc) : Path.build_path (Path.DIR_SEPARATOR_S, root_path, sc);
+        if (FileUtils.test (check_path, FileTest.IS_DIR))
+        {
+          var reg = yield find_scopes_for_master (check_path, sc);
+          return reg;
+        }
+      }
+
+      debug ("No sub-scopes directory found for master scope %s", scope_id);
+      return new ScopeRegistry ();
+    }
+  }
+}  /* namespace unity */

=== modified file 'protocol/protocol-scope-interface.vala'
--- protocol/protocol-scope-interface.vala	2012-09-03 09:55:45 +0000
+++ protocol/protocol-scope-interface.vala	2013-03-25 11:25:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Canonical, Ltd.
+ * Copyright (C) 2011-2012 Canonical, Ltd.
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License
@@ -15,7 +15,7 @@
  * <http://www.gnu.org/licenses/>.
  *
  * Authored by Neil Jagdish Patel <[e-mail]>
- *
+ *             Michal Hruby <[e-mail]>
  */
 
 using GLib;
@@ -24,18 +24,6 @@
 namespace Unity.Protocol {
 
 /* The raw structs that get's passed over DBus to/from the parent Lens */
-public struct ScopeInfo
-{
-  public string dbus_path;
-  public Variant sources;
-  public bool search_in_global;
-  public string private_connection_name;
-  public string results_model_name;
-  public string global_results_model_name;
-  public string filters_model_name;
-  public HashTable<string, Variant> hints;
-}
-
 public struct ActivationReplyRaw
 {
   public string uri;
@@ -43,10 +31,51 @@
   public HashTable<string, Variant> hints;
 }
 
+public enum HandledType
+{
+  NOT_HANDLED,
+  SHOW_DASH,
+  HIDE_DASH,
+  GOTO_DASH_URI,
+  SHOW_PREVIEW
+}
+
+public enum ActionType
+{
+  ACTIVATE_RESULT,
+  PREVIEW_RESULT,
+  PREVIEW_ACTION,
+  PREVIEW_BUILTIN_ACTION
+}
+
+public enum ViewType
+{
+  HIDDEN,
+  HOME_VIEW,
+  LENS_VIEW
+}
+
+public enum ChannelType
+{
+  DEFAULT,
+  GLOBAL
+}
+
+[Flags]
+public enum ChannelFlags
+{
+  NONE,
+  PRIVATE,
+  NO_FILTERING
+}
+
 /* The error types that can be thrown from DBus methods */
 [DBus (name = "com.canonical.Unity.ScopeError")]
 public errordomain ScopeError
 {
+  REQUEST_FAILED,
+  DATA_MISMATCH,
+  INVALID_CHANNEL,
   SEARCH_CANCELLED,
   UNKNOWN
 }
@@ -59,27 +88,60 @@
 [DBus (name = "com.canonical.Unity.Scope")]
 public interface ScopeService : GLib.Object
 {
-  public abstract async void info_request () throws IOError;
+  public const string INTERFACE_NAME = "com.canonical.Unity.Scope";
 
+  /* Methods */
   public abstract async ActivationReplyRaw activate (
-      string uri, uint action_type, HashTable<string, Variant> hints) throws IOError;
-
-  public abstract async HashTable<string, Variant> update_preview_property (
-      string uri, HashTable<string, Variant> values) throws IOError;
+      string channel_id,
+      Variant[] result_arr,
+      uint action_type,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null) throws IOError, ScopeError;
 
   public abstract async HashTable<string, Variant> search (
-      string search_string,
-      HashTable<string, Variant> hints) throws IOError, ScopeError;
-
-  public abstract async HashTable<string, Variant> global_search (
-      string search_string,
-      HashTable<string, Variant> hints) throws IOError, ScopeError;
-  
+      string channel_id,
+      string search_string,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null) throws IOError, ScopeError;
+
+  public abstract async string open_channel (
+      uint channel_type,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null,
+      out HashTable<string, Variant> out_hints) throws IOError;
+
+  public abstract async void close_channel (
+      string channel_id,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null) throws IOError, ScopeError;
+
+  public abstract async void push_results (
+          string channel_id,
+          string source_scope_id,
+          Variant result,
+          string[] categories,
+          Cancellable? cancellable = null) throws IOError, ScopeError;
+
+  /* do we still need this? */
   public abstract async void set_view_type (uint view_type) throws IOError;
 
-  public abstract async void set_active_sources (string[] sources) throws IOError;
-  
-  public signal void changed (ScopeInfo lens_info);
+  /* Signals */
+  public signal void category_order_changed (
+      string channel_id, uint32[] new_order);
+
+  public signal void filter_settings_changed (
+      string channel_id,
+      [DBus (signature = "a(ssssa{sv}bbb)")] Variant filter_rows);
+
+  /* Properties */
+  public abstract bool visible { get; }
+  public abstract bool is_master { get; }
+  public abstract string search_hint { owned get; }
+  public abstract HashTable<string, string> metadata { owned get; }
+  public abstract HashTable<string, string> optional_metadata { owned get; }
+  public abstract Variant categories { owned get; }
+  public abstract Variant filters { owned get; }
+  public abstract HashTable<string, Variant> hints { owned get; }
 }
 
 } /* namespace unity */

=== renamed file 'src/unity-scope-proxy-remote.vala' => 'protocol/unity-scope-proxy-remote.vala'
--- src/unity-scope-proxy-remote.vala	2012-09-03 09:55:45 +0000
+++ protocol/unity-scope-proxy-remote.vala	2013-03-25 11:25:26 +0000
@@ -20,119 +20,188 @@
 
 using GLib;
 using Dee;
-using Unity.Protocol;
 
-namespace Unity {
+namespace Unity.Protocol {
 
 private class ScopeProxyRemote : GLib.Object, ScopeProxy
 {
   public string dbus_name { get; construct; }
   public string dbus_path { get; construct; }
 
-  public OptionsFilter sources { get; set; }
-  public bool search_in_global { get; set; }
-  public bool provides_personal_content { get; set; }
-
-  public Dee.SerializableModel results_model {
-    get { return _results_model; }
-    set {
-      _results_model = value as Dee.SharedModel;
-    }
-  }
-
-  public Dee.SerializableModel global_results_model {
-    get { return _global_results_model; }
-    set {
-      _global_results_model = value as Dee.SharedModel;
-    }
-  }
-
-  public Dee.SerializableModel filters_model {
-    get { return _filters_model; }
-    set {
-      _filters_model = value as Dee.SharedModel;
-    }
-  }
+  // really Vala? no "private set;" when inheriting from interface?
+  public bool visible { get { return _visible; } }
+  public bool is_master { get { return _is_master; } }
+  public bool connected { get { return _is_connected; } }
+  public Variant sources { get { return _sources; } }
+  public string search_hint { get { return _search_hint; } }
+  public Dee.SerializableModel filters_model { get { return _filters_model; } }
+  public Dee.SerializableModel categories_model { get { return _categories_model; } }
+  public HashTable<string, string> metadata { get { return _metadata; } }
+  public HashTable<string, string> optional_metadata { get { return _optional_metadata; } }
 
   public ViewType view_type {
+    // FIXME: ehm?!
     get { return _view_type; }
     // make sure we do dbus calls only on changes
-    set { if (_view_type != value) set_view_type (value); }
+    set { if (_view_type != value) set_view_type.begin (value); }
   }
 
+  private bool _visible;
+  private bool _is_master;
+  private bool _is_connected;
+  private Variant _sources;
+  private string _search_hint;
+  private Dee.SerializableModel _filters_model;
+  private Dee.SerializableModel _categories_model;
+  private HashTable<string, string> _metadata;
+  private HashTable<string, string> _optional_metadata;
   private ViewType _view_type;
   private DBusConnection _bus;
-  private uint _watcher;
 
   private ScopeService _service;
+  private bool _connecting_to_proxy;
 
-  private Dee.SharedModel? _results_model;
-  private Dee.SharedModel? _global_results_model;
-  private Dee.SharedModel? _filters_model;
   private uint _reconnection_id = 0;
-  private bool synchronized = false;
   private int64 _last_scope_crash = 0;
   private uint _scope_crashes = 0;
+  private ulong _cat_sig_id = 0;
+  private ulong _filters_sig_id = 0;
 
-  public ScopeProxyRemote (string dbus_name_, string dbus_path_)
+  private ScopeProxyRemote (string dbus_name_, string dbus_path_)
   {
     Object (dbus_name:dbus_name_, dbus_path:dbus_path_);
   }
 
+  /* Vala increments reference count on objects that are associated with
+   * the callbacks in watch_name, therefore this object serves as a proxy, so
+   * that the ScopeProxyRemote instance can be safely reference counted */
+  private class NameWatcher
+  {
+    private uint watch_id;
+    unowned ScopeProxyRemote owner;
+
+    public NameWatcher (DBusConnection bus, string dbus_name,
+                        ScopeProxyRemote parent)
+    {
+      owner = parent;
+      watch_id =
+        Bus.watch_name_on_connection (bus, dbus_name, BusNameWatcherFlags.NONE,
+                                      () => { owner.on_scope_appeared (); },
+                                      () => { owner.on_scope_vanished (); });
+    }
+
+    public void unwatch ()
+    {
+      if (watch_id != 0)
+      {
+        Bus.unwatch_name (watch_id);
+        watch_id = 0;
+      }
+    }
+  }
+
+  private NameWatcher _watcher;
+
   construct
   {
-    sources = new CheckOptionFilter ("sources", "Sources", null, true);
     try {
       _bus = Bus.get_sync (BusType.SESSION);
-      _watcher = Bus.watch_name_on_connection (_bus,
-                                               dbus_name,
-                                               BusNameWatcherFlags.NONE,
-                                               on_scope_appeared,
-                                               on_scope_vanished);
-
-      /* If it doesn't exist when we load up, start it */
-      start_reconnection_timeout ();
+      _watcher = new NameWatcher (_bus, dbus_name, this);
     } catch (Error e) {
       critical (@"Unable to connect to session bus: $(e.message)");
     }
   }
 
+  ~ScopeProxyRemote ()
+  {
+    _watcher.unwatch ();
+  }
+
+  // poor man's AsyncInitable
+  public static async ScopeProxyRemote create (
+      string dbus_name, string dbus_path,
+      Cancellable? cancellable = null) throws Error
+  {
+    // this will always return a valid object, even if the proxy is invalid
+    // (well unless you cancel the request)
+    var proxy = new ScopeProxyRemote (dbus_name, dbus_path);
+    yield proxy.wait_for_proxy ();
+
+    if (cancellable != null) cancellable.set_error_if_cancelled ();
+    return proxy;
+  }
+
+  private signal void proxy_initialized ();
+
+  private async void wait_for_proxy ()
+  {
+    if (_service == null)
+    {
+      var sig_id = this.proxy_initialized.connect (() =>
+      {
+        wait_for_proxy.callback ();
+      });
+
+      yield;
+
+      SignalHandler.disconnect (this, sig_id);
+    }
+  }
+
   private async void connect_to_scope ()
   {
-    try {
+    if (_connecting_to_proxy) return; // can't call this multiple times
+    try
+    {
+      _connecting_to_proxy = true;
       _service = yield _bus.get_proxy (dbus_name, dbus_path);
-      _service.changed.connect (on_changed);
-      yield _service.info_request ();
-
+      // FIXME: do we need to connect to any property changes?
+      DBusProxy proxy = _service as DBusProxy;
+      _is_connected = proxy.g_name_owner != null;
+      if (_is_connected)
+      {
+        _is_master = _service.is_master;
+        _visible = _service.visible;
+        _search_hint = _service.search_hint;
+        _metadata = _service.metadata;
+        _optional_metadata = _service.optional_metadata;
+        _categories_model = Dee.Serializable.parse (_service.categories, typeof (Dee.SequenceModel)) as Dee.SerializableModel;
+        _filters_model = Dee.Serializable.parse (_service.filters, typeof (Dee.SequenceModel)) as Dee.SerializableModel;
+        _cat_sig_id = _service.category_order_changed.connect (on_category_order_changed);
+        _filters_sig_id = _service.filter_settings_changed.connect (on_filter_settings_changed);
+        // do we need hints?
+      }
     } catch (Error e) {
-      warning (@"Unable to connect to Scope ($dbus_path @ $dbus_name): $(e.message)");
+      _is_connected = false;
+      warning ("Unable to connect to Scope (%s @ %s): %s",
+               dbus_path, dbus_name, e.message);
     }
+    _connecting_to_proxy = false;
+    notify_property ("connected");
+
+    proxy_initialized ();
   }
  
-  private void on_scope_appeared (DBusConnection conn,
-                                  string         name,
-                                  string         name_owner)
-  {
-    Trace.log_object (this, "Scope appeared: %s", dbus_name);
+  private void on_category_order_changed (string channel_id, uint32[] new_order)
+  {
+    category_order_changed (channel_id, new_order);
+  }
+
+  private void on_filter_settings_changed (string channel_id, Variant filter_rows)
+  {
+    filter_settings_changed (channel_id, filter_rows);
+  }
+
+  public void on_scope_appeared ()
+  {
     if (_reconnection_id != 0)
       Source.remove (_reconnection_id);
     connect_to_scope.begin ();
   }
 
-  private void on_scope_vanished (DBusConnection conn,
-                                  string         name)
+  public void on_scope_vanished ()
   {
-    Trace.log_object (this, "Scope vanished: %s", dbus_name);
-
-    synchronized = false;
-    search_in_global = false;
-    provides_personal_content = false;
-    sources = new CheckOptionFilter ("sources", "Sources", null, true);
-    if (_results_model != null)
-      _results_model.clear ();
-
-    if (_global_results_model != null)
-      _global_results_model.clear ();
+    //sources = new CheckOptionFilter ("sources", "Sources", null, true);
 
     /* No need to clear the filters model, it's read-only for the scope and
      * it would just cause warnings from filters synchronizer */
@@ -140,6 +209,18 @@
 
     if (_service != null)
     {
+      if (_cat_sig_id > 0)
+      {
+        SignalHandler.disconnect (_service, _cat_sig_id);
+        _cat_sig_id = 0;
+      }
+
+      if (_filters_sig_id > 0)
+      {
+        SignalHandler.disconnect (_service, _filters_sig_id);
+        _filters_sig_id = 0;
+      }
+
       /* Here comes the protected-restarting logic - the scope will be
        * restarted unless it crashed more than 10 times during the past
        * 15 minutes */
@@ -166,6 +247,11 @@
     {
       start_reconnection_timeout ();
     }
+
+    _is_connected = false;
+    // notify users that all associated channels are no longer valid
+    channels_invalidated ();
+    notify_property ("connected");
   }
 
   private void start_reconnection_timeout ()
@@ -176,162 +262,116 @@
     _reconnection_id = Timeout.add_seconds (2, () =>
     {
       if (_service == null)
-        connect_to_scope ();
+        connect_to_scope.begin ();
       else if ((_service as DBusProxy).g_name_owner == null)
-        _service.info_request (); // ping the service to autostart it
+        close_channel.begin (""); // ping the service to autostart it
 
       _reconnection_id = 0;
       return false;
     });
   }
 
+  private void check_proxy () throws Error
+  {
+    // we have NameWatcher and will try to reconnect once the name appears 
+    if (_service == null)
+      throw new DBusError.SERVICE_UNKNOWN ("Unable to connect to service");
+  }
+
   /*
    * Implementation of the ScopeService interface
    */
-  public async ActivationReplyRaw activate (string uri, ActionType action_type,
-                                            HashTable<string, Variant> hints)
-  {
-    if (synchronized)
-    {
-      try {
-        var raw = yield _service.activate (uri, (uint) action_type, hints);
-        return raw;
-      } catch (Error e) {
-        warning (@"Unable to search scope ($dbus_path): $(e.message)");
-      }
-    }
-    return ActivationReplyRaw ();
-  }
-
-  public async HashTable<string, Variant> update_preview_property (
-      string uri, HashTable<string, Variant> values) throws IOError
-  {
-    if (synchronized)
-    {
-      try {
-        var raw = yield _service.update_preview_property (uri, values);
-        return raw;
-      } catch (Error e) {
-        warning (@"Unable to update_preview_property ($dbus_path): $(e.message)");
-      }
-    }
-
-    return new HashTable<string, Variant> (str_hash, str_equal);
+  public async ActivationReplyRaw activate (
+      string channel_id,
+      Variant[] result_arr, ActionType action_type,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable) throws Error
+  {
+    check_proxy ();
+    var raw = yield _service.activate (channel_id, result_arr,
+                                       (uint) action_type, hints,
+                                       cancellable);
+    return raw;
   }
 
   public async HashTable<string, Variant> search (
-      string search_string, HashTable<string, Variant> hints)
-  {
-    if (synchronized)
-    {
-      try {
-        var ht = yield _service.search (search_string, hints);
-        return ht;
-      } catch (ScopeError.SEARCH_CANCELLED scope_error) {
-        // that's fine
-      } catch (Error e) {
-        warning (@"Unable to search scope ($dbus_path - '$search_string'): $(e.message)");
-      }
-    }
-
-    return new HashTable<string, Variant> (str_hash, str_equal);
-  }
-
-  public async HashTable<string, Variant> global_search (
-      string search_string, HashTable<string, Variant> hints)
-  {
-    if (synchronized)
-    {
-      try {
-        var result = yield _service.global_search (search_string, hints);
-        return result;
-      } catch (ScopeError.SEARCH_CANCELLED scope_error) {
-        // that's fine
-      } catch (Error e) {
-        warning (@"Unable to global_search scope ($dbus_path - '$search_string'): $(e.message)");
-      }
-    }
-
-    return new HashTable<string, Variant> (str_hash, str_equal);
+      string channel_id, string search_string,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable) throws Error
+  {
+    check_proxy ();
+    var ht = yield _service.search (channel_id, search_string, hints,
+                                    cancellable);
+    return ht;
+  }
+
+  public async string open_channel (
+      ChannelType channel_type,
+      ChannelFlags channel_flags,
+      Cancellable? cancellable,
+      out Dee.SerializableModel results_model) throws Error
+  {
+    check_proxy ();
+    var hints = new HashTable<string, Variant> (str_hash, str_equal);
+    bool private_channel = ChannelFlags.PRIVATE in channel_flags;
+    if (private_channel)
+      hints["private-channel"] = new Variant.boolean (true);
+
+    HashTable<string, Variant> out_hints;
+    var channel_id = yield _service.open_channel ((uint) channel_type, hints,
+                                                  cancellable,
+                                                  out out_hints);
+    Dee.Peer peer = private_channel ?
+      new Dee.Client (out_hints["model-swarm-name"].get_string ()) :
+      new Dee.Peer (out_hints["model-swarm-name"].get_string ());
+    var model = new Dee.SharedModel.for_peer (peer);
+    results_model = model;
+
+    return channel_id;
+  }
+
+  public async void close_channel (
+      string channel_id,
+      Cancellable? cancellable) throws Error
+  {
+    check_proxy ();
+    var hints = new HashTable<string, Variant> (str_hash, str_equal);
+    yield _service.close_channel (channel_id, hints, cancellable);
   }
 
   public async void set_view_type (ViewType view_type)
   {
     _view_type = view_type;
-    if (synchronized)
-    {
-      try {
-        // FIXME: no need to set HOME_VIEW if !search_in_global
-        yield _service.set_view_type (view_type);
-      } catch (Error e) {
-        warning (@"Unable to set_active ($dbus_path): $(e.message)");
-      }
+    try {
+      check_proxy ();
+      // FIXME: no need to set HOME_VIEW if !search_in_global
+      yield _service.set_view_type (view_type);
+    } catch (Error e) {
+      warning (@"Unable to set_active ($dbus_path): $(e.message)");
     }
   }
 
-  public async void set_active_sources (string[] sources)
+  public async void set_active_sources (
+      string channel_id,
+      string[] sources,
+      Cancellable? cancellable) throws Error
   {
-    if (synchronized)
-    {
-      try {
-        yield _service.set_active_sources (sources);
-      } catch (Error e) {
-        warning (@"Unable to set_sources ($dbus_path): $(e.message)");
-      }
-    }
+    check_proxy ();
+    // FIXME: remove from ScopeProxy?
+    if (cancellable != null) cancellable.set_error_if_cancelled ();
   }
   
-  /* This is where we figure out the diff between states */
-  public void on_changed (ScopeInfo scope_info)
+  public async void push_results (
+          string channel_id,
+          string source_scope_id,
+          Dee.SerializableModel model,
+          string[] categories,
+          GLib.Cancellable? cancellable = null) throws Error
   {
-    if (dbus_path != scope_info.dbus_path)
-    {
-      warning (@"Unable to handle Scope changed signal: dbus_path mismatch. Expected $dbus_path got $(scope_info.dbus_path)");
-      return;
-    }
-    Trace.log_object (this, "Processing changed signal for %s", dbus_path);
-    search_in_global = scope_info.search_in_global;
-
-    if (scope_info.hints.contains ("provides-personal-content"))
-    {
-      provides_personal_content = scope_info.hints["provides-personal-content"].get_boolean ();
-    }
-    else
-    {
-      provides_personal_content = false;
-    }
-
-    if (results_model == null ||
-        _results_model.get_swarm_name () != scope_info.results_model_name)
-    {
-      results_model = new Dee.SharedModel (scope_info.results_model_name);
-      results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
-    }
-
-    if (global_results_model == null ||
-        _global_results_model.get_swarm_name () != scope_info.global_results_model_name)
-    {
-      global_results_model = new Dee.SharedModel (scope_info.global_results_model_name);
-      global_results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
-    }
-
-    if (filters_model == null ||
-        _filters_model.get_swarm_name () != scope_info.filters_model_name)
-    {
-      filters_model = new Dee.SharedModel (scope_info.filters_model_name);
-      filters_model.set_schema ("s", "s", "s", "s", "a{sv}", "b", "b", "b");
-    }
-
-    /* extract the sources */
-    sources.update (scope_info.sources);
-    this.notify_property ("sources");
-
-    if (!synchronized)
-    {
-      synchronized = true;
-      set_view_type (_view_type);
-      // FIXME: make sure active_sources are set, dispatch last (missed) search
-    }
+    check_proxy ();
+    yield _service.push_results (channel_id, source_scope_id,
+                                 model.serialize (), categories,
+                                 cancellable);
   }
 }
 

=== renamed file 'src/unity-scope-proxy.vala' => 'protocol/unity-scope-proxy.vala'
--- src/unity-scope-proxy.vala	2012-09-03 09:55:45 +0000
+++ protocol/unity-scope-proxy.vala	2013-03-25 11:25:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Canonical, Ltd.
+ * Copyright (C) 2012 Canonical, Ltd.
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License
@@ -14,39 +14,98 @@
  * License along with this library. If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Authored by Neil Jagdish Patel <[e-mail]>
+ * Authored by Michal Hruby <[e-mail]>
  *
  */
 
 using GLib;
 using Unity.Protocol;
 
-namespace Unity {
+namespace Unity.Protocol {
 
 /*
  * Proxies a Scope from DBus
  */
 
-private abstract interface ScopeProxy : GLib.Object
+public abstract interface ScopeProxy : GLib.Object
 {
-  public abstract OptionsFilter sources { get; set; }
-  public abstract bool search_in_global { get; set; }
-  public abstract bool provides_personal_content { get; set; }
+  public abstract bool visible { get; }
+  public abstract bool is_master { get; }
+  public abstract bool connected { get; }
+  public abstract string search_hint { get; }
   public abstract ViewType view_type { get; set; }
-  public abstract Dee.SerializableModel results_model { get; set; }
-  public abstract Dee.SerializableModel global_results_model { get; set; }
-  public abstract Dee.SerializableModel filters_model { get; set; }
-
-  public abstract async ActivationReplyRaw activate (string uri,
-                                                     ActionType action_type,
-                                                     HashTable<string, Variant> hints);
-  public abstract async HashTable<string, Variant> update_preview_property (
-      string uri, HashTable<string, Variant> values) throws IOError;
+  public abstract Dee.SerializableModel filters_model { get; }
+  public abstract Dee.SerializableModel categories_model { get; }
+  /* no access to Filter class in proto lib */
+  public abstract Variant sources { get; }
+  public abstract HashTable<string, string> metadata { get; }
+  public abstract HashTable<string, string> optional_metadata { get; }
+
+  public signal void category_order_changed (
+      string channel_id, uint32[] new_order);
+
+  public signal void filter_settings_changed (
+      string channel_id, Variant filter_rows);
+
+  public abstract async ActivationReplyRaw activate (
+      string channel_id,
+      Variant[] result_arr,
+      ActionType action_type,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null) throws Error;
+
   public abstract async HashTable<string, Variant> search (
-      string search_string, HashTable<string, Variant> hints);
-  public abstract async HashTable<string, Variant> global_search (
-      string search_string, HashTable<string, Variant> hints);
-  public abstract async void set_active_sources (string[] sources);
+      string channel_id,
+      string search_string,
+      HashTable<string, Variant> hints,
+      Cancellable? cancellable = null) throws Error;
+
+  public abstract async string open_channel (
+      ChannelType channel_type,
+      ChannelFlags channel_flags,
+      Cancellable? cancellable = null,
+      out Dee.SerializableModel results_model) throws Error;
+
+  public abstract async void close_channel (
+      string channel_id,
+      Cancellable? cancellable = null) throws Error;
+
+  public signal void channels_invalidated ();
+
+  public abstract async void set_active_sources (
+      string channel_id,
+      string[] sources,
+      Cancellable? cancellable = null) throws Error;
+
+  public abstract async void push_results (
+          string channel_id,
+          string source_scope_id,
+          Dee.SerializableModel model,
+          string[] categories,
+          GLib.Cancellable? cancellable = null) throws Error;
+ 
+  public static async ScopeProxy new_for_id (
+      string id, Cancellable? cancellable = null) throws Error
+  {
+    throw new IOError.FAILED ("Unimplemented!");
+  }
+
+  public static async ScopeProxy new_from_dbus (
+      string dbus_name, string dbus_path,
+      Cancellable? cancellable = null) throws Error
+  {
+    var proxy = yield ScopeProxyRemote.create (dbus_name, dbus_path, cancellable);
+    return proxy;
+  }
+
+  public static async ScopeProxy new_from_metadata (
+      ScopeRegistry.ScopeMetadata metadata,
+      Cancellable? cancellable = null) throws Error
+  {
+    // FIXME: this is a place where we could use local proxies too
+    var proxy = yield ScopeProxyRemote.create (metadata.dbus_name, metadata.dbus_path, cancellable);
+    return proxy;
+  }
 }
 
 } /* namespace */

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-10-16 15:33:50 +0000
+++ src/Makefile.am	2013-03-25 11:25:26 +0000
@@ -2,7 +2,7 @@
 BUILT_SOURCES =
 CLEANFILES =
 EXTRA_DIST =
-EXTRA_FLAGS =
+EXTRA_FLAGS = -g
 
 lib_LTLIBRARIES = \
   libunity.la \
@@ -71,6 +71,7 @@
   --library unity \
   --internal-vapi=unity-internal.vapi \
   --internal-header=unity-internal.h \
+  --target-glib=2.32 \
   --thread \
   --use-header \
   --vapidir $(top_srcdir)/vapi \
@@ -93,24 +94,26 @@
   unity-inspector.vala \
   unity-io.vala \
   unity-launcher.vala \
-  unity-lens.vala \
-  unity-lens-activation.vala \
-  unity-lens-category.vala \
-  unity-lens-filters.vala \
-  unity-lens-merge-strategy.vala \
-  unity-lens-preferences-manager.vala \
-  unity-lens-private.vala \
-  unity-lens-search.vala \
-  unity-lens-tools.vala \
+  unity-category.vala \
+  unity-filters.vala \
+  unity-preferences-manager.vala \
+  unity-search.vala \
+  unity-merge-strategy.vala \
+  unity-synchronizer.vala \
   unity-previews.vala \
-  unity-scope.vala \
-  unity-scope-factory.vala \
-  unity-scope-private.vala \
-  unity-scope-proxy.vala \
-  unity-scope-proxy-local.vala \
-  unity-scope-proxy-remote.vala \
+  unity-result-activation.vala \
+  unity-scope-interface.vala \
+  unity-scope-dbus-connector.vala \
+  unity-scope-dbus-impl.vala \
+  unity-scope-channel.vala \
+  unity-deprecated-scope.vala \
+  unity-deprecated-scope-impl.vala \
+  unity-aggregator-scope.vala \
+  unity-aggregator-scope-private.vala \
+  unity-master-scope.vala \
   unity-sound-menu.vala \
   unity-sound-menu-mpris.vala \
+  unity-utils.vala \
   $(NULL)
 
 libunity_la_GENERATED = \
@@ -130,11 +133,13 @@
 # The second is there because forced cname in Vala is not properly propagated
 # into the gir file. Need https://bugzilla.gnome.org/show_bug.cgi?id=681356
 #
+# And the third because we need to specify scope manually.
+#
 libunity_la_vala.stamp: $(libunity_la_VALASOURCES)
 	$(AM_V_GEN) $(VALAC) $(libunity_la_VALAFLAGS) $^
 	@sed -i -e 's/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity" shared-library="libunity.so.@LIBUNITY_LT_CURRENT@">/g' Unity-@GIR_VERSION@.gir
-	@sed -i -e 's/emit_finished/finished/g' Unity-@GIR_VERSION@.gir
 	@sed -i -e 's/emit_preview_ready/preview_ready/g' Unity-@GIR_VERSION@.gir
+	@sed -i -e 's/<parameter name="async_callback" transfer-ownership="none" /<parameter name="async_callback" transfer-ownership="none" scope="async" /g' Unity-@GIR_VERSION@.gir
 	@touch $@
 
 BUILT_SOURCES += libunity_la_vala.stamp

=== added file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	1970-01-01 00:00:00 +0000
+++ src/unity-aggregator-scope-private.vala	2013-03-25 11:25:26 +0000
@@ -0,0 +1,1642 @@
+/*
+ * Copyright (C) 2011-2012 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *             Michal Hruby <[e-mail]>
+ *
+ */
+
+using GLib;
+using Dee;
+using Unity;
+using Unity.Protocol;
+
+namespace Unity.Internal {
+
+private class AggregatorScopeImpl : GLib.Object, ScopeService, ScopeDBusImpl,
+                                    DeprecatedScopeDBusImpl, MergeStrategy
+{
+  private static Quark dedup_model_quark = Quark.from_string ("unity-dedup-model");
+
+  private class ScopeTracker : Object
+  {
+    private GenericArray<ScopeProxy> scope_proxy_arr;
+    // scope_id -> ScopeProxy
+    private HashTable<string, Utils.AsyncOnce<ScopeProxy>> scope_proxies;
+    // scope_uid -> ScopeProxy
+    private HashTable<string, ScopeProxy> scope_proxy_uids;
+    // channel_key (proxy + master_channel_id) -> scope channel_id
+    private HashTable<string, Utils.AsyncOnce<string>> scope_channel_ids;
+    // channel_key (proxy + master_channel_id) -> Dee.Model
+    private HashTable<string, Dee.SerializableModel> scope_models;
+    // master_channel_id -> ResultsSynchronizer
+    private HashTable<string, ResultsSynchronizer> synchronizers;
+    // scope_id -> RemoteContent
+    private HashTable<string, bool> scope_has_remote;
+
+    public ScopeTracker ()
+    {
+      scope_proxy_arr = new GenericArray<ScopeProxy> ();
+      scope_proxies = new HashTable<string, Utils.AsyncOnce<ScopeProxy>> (str_hash, str_equal);
+      scope_proxy_uids = new HashTable<string, ScopeProxy> (str_hash,str_equal);
+      scope_channel_ids = new HashTable<string, Utils.AsyncOnce<string>> (str_hash, str_equal);
+      scope_models = new HashTable<string, Dee.SerializableModel> (str_hash, str_equal);
+      synchronizers = new HashTable<string, ResultsSynchronizer> (str_hash, str_equal);
+      scope_has_remote = new HashTable<string, bool> (str_hash, str_equal);
+    }
+
+    public List<weak string> scope_ids_for_proxies ()
+    {
+      return scope_proxies.get_keys ();
+    }
+
+    public string? scope_id_for_proxy (ScopeProxy proxy)
+    {
+      foreach (unowned string scope_id in scope_proxies.get_keys ())
+      {
+        if (scope_proxies[scope_id].get_data () == proxy) return scope_id;
+      }
+
+      return null;
+    }
+
+    public unowned ResultsSynchronizer? get_synchronizer (string channel_id)
+    {
+      return synchronizers.lookup (channel_id);
+    }
+
+    private bool content_enabled (bool scope_contains_remote)
+    {
+      var pref_man = PreferencesManager.get_default ();
+      if (scope_contains_remote && pref_man.remote_content_search == PreferencesManager.RemoteContent.NONE)
+      {
+        return false;
+      }
+      return true;
+    }
+
+    public async ScopeProxy? create_proxy (ScopeRegistry.ScopeMetadata metadata)
+    {
+      ScopeProxy? proxy = null;
+      try
+      {
+        proxy = yield ScopeProxy.new_from_metadata (metadata);
+        // check that the proxy props match the metadata
+        check_proxy_vs_metadata (proxy, metadata);
+        scope_proxy_arr.add (proxy);
+
+        proxy.channels_invalidated.connect (channels_invalidated);
+      }
+      catch (Error err)
+      {
+        warning ("Unable to acquire proxy for scope \"%s\": %s",
+                 metadata.id, err.message);
+      }
+      return proxy;
+    }
+
+    private void channels_invalidated (ScopeProxy proxy)
+    {
+      proxy_disconnected (proxy);
+
+      // invalidate all associated containers
+      string[] invalid_keys = {};
+      string prefix = "%p::".printf (proxy);
+      
+      debug ("Invalidating channels for %s", prefix);
+
+      foreach (unowned string channel_key in scope_channel_ids.get_keys ())
+      {
+        if (channel_key.has_prefix (prefix)) invalid_keys += channel_key;
+      }
+
+      foreach (unowned string channel_key in invalid_keys)
+      {
+        scope_channel_ids.remove (channel_key);
+        scope_models.remove (channel_key);
+      }
+    }
+
+    private void check_proxy_vs_metadata (
+        ScopeProxy proxy,
+        ScopeRegistry.ScopeMetadata metadata) throws Error
+    {
+      if (proxy.is_master != metadata.is_master)
+        throw new ScopeError.DATA_MISMATCH ("Scope file info for '%s' doesn't match on IsMaster key".printf (metadata.id));
+
+      if (metadata.required_metadata != null)
+      {
+        var dict = metadata.required_metadata.as_hash_table ();
+        unowned string field_name;
+        unowned string schema;
+        var iter = HashTableIter<string, string> (dict);
+        while (iter.next (out field_name, out schema))
+        {
+          if (proxy.metadata[field_name] != schema)
+            throw new ScopeError.DATA_MISMATCH ("Scope file info for '%s' doesn't match on RequiredMetadata key".printf (metadata.id));
+        }
+      }
+    }
+
+    private string get_channel_key (string master_channel_id, ScopeProxy proxy)
+    {
+      return "%p::%s".printf (proxy, master_channel_id);
+    }
+
+    public void register_channel (string master_channel_id,
+                                  Dee.SerializableModel model,
+                                  MergeStrategy merge_strategy)
+    {
+      // create new synchronizer for this channel
+      var synchronizer = new ResultsSynchronizer (model);
+      synchronizer.merge_strategy = merge_strategy;
+      synchronizers[master_channel_id] = synchronizer;
+    }
+
+    public void unregister_channel (string master_channel_id)
+    {
+      var synchronizer = synchronizers[master_channel_id];
+      if (synchronizer != null)
+      {
+        // break the circular reference
+        synchronizer.receiver.set_qdata<Dee.Model?> (dedup_model_quark, null);
+        synchronizers.remove (master_channel_id);
+      }
+      // FIXME: close child scopes' channels
+    }
+    
+    private void proxy_disconnected (ScopeProxy proxy)
+    {
+      foreach (var scope_id in scope_proxies.get_keys ())
+      {
+        var data = scope_proxies[scope_id].get_data ();
+        if (data == proxy)
+        {
+          warning ("Lost proxy connection to %s", scope_id);
+
+          string prefix = "%p:".printf (proxy);
+          foreach (var channel_key in scope_channel_ids.get_keys ())
+          {
+            if (channel_key.has_prefix (prefix))
+            {
+              string master_id = channel_key.substring (channel_key.last_index_of ("::") + 2);
+              if (synchronizers.contains (master_id))
+              {
+                debug ("Removing %s data from model of master channel %s", scope_id, master_id);
+                synchronizers[master_id].clear_provider_model (prefix);
+                synchronizers[master_id].remove_provider (prefix);  // isn't clear+remove racy here?
+              }
+            }
+          }
+
+          break;
+        }
+      }
+    }
+    
+    private async void wait_for_seqnum (Dee.SharedModel model, uint64 seqnum)
+    {
+      if (model.get_seqnum () >= seqnum) return;
+
+      ulong update_sig_id = 0;
+      update_sig_id = model.end_transaction.connect ((m, begin_seqnum, end_seqnum) =>
+      {
+        if (end_seqnum < seqnum) return;
+
+        /* disconnect from within the signal handler... awesome, right? */
+        SignalHandler.disconnect (m, update_sig_id);
+        wait_for_seqnum.callback ();
+      });
+      yield;
+    }
+
+    public unowned string get_child_scope_channel_id (string master_channel_id,
+                                                      ScopeProxy proxy)
+    {
+      var channel_key = get_channel_key (master_channel_id, proxy);
+      return scope_channel_ids[channel_key].get_data ();
+    }
+
+    private Utils.AsyncOnce<ScopeProxy> get_proxy_once (string scope_id)
+    {
+      var proxy_once = scope_proxies[scope_id];
+      if (proxy_once == null)
+      {
+        proxy_once = new Utils.AsyncOnce<ScopeProxy> ();
+        scope_proxies[scope_id] = proxy_once;
+      }
+
+      return proxy_once;
+    }
+
+    private Utils.AsyncOnce<string> get_channel_id_once (string channel_key)
+    {
+      var channel_id_once = scope_channel_ids[channel_key];
+      if (channel_id_once == null)
+      {
+        channel_id_once = new Utils.AsyncOnce<string> ();
+        scope_channel_ids[channel_key] = channel_id_once;
+      }
+
+      return channel_id_once;
+    }
+
+    private unowned string? get_channel_id (string master_channel_id,
+                                            string scope_id,
+                                            out ScopeProxy? proxy) throws Error
+    {
+      var proxy_once = get_proxy_once (scope_id);
+      if (!proxy_once.is_initialized ())
+      {
+        proxy = null;
+        return null;
+      }
+
+      if (proxy_once.get_data () == null)
+        throw new ScopeError.REQUEST_FAILED ("Unable to create proxy");
+
+      proxy = proxy_once.get_data ();
+
+      var channel_key = get_channel_key (master_channel_id, proxy);
+      var channel_id_once = get_channel_id_once (channel_key);
+      if (!channel_id_once.is_initialized ()) return null;
+      return channel_id_once.get_data ();
+    }
+
+    private async unowned string init_channel (string master_channel_id,
+                                               string scope_id,
+                                               ChannelType channel_type,
+                                               out ScopeProxy proxy)
+      throws Error
+    {
+      // init ScopeProxy
+      var proxy_once = get_proxy_once (scope_id);
+      Error? failure = null;
+      bool ignore_proxy = false;
+      if (!proxy_once.is_initialized ())
+      {
+        if (yield proxy_once.enter ())
+        {
+          ScopeProxy? actual_proxy = null;
+          try
+          {
+            // don't even create the proxy if its content is disabled
+            if (scope_id in scope_has_remote)
+            {
+              if (!content_enabled (scope_has_remote[scope_id]))
+              {
+                ignore_proxy = true;
+                throw new ScopeError.DATA_MISMATCH ("Remote searches disabled");
+              }
+            }
+            var metadata = ScopeRegistry.ScopeMetadata.for_id (scope_id);
+            scope_has_remote[scope_id] = metadata.remote_content;
+            if (!content_enabled (scope_has_remote[scope_id]))
+            {
+              ignore_proxy = true;
+              throw new ScopeError.DATA_MISMATCH ("Remote searches disabled");
+            }
+            actual_proxy = yield create_proxy (metadata);
+          }
+          catch (Error e)
+          {
+            failure = e;
+          }
+          finally
+          {
+            proxy_once.leave (actual_proxy);
+          }
+        }
+      }
+
+      proxy = proxy_once.get_data ();
+      if (proxy == null)
+      {
+        if (ignore_proxy)
+        {
+          // retry next time
+          proxy_once.reset ();
+        }
+        var msg = "Unable to create scope proxy for \"%s\": %s".printf (
+          scope_id, failure != null ? failure.message : "");
+        throw new ScopeError.REQUEST_FAILED (msg);
+      }
+
+      // open a channel
+      var channel_key = get_channel_key (master_channel_id, proxy);
+      var channel_id_once = get_channel_id_once (channel_key);
+
+      if (!channel_id_once.is_initialized ())
+      {
+        if (yield channel_id_once.enter ())
+        {
+          Dee.SerializableModel model;
+          string? chan_id = null;
+          try
+          {
+            chan_id = yield proxy.open_channel (channel_type,
+                                                ChannelFlags.PRIVATE,
+                                                null,
+                                                out model);
+            scope_models[channel_key] = model;
+            model.set_data<string> ("scope-id", scope_id);
+            // register as receiver
+            var synchronizer = synchronizers[master_channel_id];
+            if (synchronizer != null)
+            {
+              var uid = "%p".printf (proxy);
+              scope_proxy_uids[uid] = proxy;
+              synchronizer.add_provider (model, uid);
+            }
+            else
+            {
+              warning ("Unable to find ResultsSynchronizer for channel %s",
+                       master_channel_id);
+            }
+          }
+          finally
+          {
+            channel_id_once.leave (chan_id);
+          }
+          // emit a signal
+          scope_channel_opened (master_channel_id, proxy, model);
+        }
+      }
+
+      unowned string scope_channel_id = channel_id_once.get_data ();
+      if (scope_channel_id == null)
+      {
+        // uh oh, couldn't open a channel, try again next time
+        channel_id_once.reset ();
+      }
+      return scope_channel_id;
+    }
+
+    public async HashTable<string, Variant> search_wrapper (
+        string master_channel_id,
+        ChannelType channel_type,
+        string search_string,
+        HashTable<string, Variant> hints,
+        string scope_id,
+        CategoryMerger category_merger) throws Error
+    {
+      ScopeProxy proxy;
+      unowned string scope_channel_id;
+      scope_channel_id = get_channel_id (master_channel_id, scope_id, out proxy);
+      if (scope_channel_id == null)
+        scope_channel_id = yield init_channel (master_channel_id, scope_id,
+                                               channel_type, out proxy);
+
+      var reply_hints = new HashTable<string, Variant> (str_hash, str_equal);
+
+      if (!content_enabled (scope_has_remote[scope_id])
+          || scope_channel_id == null)
+      {
+        return reply_hints;
+      }
+
+      if (category_merger is CategoryMergerByField)
+      {
+        (category_merger as CategoryMergerByField).map_subscope_categories (scope_id, proxy.categories_model);
+      }
+
+      var channel_key = get_channel_key (master_channel_id, proxy);
+      var last_seq_num = scope_models[channel_key].get_seqnum ();
+      var reply_dict = yield proxy.search (scope_channel_id, search_string,
+                                           hints);
+
+      var iter = HashTableIter<string, Variant> (reply_dict);
+      unowned string key;
+      unowned Variant variant;
+
+      while (iter.next (out key, out variant))
+      {
+        if (key == "model-seqnum")
+        {
+          uint64 seqnum = variant.get_uint64 ();
+          var model = scope_models[channel_key];
+          if (model.get_seqnum () < seqnum)
+            yield wait_for_seqnum (model as Dee.SharedModel, seqnum);
+
+          // if the proxy was disconnected and its channels invalidated, this
+          // model is no longer merged, check if that's the case
+          if (scope_models[channel_key] != model)
+            return reply_hints;
+
+          if (seqnum == last_seq_num)
+          {
+            debug ("Model seqnum for channel key %s not changed, copying", channel_key);
+            var synchronizer = get_synchronizer (master_channel_id);
+            if (synchronizer != null)
+              synchronizer.copy_model (model);
+            else
+              warning ("No synchronizer for master channel %s", master_channel_id);
+          }
+        }
+        else
+        {
+          reply_hints[key] = variant; // pass up
+        }
+      }
+
+      return reply_hints;
+    }
+
+    public async void push_wrapper (
+        string parent_channel_id,
+        ChannelType channel_type,
+        string master_scope_id,
+        string scope_id,
+        Dee.SerializableModel results_model,
+        string[] categories) throws Error
+    {
+      ScopeProxy proxy;
+      unowned string scope_channel_id;
+      // we're yielding before using the array, need to copy it explicitely
+      string[] categories_copy = categories;
+      scope_channel_id = get_channel_id (parent_channel_id, master_scope_id, out proxy);
+      if (scope_channel_id == null)
+        scope_channel_id = yield init_channel (parent_channel_id,
+                                               master_scope_id,
+                                               channel_type, out proxy);
+
+      if (scope_channel_id == null)
+      {
+        return; // shouldn't be reached really
+      }
+
+      yield proxy.push_results (scope_channel_id, scope_id, results_model,
+                                categories_copy, null);
+    }
+
+    public signal void scope_channel_opened (string master_channel_id,
+                                             ScopeProxy scope_proxy,
+                                             Dee.SerializableModel model);
+
+    public unowned ScopeProxy get_proxy_for_uid (string? uid) throws ScopeError
+    {
+      if (uid == null)
+        throw new ScopeError.REQUEST_FAILED ("Invalid scope UID");
+
+      unowned ScopeProxy proxy = scope_proxy_uids[uid];
+
+      if (proxy != null) return proxy;
+
+      throw new ScopeError.REQUEST_FAILED ("Invalid scope UID");
+    }
+  }
+
+  private abstract class CategoryMerger : Object
+  {
+    protected HashTable<string, int> category_map = new HashTable<string, int> (str_hash, str_equal);
+    public abstract int remap (string scope_id, uint32 category_index);
+  }
+
+  private class CategoryMergerByScope : CategoryMerger
+  {
+    public void add_scope_mapping (Unity.AggregatorScope scope, string scope_id)
+    {
+      var idx = scope.category_index_for_scope_id (scope_id);
+      if (idx >= 0)
+        category_map[scope_id] = idx;
+    }
+
+    public override int remap (string scope_id, uint32 category_index)
+    {
+      if (category_map.contains (scope_id))
+        return category_map[scope_id];
+      warning ("No category mapping for %s", scope_id);
+      return -1;
+    }
+  }
+
+  private class CategoryMergerByField : CategoryMerger
+  {
+    private HashTable<string, HashTable<int, int>?> subscopes = new HashTable<string, HashTable<int, int>?> (str_hash, str_equal);
+    private uint column_index;
+
+    public CategoryMergerByField (Dee.SerializableModel master_categories_model,
+                                  uint column_index)
+    {
+      this.column_index = column_index;
+      // iterate over aggregator scope categories and create name -> index mapping
+      int count = 0;
+      var iter = master_categories_model.get_first_iter ();
+      var end_iter = master_categories_model.get_last_iter ();
+      while (iter != end_iter)
+      {
+        var name = master_categories_model.get_string (iter, column_index);
+        if (category_map.contains (name))
+          warning ("Duplicated category name: %s", name);
+        else
+          category_map[name] = count++;
+        iter = master_categories_model.next (iter);
+      }
+    }
+
+    /**
+     * Creates mapping for given subscope and its categories to aggregator scope category indexes
+     */
+    public void map_subscope_categories (string scope_id, Dee.SerializableModel categories_model)
+    {
+      string[] categories = new string [0];
+
+      var iter = categories_model.get_first_iter ();
+      var end_iter = categories_model.get_last_iter ();
+      while (iter != end_iter)
+      {
+        string cat_id = categories_model.get_string (iter, column_index);
+        categories += cat_id;
+        iter = categories_model.next (iter);
+      }
+      map_subscope_categories_from_list (scope_id, categories);
+    }
+
+    public void map_subscope_categories_from_list (string scope_id, string[] categories)
+    {
+      int count = 0;
+
+      HashTable<int, int> subscope_category_map = subscopes.lookup (scope_id);
+      if (subscope_category_map == null)
+      {
+        subscope_category_map = new HashTable<int, int> (direct_hash, direct_equal);
+        subscopes[scope_id] = subscope_category_map;
+      }
+
+      foreach (var cat_id in categories)
+      {
+        if (category_map.contains (cat_id)) //does master have this category?
+        {
+          var cat_idx = category_map[cat_id];
+          subscope_category_map[count++] = cat_idx;
+        }
+        else
+        {
+          warning ("Subscope '%s' category '%s' not present in aggregator scope model", scope_id, cat_id);
+        }
+      }
+    }
+
+    public override int remap (string scope_id, uint32 category_index)
+    {
+      var subscope_category_map = subscopes.lookup (scope_id);
+      if (subscope_category_map != null)
+      {
+        if (subscope_category_map.contains ((int)category_index))
+        {
+          var idx = subscope_category_map[(int)category_index];
+          return (int)idx;
+        }
+        warning ("No category mapping for %s, category %u", scope_id, category_index);
+      }
+      warning ("No category mapping for %s", scope_id);
+      return -1;
+    }
+  }
+
+  private struct Sorter
+  {
+    int category;
+    int column_index;
+    string? field_name;
+    char schema;
+    int multiplier; // +1 / -1 to implement ASCENDING / DESCENDING sort
+
+    public int apply (Variant[] row1, Variant[] row2)
+    {
+      Variant dummy1;
+      Variant dummy2;
+      unowned Variant var1 = row1[column_index];
+      unowned Variant var2 = row2[column_index];
+      if (field_name != null)
+      {
+        dummy1 = var1.lookup_value ("content", VariantType.VARDICT).lookup_value (field_name, null);
+        dummy2 = var2.lookup_value ("content", VariantType.VARDICT).lookup_value (field_name, null);
+        // handle non-presence of optional fields
+        if (dummy1 == null && dummy2 == null) return 0;
+        if (dummy1 == null || dummy2 == null)
+          return dummy1 == null ? 1 : -1;
+        var1 = dummy1;
+        var2 = dummy2;
+      }
+      int result;
+      switch (schema)
+      {
+        case 's':
+          // FIXME: implement a way to use simple ascii sort
+          result = var1.get_string ().collate (var2.get_string ());
+          break;
+        case 'i':
+          result = compare_int (var1.get_int32 (), var2.get_int32 ());
+          break;
+        case 'u':
+          result = compare_uint (var1.get_uint32 (), var2.get_uint32 ());
+          break;
+        case 'x':
+          result = compare_int64 (var1.get_int64 (), var2.get_int64 ());
+          break;
+        case 't':
+          result = compare_uint64 (var1.get_uint64 (), var2.get_uint64 ());
+          break;
+        case 'd':
+          result = compare_double (var1.get_double (), var2.get_double ());
+          break;
+        default:
+          return 0;
+      }
+
+      return result * multiplier;
+    }
+
+    private static int compare_int (int a, int b)
+    {
+      return a > b ? 1 : a == b ? 0 : -1;
+    }
+
+    private static int compare_uint (uint a, uint b)
+    {
+      return a > b ? 1 : a == b ? 0 : -1;
+    }
+
+    private static int compare_int64 (int64 a, int64 b)
+    {
+      return a > b ? 1 : a == b ? 0 : -1;
+    }
+
+    private static int compare_uint64 (uint64 a, uint64 b)
+    {
+      return a > b ? 1 : a == b ? 0 : -1;
+    }
+
+    private static int compare_double (double a, double b)
+    {
+      return a > b ? 1 : a == b ? 0 : -1;
+    }
+  }
+
+  private const string SOURCES_FILTER_ID = "unity-sources";
+
+  public unowned AggregatorScope owner { private get; construct; }
+  private HashTable<string, ScopeChannel> _channels;
+  private uint _dbus_id;
+  private DBusConnection? _dbus_connection;
+  private ScopeTracker _scopes;
+  private Sorter[] _sorters;
+  private Sorter[] _constraints;
+  private CategoryMerger category_merger;
+  private Rand _rand;
+
+  public Dee.SerializableModel categories_model { get; set; }
+  public Dee.SerializableModel filters_model { get; set; }
+
+  /* Make sure the object doesn't reference itself, we do want it to be
+   * properly destroyed */
+  private MergeStrategy? _merge_strategy = null;
+  public MergeStrategy? merge_strategy
+  {
+    internal get { return _merge_strategy != null ? _merge_strategy : this; }
+    set { _merge_strategy = value != this ? value : null; }
+  }
+
+  /* we need notifications on this property */
+  public ViewType view_type { get; set; }
+
+  public AggregatorScopeImpl (AggregatorScope owner)
+  {
+    Object (owner: owner);
+  }
+
+  construct
+  {
+    _rand = new Rand ();
+    _channels = new HashTable<string, ScopeChannel> (str_hash, str_equal);
+    _scopes = new ScopeTracker ();
+    merge_strategy = this;
+    create_models ();
+  }
+
+  // keep the scope list in a set for fast lookup
+  private static Gee.Set<string> disabled_scope_ids;
+
+  private static bool is_scope_disabled (string scope_id)
+  {
+    if (disabled_scope_ids == null)
+    {
+      disabled_scope_ids = new Gee.HashSet<string> ();
+      var pref_man = PreferencesManager.get_default ();
+      pref_man.notify["disabled-scopes"].connect (update_disabled_scopes);
+      update_disabled_scopes ();
+    }
+
+    return scope_id in disabled_scope_ids;
+  }
+
+  private static void update_disabled_scopes ()
+  {
+    var pref_man = PreferencesManager.get_default ();
+    disabled_scope_ids.clear ();
+    foreach (unowned string scope_id in pref_man.disabled_scopes)
+    {
+      disabled_scope_ids.add (scope_id);
+    }
+  }
+
+  public GLib.List<weak string> subscope_ids ()
+  {
+    return _scopes.scope_ids_for_proxies ();
+  }
+
+  /* Create usable name prefix for the models */
+  private string create_dbus_name ()
+  {
+    /* We randomize the names to avoid conflicts to ensure that we always
+     * have a clean start (no processes hanging around that would cause
+     * our models to not be the leaders)
+     */
+    var t = get_monotonic_time ();
+    const string format_string = "com.canonical.Unity.Master.Scope.%s.T%" + int64.FORMAT + "%d";
+    var dbus_name = format_string.printf (Path.get_basename (owner.dbus_path),
+                                          t, _rand.int_range (0, 10000));
+    return dbus_name;
+  }
+
+  private void create_models ()
+  {
+    /* Schema definitions come from the Lens specification */
+    categories_model = new Dee.SequenceModel ();
+    categories_model.set_schema_full (CATEGORIES_SCHEMA);
+
+    filters_model = new Dee.SequenceModel ();
+    filters_model.set_schema_full (FILTERS_SCHEMA);
+  }
+
+  public void export () throws IOError
+  {
+    _dbus_connection = Bus.get_sync (BusType.SESSION);
+    _dbus_id = _dbus_connection.register_object (owner.dbus_path,
+                                                 this as ScopeService);
+  }
+
+  public void unexport ()
+  {
+    if (_dbus_id != 0)
+    {
+      _dbus_connection.unregister_object (_dbus_id);
+      _dbus_id = 0;
+      _dbus_connection = null;
+    }
+
+    // get rid of open channels
+    string[] channel_ids = {};
+    foreach (unowned string channel_id in _channels.get_keys ())
+    {
+      channel_ids += channel_id;
+    }
+    foreach (unowned string channel_id in channel_ids)
+    {
+      _scopes.unregister_channel (channel_id);
+      _channels.remove (channel_id);
+    }
+  }
+
+  public void set_categories (List<Category> categories)
+  {
+    bool categories_model_empty = categories_model.get_n_rows () == 0;
+    if (!categories_model_empty)
+    {
+      // we support only appending new categories, no changes/deletes
+      unowned List<Category> cats = categories;
+      uint cats_length = categories.length ();
+      bool data_matches = cats_length >= categories_model.get_n_rows ();
+
+      var iter = categories_model.get_first_iter ();
+      var end_iter = categories_model.get_last_iter ();
+      while (data_matches && iter != end_iter)
+      {
+        data_matches &= cats.data.id == categories_model.get_string (iter, 0);
+        // FIXME: emit row-changed if other props changed
+        iter = categories_model.next (iter);
+        cats = cats.next;
+      }
+
+      if (!data_matches)
+      {
+        warning ("Categories can only be added, ignoring request");
+        return;
+      }
+      else
+      {
+        categories = cats;
+      }
+    }
+
+    foreach (unowned Category category in categories)
+    {
+      string icon_hint = Utils.icon_to_string (category.icon_hint);
+      categories_model.append (category.id,
+                               category.name,
+                               icon_hint,
+                               category.renderer,
+                               Utils.hash_table_to_asv (category.hints));
+    }
+
+    queue_property_notification ("Categories",
+                                 new Variant.variant (this.categories));
+  }
+
+  public void set_filters (List<Filter> filters)
+  {
+    filters_model.clear ();
+
+    foreach (unowned Filter filter in filters)
+    {
+      //filter.changed.connect (on_filter_option_changed);
+    }
+
+    List<unowned Filter> filters_and_sources = filters.copy ();
+    if (owner.sources.options.length () > 0)
+      filters_and_sources.append (owner.sources);
+
+    Variant data[8];
+    foreach (unowned Filter filter in filters_and_sources)
+    {
+      var serialized_filter = filter.serialize ();
+      for (size_t i = 0; i < serialized_filter.n_children (); i++)
+        data[i] = serialized_filter.get_child_value (i);
+
+      filters_model.append_row (data);
+    }
+  }
+
+  public void queue_search_for_type (SearchType search_type)
+  {
+    // not really relevant for master scopes
+  }
+
+  public void invalidate_search (SearchType search_type)
+  {
+    // not really relevant for master scopes
+  }
+
+  private VariantBuilder? changed_props;
+
+  public void queue_property_notification (string prop_name, Variant prop_value)
+  {
+    if (_dbus_id == 0) return;
+
+    bool schedule_emit = changed_props == null;
+    if (changed_props == null)
+      changed_props = new VariantBuilder (new VariantType ("a{sv}"));
+
+    changed_props.add ("{sv}", prop_name, prop_value);
+
+    if (schedule_emit)
+    {
+      Idle.add (() =>
+      {
+        var invalidated = new Variant.array (new VariantType ("s"), {});
+        try
+        {
+          _dbus_connection.emit_signal (null, owner.dbus_path,
+                                        "org.freedesktop.DBus.Properties",
+                                        "PropertiesChanged",
+                                        new Variant ("(sa{sv}@as)",
+                                                     ScopeService.INTERFACE_NAME,
+                                                     changed_props,
+                                                     invalidated));
+        }
+        catch (Error err)
+        {
+          warning ("%s", err.message);
+        }
+        changed_props = null;
+        return false;
+      });
+    }
+  }
+
+
+
+  public void add_sorter (uint category_index, string field,
+                          AggregatorScope.SortFlags flags)
+  {
+    string? schema = null;
+    bool is_base_column = field in RESULTS_COLUMN_NAMES;
+    bool field_found = false;
+
+    foreach (unowned Schema.FieldInfo? info in owner.schema.get_fields ())
+    {
+      if (info.name == field)
+      {
+        schema = info.schema;
+        field_found = true;
+        break;
+      }
+    }
+    // ensure the field name is valid
+    if (!is_base_column && !field_found)
+    {
+      critical ("Field name '%s' is not valid for this scope", field);
+      return;
+    }
+
+    // get column index
+    int col_index = -1;
+    for (int i = 0; i < RESULTS_COLUMN_NAMES.length; i++)
+    {
+      if (field == RESULTS_COLUMN_NAMES[i])
+      {
+        col_index = i;
+        break;
+      }
+    }
+
+    if (col_index >= 0)
+      schema = RESULTS_SCHEMA[col_index];
+
+    if (new VariantType (schema).is_basic () == false)
+    {
+      critical ("Only basic types can be sorted, '%s' is not supported",
+                schema);
+      return;
+    }
+
+    var sorter = Sorter ();
+    sorter.category = (int) category_index;
+    sorter.column_index = col_index < 0 ? RESULTS_COLUMN_NAMES.length - 1 : col_index;
+    sorter.field_name = col_index < 0 ? field : null;
+    sorter.schema = schema[0];
+    sorter.multiplier = AggregatorScope.SortFlags.DESCENDING in flags ? -1 : 1;
+
+    _sorters += (owned) sorter;
+  }
+
+  public void add_constraint (int category_index, string field)
+  {
+    string? schema = null;
+    bool is_base_column = field in RESULTS_COLUMN_NAMES;
+    bool field_found = false;
+
+    foreach (unowned Schema.FieldInfo? info in owner.schema.get_fields ())
+    {
+      if (info.name == field)
+      {
+        schema = info.schema;
+        field_found = true;
+        break;
+      }
+    }
+    // ensure the field name is valid
+    if (!is_base_column && !field_found)
+    {
+      critical ("Field name '%s' is not valid for this scope", field);
+      return;
+    }
+
+    // get column index
+    int col_index = -1;
+    for (int i = 0; i < RESULTS_COLUMN_NAMES.length; i++)
+    {
+      if (field == RESULTS_COLUMN_NAMES[i])
+      {
+        col_index = i;
+        break;
+      }
+    }
+
+    if (col_index >= 0)
+      schema = RESULTS_SCHEMA[col_index];
+
+    if (new VariantType (schema).is_basic () == false)
+    {
+      critical ("Only basic types can be sorted, '%s' is not supported",
+                schema);
+      return;
+    }
+
+    if (category_index >= 0)
+    {
+      // we need a category sorter
+      bool category_sorter_present = false;
+      int category_col_index = -1;
+      for (int i = 0; i < RESULTS_COLUMN_NAMES.length; i++)
+      {
+        if (RESULTS_COLUMN_NAMES[i] == "category")
+        {
+          category_col_index = i;
+          break;
+        }
+      }
+      warn_if_fail (category_col_index >= 0);
+      foreach (unowned Sorter it_sorter in _constraints)
+      {
+        if (it_sorter.column_index == category_col_index)
+        {
+          category_sorter_present = true;
+          break;
+        }
+      }
+      if (!category_sorter_present) add_constraint (-1, "category");
+    }
+
+    var sorter = Sorter ();
+    sorter.category = category_index;
+    sorter.column_index = col_index < 0 ? RESULTS_COLUMN_NAMES.length - 1 : col_index;
+    sorter.field_name = col_index < 0 ? field : null;
+    sorter.schema = schema[0];
+    sorter.multiplier = 1;
+
+    foreach (unowned Sorter it_sorter in _constraints)
+    {
+      // check for duplicate constraints
+      if (it_sorter.category == sorter.category && 
+          it_sorter.column_index == sorter.column_index &&
+          it_sorter.field_name == sorter.field_name &&
+          it_sorter.schema == sorter.schema)
+      {
+        warning ("Trying to add duplicate constraint, ignoring");
+        return;
+      }
+    }
+
+    _constraints += (owned) sorter;
+  }
+
+  private static int apply_sorters (Variant[] row1, Variant[] row2,
+                                    uint category, Sorter[] sorters)
+  {
+    foreach (unowned Sorter sorter in sorters)
+    {
+      if (sorter.category >= 0 && sorter.category != category) continue;
+      int sorter_result = sorter.apply (row1, row2);
+      if (sorter_result != 0) return sorter_result;
+    }
+    return 0;
+  }
+
+  /* MergeStrategy implementation */
+  private unowned Dee.ModelIter? merge_result (string scope_id,
+                                               Dee.Model target, Variant[] row)
+  {
+    // remap category index in the result
+    uint row_category = row[ResultColumn.CATEGORY].get_uint32 ();
+    int cat_idx = category_merger.remap (scope_id, row_category);
+    if (cat_idx >= 0)
+    {
+      row[ResultColumn.CATEGORY] = new GLib.Variant.uint32 (cat_idx);
+    }
+    else
+    {
+      warning ("Unable to remap category %u for %s", row_category, scope_id);
+      return null;
+    }
+
+    // check for duplicates
+    if (_constraints.length > 0)
+    {
+      /* the lookups need to be fast, so keeping a FilterModel on top
+       * of the real model that's sorted according to the de-dup fields */
+      var dedup_model = target.get_qdata<Dee.Model> (dedup_model_quark);
+      if (dedup_model == null)
+      {
+        warn_if_fail (target.get_n_rows () == 0);
+        var filter = Dee.Filter.new (() => {}, // no MapFunc
+                                     (orig_model, orig_iter, m) =>
+        {
+          Variant row_data[9];
+          // FIXME: add a get_row_static method to dee
+          var dummy = orig_model.get_row (orig_iter, row_data);
+          void* dont_free = (owned) dummy;
+          var iter = m.find_row_sorted (row_data, (row1, row2) =>
+          {
+            uint category = row1[ResultColumn.CATEGORY].get_uint32 ();
+            return apply_sorters (row1, row2, category, _constraints);
+          }, null);
+          m.insert_iter_before (orig_iter, iter);
+          return true;
+        });
+        dedup_model = new Dee.FilterModel (target, filter);
+        // eek, circular reference
+        target.set_qdata (dedup_model_quark, dedup_model);
+      }
+      bool found;
+      bool fell_through = false;
+      dedup_model.find_row_sorted (row, (row1, row2) =>
+      {
+        uint category = row1[ResultColumn.CATEGORY].get_uint32 ();
+        // customized version of apply_sorters that's suitable for dedup
+        for (int i = 0; i < _constraints.length; i++)
+        {
+          unowned Sorter sorter = _constraints[i];
+          if (sorter.category >= 0 && sorter.category != category) continue;
+          int sorter_result = sorter.apply (row1, row2);
+          if (sorter_result != 0 || i == _constraints.length - 1)
+            return sorter_result;
+        }
+        fell_through = true;
+        return 0;
+      }, out found);
+      if (found && !fell_through) return null;
+    }
+
+    return target.insert_row_sorted (row, (row1, row2) =>
+    {
+      // first of all sort by categories
+      uint category = row1[ResultColumn.CATEGORY].get_uint32 ();
+      int cat_delta = (int) category -
+                      (int) row2[ResultColumn.CATEGORY].get_uint32 ();
+      if (cat_delta != 0) return cat_delta > 0 ? 1 : -1;
+
+      return apply_sorters (row1, row2, category, _sorters);
+    });
+  }
+
+  private unowned ScopeProxy? get_proxy_for_result (Variant? result_metadata,
+                                                    out string? scope_id)
+    throws ScopeError
+  {
+    if (result_metadata == null)
+      throw new ScopeError.REQUEST_FAILED ("Unable to find scope proxy");
+
+    string scope_uid;
+    if (!result_metadata.lookup ("scope-uid", "s", out scope_uid))
+      throw new ScopeError.REQUEST_FAILED ("Unable to find scope proxy");
+
+    if (scope_uid.has_prefix ("0x"))
+    {
+      unowned ScopeProxy result = _scopes.get_proxy_for_uid (scope_uid);
+      scope_id = _scopes.scope_id_for_proxy (result);
+      return result;
+    }
+    else if (scope_uid.has_prefix ("remote:"))
+    {
+      // special case the proxy for results that were pushed
+      var parts = scope_uid.split (":", 2);
+      scope_id = parts[1];
+      return null;
+    }
+
+    throw new ScopeError.REQUEST_FAILED ("Invalid scope UID");
+  }
+
+
+  /*
+   * DBus Interface Implementation
+   */
+  public async ActivationReplyRaw activate (
+      string channel_id,
+      Variant[] result_arr,
+      uint action_type,
+      HashTable<string, Variant> hints,
+      GLib.Cancellable? cancellable) throws IOError, ScopeError
+  {
+    get_channel_by_id (channel_id); // ensure the channel is valid
+
+    string? scope_id;
+    unowned ScopeProxy proxy;
+    Variant metadata = result_arr[ResultColumn.METADATA];
+    proxy = get_proxy_for_result (metadata, out scope_id);
+    result_arr[ResultColumn.METADATA] = metadata.lookup_value ("content", null);
+
+    var scope_result = ScopeResult ();
+    scope_result.uri = result_arr[ResultColumn.URI].get_string ();
+    scope_result.icon_hint = result_arr[ResultColumn.ICON_HINT].get_string ();
+    scope_result.category = result_arr[ResultColumn.CATEGORY].get_uint32 ();
+    scope_result.result_type = (ResultType) result_arr[ResultColumn.RESULT_TYPE].get_uint32 ();
+    scope_result.mimetype = result_arr[ResultColumn.MIMETYPE].get_string ();
+    scope_result.title = result_arr[ResultColumn.TITLE].get_string ();
+    scope_result.comment = result_arr[ResultColumn.COMMENT].get_string ();
+    scope_result.dnd_uri = result_arr[ResultColumn.DND_URI].get_string ();
+    if (result_arr[ResultColumn.METADATA].get_type ().equal (VariantType.VARDICT))
+    {
+      scope_result.metadata = (HashTable<string, Variant>) result_arr[ResultColumn.METADATA];
+    }
+
+    if (scope_id == null)
+    {
+      throw new ScopeError.REQUEST_FAILED ("Unable to determine scope id!");
+    }
+
+    // arrays in async methods are not copied by default, force the copy
+    var result_arr_cpy = result_arr;
+    var activation_obj = new AggregatorActivation (channel_id, scope_id,
+                                                   action_type, scope_result);
+
+    var response = yield owner.activate (activation_obj);
+    if (response != null)
+    {
+      var raw = ActivationReplyRaw ();
+      raw.uri = scope_result.uri;
+      raw.handled = response.handled;
+      raw.hints = response.get_hints ();
+
+      return raw;
+    }
+
+    if (proxy == null)
+    {
+      if (action_type != Protocol.ActionType.PREVIEW_RESULT)
+      {
+        response = new ActivationResponse (HandledType.NOT_HANDLED);
+      }
+      else
+      {
+        response = new ActivationResponse.with_preview (GenericPreview.empty ());
+      }
+      var raw = ActivationReplyRaw ();
+      raw.uri = scope_result.uri;
+      raw.handled = response.handled;
+      raw.hints = response.get_hints ();
+
+      return raw;
+    }
+
+    /* proxy the request by default */
+    var child_channel = _scopes.get_child_scope_channel_id (channel_id, proxy);
+    try
+    {
+      var action = (Unity.Protocol.ActionType) action_type;
+      return yield proxy.activate (child_channel, result_arr_cpy,
+                                   action, hints, cancellable);
+    }
+    catch (Error err)
+    {
+      throw new ScopeError.REQUEST_FAILED ("Unhandled error: %s".printf (err.message));
+    }
+  }
+
+  public async HashTable<string, Variant> search (
+      string channel_id,
+      string search_string,
+      HashTable<string, Variant> hints,
+      GLib.Cancellable? cancellable) throws IOError, ScopeError
+  {
+    var channel = get_channel_by_id (channel_id);
+
+    // clear the master/aggregated model so that results from scopes that are not searched this time disappear
+    var synchronizer = _scopes.get_synchronizer (channel_id);
+    if (synchronizer != null)
+      synchronizer.clear ();
+    else
+      warning ("No synchronizer for channel %s", channel_id);
+
+    unowned Variant filter_row_variant = hints["changed-filter-row"];
+    if (filter_row_variant != null)
+      update_filter_state (channel, filter_row_variant);
+
+    var response = new HashTable<string, Variant> (str_hash, str_equal);
+
+    SearchContext search_context = SearchContext ();
+    search_context.search_query = search_string;
+    search_context.search_type = channel.get_search_type ();
+    search_context.filter_state = channel.filters;
+    search_context.search_metadata = SearchMetadata.create (hints);
+    search_context.result_set = new DeeResultSet.with_model (channel.results_model);
+    search_context.result_set.ttl = -1;
+    search_context.cancellable = Unity.Cancellable.create ();
+
+    var aggsearch = new AggregatedScopeSearch (owner, channel.id,
+                                               hints, channel.results_model);
+    aggsearch.set_search_context (search_context);
+
+    ulong sig_id = aggsearch.category_order_changed.connect ((indices) =>
+    {
+      if (indices.length != categories_model.get_n_rows ())
+        warning ("Invalid number of category indices, expected %u, got %u", categories_model.get_n_rows (), indices.length);
+      else
+        category_order_changed (channel_id, indices);
+    });
+
+    channel.last_search = aggsearch;
+
+    aggsearch.run_async (() =>
+    {
+      Idle.add_full (Priority.DEFAULT, search.callback);
+    });
+    yield; // call virtual search method of the public API
+
+    SignalHandler.disconnect (aggsearch, sig_id);
+
+    // copy reply hints into response hash
+    HashTable<string, Variant>? reply_hints = aggsearch.get_reply_hints ();
+    if (reply_hints != null)
+    {
+      HashTableIter<string, Variant> iter = HashTableIter<string, Variant> (reply_hints);
+      unowned string key;
+      unowned Variant variant;
+      while (iter.next (out key, out variant))
+        response.insert (key, variant);
+    }
+    response["model-seqnum"] = new Variant.uint64 (channel.results_model.get_seqnum ());
+
+    if (cancellable != null) cancellable.set_error_if_cancelled ();
+    return response;
+  }
+
+  public async HashTable<string, Variant> search_scope (
+      Unity.AggregatedScopeSearch search, string scope_id,
+      string search_string, SearchType search_type,
+      HashTable<string, Variant>? hints) throws Error
+  {
+    if (is_scope_disabled (scope_id))
+    {
+      return new HashTable<string, Variant> (null, null);
+    }
+
+    // remove the filter hints
+    if (!owner.proxy_filter_hints)
+      search.hints.remove ("changed-filter-row");
+
+    HashTable<string, Variant>? combined_hints = null;
+    if (hints != null)
+    {
+      combined_hints = new HashTable<string, Variant> (str_hash, str_equal);
+      HFunc<string, Variant> combiner = (k, v) =>
+      {
+        combined_hints.insert (k, v);
+      };
+      hints.foreach (combiner);
+      search.hints.foreach (combiner);
+    }
+
+    if (category_merger is CategoryMergerByScope)
+      (category_merger as CategoryMergerByScope).add_scope_mapping (owner, scope_id);
+
+    var channel_type = search_type == SearchType.DEFAULT ?
+      ChannelType.DEFAULT : ChannelType.GLOBAL;
+    var res = yield _scopes.search_wrapper (search.channel_id,
+                                            channel_type,
+                                            search_string,
+                                            combined_hints != null ? combined_hints : search.hints, scope_id,
+                                            category_merger);
+    return res;
+  }
+
+  public async void push_results_to_scope (string channel_id,
+                                           string scope_id,
+                                           Dee.SerializableModel results_model,
+                                           string[] category_ids) throws Error
+  {
+    if (!("-" in scope_id))
+    {
+      throw new ScopeError.REQUEST_FAILED ("Incorrect scope_id \"%s\"". printf (scope_id));
+    }
+
+    if (is_scope_disabled (scope_id))
+    {
+      throw new ScopeError.REQUEST_FAILED ("Scope is disabled");
+    }
+
+    // get the master scope id
+    var parts = scope_id.split ("-", 2);
+    var master_scope_id = "%s.scope".printf (parts[0]);
+    
+    if (category_merger is CategoryMergerByScope)
+      (category_merger as CategoryMergerByScope).add_scope_mapping (owner, master_scope_id);
+
+    yield _scopes.push_wrapper (channel_id, ChannelType.GLOBAL,
+                                master_scope_id, scope_id,
+                                results_model, category_ids);
+  }
+
+  public void push_filter_settings (string channel_id, FilterSet filters)
+  {
+    try
+    {
+      get_channel_by_id (channel_id);
+    }
+    catch (Error err)
+    {
+      warning ("Unexpected error: %s", err.message);
+    }
+
+    var filter_rows = new VariantBuilder (new VariantType ("a(ssssa{sv}bbb)"));
+    foreach (unowned Filter f in filters.get_filters ())
+    {
+      filter_rows.add_value (f.serialize ());
+    }
+
+    filter_settings_changed (channel_id, filter_rows.end ());
+  }
+
+  private void update_filter_state (ScopeChannel channel,
+                                    Variant changed_row) throws ScopeError
+  {
+    if (changed_row.get_type_string () != "(ssssa{sv}bbb)")
+    {
+      throw new ScopeError.REQUEST_FAILED ("Incorrect signature of filter-state (got '%s')".printf (changed_row.get_type_string ()));
+    }
+
+    string filter_id;
+    changed_row.get_child (FilterColumn.ID, "s", out filter_id);
+    var filter = channel.get_filter_by_id (filter_id);
+
+    if (filter == null)
+    {
+      throw new ScopeError.REQUEST_FAILED ("Unable to find filter with id '%s'".printf (filter_id));
+    }
+    // update() will just update the hints, need to handle base props
+
+    bool state;
+    changed_row.get_child (FilterColumn.FILTERING, "b", out state);
+    filter.filtering = state;
+    changed_row.get_child (FilterColumn.COLLAPSED, "b", out state);
+    filter.collapsed = state;
+    filter.update (changed_row.get_child_value (FilterColumn.RENDERER_STATE));
+  }
+
+  public async string open_channel (
+      uint channel_type,
+      HashTable<string, Variant> hints,
+      GLib.Cancellable? cancellable,
+      out HashTable<string, Variant> out_hints) throws IOError
+  {
+    Unity.AggregatorScope aggscope = owner as Unity.AggregatorScope;
+
+    /* Create category merger */
+    if (aggscope.merge_mode == AggregatorScope.MergeMode.OWNER_SCOPE)
+    {
+      category_merger = new CategoryMergerByScope ();
+    }
+    else
+    {
+      category_merger = new CategoryMergerByField (categories_model, CategoryColumn.ID);
+    }
+
+    ChannelFlags flags = "private-channel" in hints ?
+      ChannelFlags.PRIVATE : 0;
+    var channel = new ScopeChannel ((ChannelType) channel_type);
+
+    var schema = owner.schema;
+    var required_schema = new HashTable<string, string> (str_hash, str_equal);
+    var optional_schema = new HashTable<string, string> (str_hash, str_equal);
+    foreach (unowned Unity.Schema.FieldInfo? field in schema.get_fields ())
+    {
+      if (field.type == Schema.FieldType.REQUIRED)
+        required_schema[field.name] = field.schema;
+      else
+        optional_schema[field.name] = field.schema;
+    }
+
+    var model_name = channel.create_channel (create_dbus_name (),
+                                             required_schema,
+                                             optional_schema,
+                                             filters_model,
+                                             flags | ChannelFlags.NO_FILTERING);
+    var sm = channel.results_model as Dee.SharedModel;
+    if (sm != null)
+    {
+      // force AUTOMATIC flushing for the deprecated scopes, although we can
+      // flush manually in the future
+      sm.flush_mode = Dee.SharedModelFlushMode.AUTOMATIC;
+    }
+
+    _channels[channel.id] = channel;
+    _scopes.register_channel (channel.id, channel.results_model, merge_strategy);
+
+    out_hints = new HashTable<string, Variant> (str_hash, str_equal);
+    out_hints["model-swarm-name"] = new Variant.string (model_name);
+
+    return channel.id;
+  }
+
+  private ScopeChannel get_channel_by_id (string channel_id)
+    throws ScopeError
+  {
+    unowned ScopeChannel channel = _channels[channel_id];
+    if (channel == null)
+      throw new ScopeError.INVALID_CHANNEL ("Invalid channel ID!");
+
+    return channel;
+  }
+
+  public async void close_channel (
+      string channel_id,
+      HashTable<string, Variant> hints,
+      GLib.Cancellable? cancellable) throws IOError, ScopeError
+  {
+    unowned ScopeChannel channel = _channels[channel_id];
+    if (channel == null)
+      throw new ScopeError.INVALID_CHANNEL ("Invalid channel ID!");
+
+    _scopes.unregister_channel (channel_id);
+    _channels.remove (channel_id);
+  }
+
+  public async void set_view_type (uint view_type_id) throws IOError
+  {
+    ViewType view_type = (ViewType) view_type_id;
+    this.view_type = view_type;
+  }
+
+  public async void set_active_sources (
+      string channel_id, string[] sources,
+      GLib.Cancellable? cancellable) throws IOError
+  {
+    owner.set_active_sources_internal (sources);
+  }
+
+  public async void push_results (
+          string channel_id,
+          string source_scope_id,
+          Variant model_v,
+          string[] categories,
+          GLib.Cancellable? cancellable = null) throws IOError, ScopeError
+  {
+    var model_obj = Dee.Serializable.parse (model_v, typeof (Dee.SequenceModel));
+    if (model_obj == null)
+      throw new ScopeError.REQUEST_FAILED ("Can't deserialize model");
+
+    var provider = model_obj as Dee.SerializableModel;
+    provider.set_data<string> ("uid", "remote:%s".printf (source_scope_id));
+    provider.set_data<string> ("scope-id", source_scope_id);
+    var sync = _scopes.get_synchronizer (channel_id);
+    if (sync == null)
+      throw new ScopeError.REQUEST_FAILED ("No synchronizer for channel %s", channel_id);
+
+    var merger = category_merger as CategoryMergerByField;
+    if (merger != null)
+    {
+      merger.map_subscope_categories_from_list (source_scope_id, categories);
+    }
+    else
+    {
+      throw new ScopeError.REQUEST_FAILED ("Merging not implemented");
+    }
+    
+    var iter = provider.get_first_iter ();
+    var end = provider.get_last_iter ();
+    /* everything is prepared now, we can push results directly
+     * into the synchronizer */
+    while (iter != end)
+    {
+      unowned Variant[] row_buf = sync.prepare_row_buf (provider, iter);
+      sync.merge_strategy.merge_result (source_scope_id, sync.receiver, row_buf);
+
+      iter = provider.next (iter);
+    }
+    
+    if (sync.receiver is Dee.SharedModel)
+      (sync.receiver as Dee.SharedModel).flush_revision_queue ();
+  }
+ 
+  /* DBus properties */
+  public bool visible { owned get { return owner.visible; } }
+  public bool is_master { owned get { return owner.is_master; } }
+  public string search_hint { owned get { return owner.search_hint ?? ""; } }
+  public HashTable<string, string> metadata
+  {
+    owned get
+    {
+      var schema = owner.schema;
+      var required_schema = new HashTable<string, string> (str_hash, str_equal);
+      foreach (unowned Unity.Schema.FieldInfo? field in schema.get_fields ())
+      {
+        if (field.type == Schema.FieldType.REQUIRED)
+          required_schema[field.name] = field.schema;
+      }
+      return required_schema;
+    }
+  }
+  public HashTable<string, string> optional_metadata
+  {
+    owned get
+    {
+      var schema = owner.schema;
+      var optional_schema = new HashTable<string, string> (str_hash, str_equal);
+      foreach (unowned Unity.Schema.FieldInfo? field in schema.get_fields ())
+      {
+        if (field.type == Schema.FieldType.OPTIONAL)
+          optional_schema[field.name] = field.schema;
+      }
+      return optional_schema;
+    }
+  }
+  public Variant categories
+  {
+    owned get { return categories_model.serialize (); }
+  }
+  public Variant filters
+  {
+    owned get { return filters_model.serialize (); }
+  }
+  public HashTable<string, Variant> hints
+  {
+    owned get { return new HashTable<string, Variant> (null, null); }
+  }
+}
+
+} /* namespace Unity.Internal */

=== added file 'src/unity-aggregator-scope.vala'
--- src/unity-aggregator-scope.vala	1970-01-01 00:00:00 +0000
+++ src/unity-aggregator-scope.vala	2013-03-25 11:25:26 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Michal Hruby <[e-mail]>
+ *             Pawel Stolowski <[e-mail]>
+ *
+ */
+
+using Unity.Protocol;
+
+namespace Unity {
+
+public abstract class AggregatorScope : DeprecatedScopeBase
+{
+  public enum SortFlags
+  {
+    ASCENDING,
+    DESCENDING,
+
+    CASE_INSENSITIVE = 1 << 10
+  }
+
+  public enum MergeMode
+  {
+    CATEGORY_ID,
+    OWNER_SCOPE
+  }
+
+  public MergeMode merge_mode { get; set; }
+
+  public bool proxy_filter_hints { get; set; }
+
+  /**
+   * Maps scope ids to associated category index, needed if merge mode is OWNER_SCOPE.
+   * A dummy implementation may be provided for merge mode = DISPLAY_NAME.
+   */
+  public abstract int category_index_for_scope_id (string scope_id);
+
+  public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+  {
+    Object (dbus_path: dbus_path_, id: id_, is_master: true,
+            merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
+  }
+
+  /**
+   * Sort data in a given category by values of 'field'.
+   *
+   * Aggregating results from multiple scopes often needs a clear way to sort
+   * the results, to do that you can define category-specific sorting rules.
+   * As an example, a category displaying recent items might be sorted using
+   * a "timestamp" field (which would be defined as either a required or 
+   * optional metadata field {@link Unity.Scope.metadata_schema}).
+   * For categories that don't have any obvious order it is recommended to sort
+   * them according to the "title" field.
+   *
+   * @param category_index Index of the sorted category
+   * @param field Name of the field the order will be based on
+   * @param flags The way sorting is performed
+   */
+  public void add_sorter (uint category_index, string field, SortFlags flags)
+  {
+    var pimpl = get_impl () as Internal.AggregatorScopeImpl;
+    pimpl.add_sorter (category_index, field, flags);
+  }
+
+  /**
+   * Constraint data to be unique according to value of 'field'.
+   *
+   * This method allows de-duplication of results from multiple scopes
+   * by only allowing unique values for the given field.
+   * As an example, a scope that is aggregating results from different local
+   * music databases could simply constraint the results on values of the "uri"
+   * field, which would ensure that songs with the same uri are displayed only
+   * once.
+   * 
+   * @param category_index Index of the constrained category,
+   *                       or -1 to constraint all categories
+   * @param field Name of the constrained field
+   */
+  public void add_constraint (int category_index, string field)
+  {
+    var pimpl = get_impl () as Internal.AggregatorScopeImpl;
+    pimpl.add_constraint (category_index, field);
+  }
+
+  public abstract async void search (Unity.AggregatedScopeSearch scope_search);
+
+  public virtual async ActivationResponse? activate (Unity.AggregatorActivation activation)
+  {
+    return null;
+  }
+
+  internal async HashTable<string, Variant> search_scope (Unity.AggregatedScopeSearch search, string scope_id, string search_query, SearchType search_type, HashTable<string, Variant>? hints) throws Error
+  {
+    var pimpl = get_impl () as Internal.AggregatorScopeImpl;
+    var res = yield pimpl.search_scope (search, scope_id, search_query,
+                                         search_type, hints);
+    return res;
+  }
+
+  internal async void push_results (string channel_id, string scope_id,
+                                    Dee.SerializableModel results_model,
+                                    string[] category_ids)
+  {
+    var pimpl = get_impl () as Internal.AggregatorScopeImpl;
+    try
+    {
+      yield pimpl.push_results_to_scope (channel_id, scope_id, results_model,
+                                         category_ids);
+    }
+    catch (Error err)
+    {
+      warning ("%s", err.message);
+    }
+  }
+
+  internal void push_filter_settings (string channel_id, FilterSet filters)
+  {
+    var pimpl = get_impl () as Internal.AggregatorScopeImpl;
+    pimpl.push_filter_settings (channel_id, filters);
+  }
+
+  internal override Object create_impl ()
+  {
+    return new Internal.AggregatorScopeImpl (this);
+  }
+}
+
+} /* namespace */

=== modified file 'src/unity-appinfo-manager.vala'
--- src/unity-appinfo-manager.vala	2012-02-27 09:05:54 +0000
+++ src/unity-appinfo-manager.vala	2013-03-25 11:25:26 +0000
@@ -27,6 +27,7 @@
  */
 
 using Gee;
+using Unity.Internal;
 
 namespace Unity {
 
@@ -34,6 +35,7 @@
    * doesn't work very well with maps with type <string,string[]>.
    * If we encapsulate the string[] in an object we have ref counting
    * and map generics working again */
+  [Compact]
   private class StringArrayWrapper
   {
     public string[] strings;
@@ -230,7 +232,7 @@
       if (appinfo == null)
         return null;
 
-      var result = categories_by_id.lookup (id);
+      unowned StringArrayWrapper result = categories_by_id[id];
       return result != null ? result.strings : null;
     }
     
@@ -252,7 +254,7 @@
       if (appinfo == null)
         return null;
 
-      var result = keywords_by_id.lookup (id);
+      unowned StringArrayWrapper result = keywords_by_id[id];
       return result != null ? result.strings : null;
     }
 	
@@ -377,9 +379,9 @@
         string[] categories = keyfile.get_string_list ("Desktop Entry",
                                                        "Categories");
 
-        var wrapper = new StringArrayWrapper();
+        var wrapper = new StringArrayWrapper ();
         wrapper.take_strings ((owned) categories);
-        categories_by_id.insert (id, wrapper);
+        categories_by_id[id] = (owned) wrapper;
       } catch (KeyFileError eee) {
         /* Unknown key or group. This app has no XDG Catories */
       }
@@ -430,7 +432,7 @@
           
       var wrapper = new StringArrayWrapper();