Merge lp:~stolowski/unity-lens-files/merge-smartscopes into lp:unity-lens-files

[Paweł Stołowski]

Merge new scope API changes (100 scopes feature).

Merge new scope API changes (100 scopes feature).
Note: needs libunity 7.0.0 to land (should happen very soon).

[lp:~stolowski/unity-lens-files/merge-smartscopes]

257. By Paweł Stołowski on 2013-05-16

Fixed requirement for libunity-dev.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/unity-lens-files-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-i386-ci/2/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/unity-lens-files-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-i386-ci/3/console

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

review: Needs Fixing (continuous-integration)

[lp:~stolowski/unity-lens-files/merge-smartscopes]

258. By Paweł Stołowski on 2013-05-16

Added changelog entry for 7.1.0.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/unity-lens-files-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-amd64-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-armhf-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-i386-ci/4

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/unity-lens-files-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-amd64-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-armhf-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-i386-ci/5

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/unity-lens-files-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-files-raring-i386-ci/6

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks good, but it's late, soo... Anyway, approved!

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-03-23 14:06:10 +0000
+++ Makefile.am	2013-05-16 21:24:24 +0000
@@ -1,16 +1,16 @@
 SUBDIRS = src data po tests
 
 #
-# Install the files.lens file
+# Install the local.scope file
 #
-lens_in_files = files.lens.in
-lensdir = $(LENSESDIR)/files
-lens_DATA = $(lens_in_files:.lens.in=.lens)
+scope_in_files = local.scope.in
+scopedir = $(SCOPESDIR)/files
+scope_DATA = $(scope_in_files:.scope.in=.scope)
 
 icondir = $(datadir)/unity/themes
 icon_DATA = files.png
 
-@INTLTOOL_LENS_RULE@
+@INTLTOOL_SCOPE_RULE@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
@@ -32,12 +32,12 @@
 EXTRA_DIST = \
   autogen.sh \
   files.png \
-  $(lens_in_files) \
+  $(scope_in_files) \
   AUTHORS \
   COPYING \
   MAINTAINERS \
   README
 
 CLEANFILES = \
-  $(lens_DATA)
+  $(scope_DATA)
 

=== modified file 'configure.ac'
--- configure.ac	2013-02-27 13:19:01 +0000
+++ configure.ac	2013-05-16 21:24:24 +0000
@@ -1,4 +1,4 @@
-AC_INIT(unity-lens-files, 7.0, https://launchpad.net/unity-lens-files)
+AC_INIT(unity-lens-files, 7.1, https://launchpad.net/unity-lens-files)
 AC_COPYRIGHT([Copyright 2010-2012 Canonical])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -46,16 +46,16 @@
 AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
 
 ######################################################
-# intltool rule for generating translated .lens file
+# intltool rule for generating translated .scope file
 ######################################################
-INTLTOOL_LENS_RULE='%.lens: %.lens.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_LENS_RULE)
+INTLTOOL_SCOPE_RULE='%.scope: %.scope.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST(INTLTOOL_SCOPE_RULE)
 
 #####################################################
 # Check for module and library dependancies
 #####################################################
 GLIB_REQUIRED=2.27
-PKG_CHECK_MODULES(LENS_DAEMON,
+PKG_CHECK_MODULES(SCOPE_DAEMON,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
@@ -63,11 +63,11 @@
                   gee-1.0
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.17
-                  unity >= 5.93.0)
-
-
-AC_SUBST(LENS_DAEMON_CFLAGS)
-AC_SUBST(LENS_DAEMON_LIBS)
+                  unity >= 7.0.0)
+
+
+AC_SUBST(SCOPE_DAEMON_CFLAGS)
+AC_SUBST(SCOPE_DAEMON_LIBS)
 
 #####################################################
 # local install for distcheck and stand-alone running
@@ -107,21 +107,21 @@
 GLIB_GSETTINGS
 
 #####################################################
-# Look for correct Lenses dir
+# Look for correct Scopes dir
 #####################################################
 if test "x$with_localinstall" = "xyes"; then
-	LENSESDIR="${datadir}/unity/lenses"
+	SCOPESDIR="${datadir}/unity/scopes"
 else
-	LENSESDIR=`$PKG_CONFIG --variable=lensesdir unity`
+	SCOPESDIR=`$PKG_CONFIG --variable=scopesdir unity`
 fi
-AC_SUBST(LENSESDIR)
+AC_SUBST(SCOPESDIR)
 
 #####################################################
 # Create the Makefiles
 #####################################################
 AC_CONFIG_FILES([
   Makefile
-  files.lens.in
+  local.scope.in
   data/Makefile
   data/com.canonical.Unity.FilesLens.gschema.xml.in
   src/Makefile
@@ -146,5 +146,5 @@
   Extra CFlags    : ${CPPFLAGS} $MAINTAINER_CFLAGS
   Extra ValaFlags : ${CPPFLAGS} $MAINTAINER_VALAFLAGS
 
-  Lenses Directory: ${LENSESDIR}
+  Scopes Directory: ${SCOPESDIR}
 ])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-11-08 22:50:09 +0000
+++ data/Makefile.am	2013-05-16 21:24:24 +0000
@@ -1,5 +1,5 @@
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  unity-lens-files.service.in
+service_in_files =  unity-scope-files-local.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
@@ -19,6 +19,6 @@
   $(service_in_files)
 
 CLEANFILES = \
-  unity-lens-files.service \
+  unity-scope-files-local.service \
   $(gsettings_SCHEMAS)
 

=== renamed file 'data/unity-lens-files.service.in' => 'data/unity-scope-files-local.service.in'
--- data/unity-lens-files.service.in	2012-11-08 22:50:09 +0000
+++ data/unity-scope-files-local.service.in	2013-05-16 21:24:24 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.Unity.Lens.Files
+Name=com.canonical.Unity.Scope.LocalFiles
 Exec=@pkglibexecdir@/unity-files-daemon

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 21:58:04 +0000
+++ debian/changelog	2013-05-16 21:24:24 +0000
@@ -1,3 +1,9 @@
+unity-lens-files (7.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Pawel Stolowski <[e-mail]>  Thu, 16 May 2013 23:21:20 +0200
+
 unity-lens-files (7.0~daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 252 (ubuntu-unity/next)

=== modified file 'debian/control'
--- debian/control	2013-04-12 12:25:57 +0000
+++ debian/control	2013-05-16 21:24:24 +0000
@@ -10,7 +10,7 @@
                libgee-dev,
                libdee-dev (>= 0.5.16),
                libzeitgeist-dev (>= 0.3.17),
-               libunity-dev (>= 6.5.2),
+               libunity-dev (>= 7.0.0),
                zeitgeist-core (>= 0.5.0-0ubuntu2),
                dh-autoreconf,
                dh-translations,

=== renamed file 'files.lens.in.in' => 'local.scope.in.in'
--- files.lens.in.in	2012-07-05 11:34:20 +0000
+++ local.scope.in.in	2013-05-16 21:24:24 +0000
@@ -1,9 +1,10 @@
-[Lens]
-DBusName=com.canonical.Unity.Lens.Files
-DBusPath=/com/canonical/unity/lens/files
-Icon=@prefix@/share/unity/6/lens-nav-file.svg
+[Scope]
+DBusName=com.canonical.Unity.Scope.LocalFiles
+DBusPath=/com/canonical/unity/scope/files
+Icon=@prefix@/share/unity/icons/lens-nav-file.svg
 _Name=Files & Folders
-_Description=Find documents, downloads, and other files
+Type=files
+_Description=This is an Ubuntu search plugin that enables local files to be searched and displayed in the Dash underneath the Files & Folders header. If you do not wish to search this content source, you can disable this search plugin.
 _SearchHint=Search Files & Folders
 Shortcut=f
 

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-11 08:52:55 +0000
+++ po/POTFILES.in	2013-05-16 21:24:24 +0000
@@ -2,5 +2,5 @@
 src/daemon.vala
 src/utils.vala
 src/main.vala
-[type: gettext/ini]files.lens.in.in
+[type: gettext/ini]local.scope.in.in
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-11-08 22:50:09 +0000
+++ src/Makefile.am	2013-05-16 21:24:24 +0000
@@ -8,18 +8,18 @@
 pkglibexec_PROGRAMS = \
   unity-files-daemon
 
+AM_CFLAGS = -w
+
 unity_files_daemon_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   -DG_LOG_DOMAIN=\"unity-files-daemon\" \
-  $(LENS_DAEMON_CFLAGS) \
+  $(SCOPE_DAEMON_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
   -I$(srcdir) \
   -g
 
-# Note that we require the GLIB_2_22 flag for Valac because libzeitgeist
-# expects us to use g_ptr_array_unref instead of g_ptr_array_free.
 unity_files_daemon_VALAFLAGS = \
   -C \
   --pkg dee-1.0 \
@@ -28,11 +28,11 @@
   --pkg gee-1.0 \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
-  --define=GLIB_2_22 \
+  --target-glib=2.26 \
   $(MAINTAINER_VALAFLAGS)
 
 unity_files_daemon_LDADD = \
-  $(LENS_DAEMON_LIBS) \
+  $(SCOPE_DAEMON_LIBS) \
   $(NULL)
 
 unity_files_daemon_VALASOURCES = \

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-02-20 13:19:41 +0000
+++ src/daemon.vala	2013-05-16 21:24:24 +0000
@@ -37,8 +37,7 @@
     private Devices devices;
     private UrlChecker urls;
 
-    private Unity.Lens lens;
-    private Unity.Scope scope;
+    private Unity.DeprecatedScope scope;
 
     /* For each section we have a set of Zeitgeist.Event templates that
      * we use to query Zeitgeist */
@@ -49,32 +48,30 @@
     private const string USE_LOCATE_KEY = "use-locate";
     public bool use_locate { get; set; default = true; }
 
-    private Settings lens_settings;
+    private Settings scope_settings;
+    private Variant empty_asv;
 
     construct
     {
+      empty_asv = new Variant.array (VariantType.VARDICT.element (), {});
       prepare_type_templates ();
 
       if (SCHEMA_NAME in Settings.list_schemas ())
       {
-        lens_settings = new Settings (SCHEMA_NAME);
-        lens_settings.bind (USE_LOCATE_KEY, this, USE_LOCATE_KEY,
+        scope_settings = new Settings (SCHEMA_NAME);
+        scope_settings.bind (USE_LOCATE_KEY, this, USE_LOCATE_KEY,
                             SettingsBindFlags.GET);
       }
 
-      scope = new Unity.Scope ("/com/canonical/unity/scope/files");
+      scope = new Unity.DeprecatedScope ("/com/canonical/unity/scope/files",
+                                         "files-local.scope");
       scope.search_in_global = true;
-      scope.provides_personal_content = true;
+      scope.search_hint = _("Search Files & Folders");
       scope.activate_uri.connect (activate);
       scope.preview_uri.connect (preview);
 
-      lens = new Unity.Lens("/com/canonical/unity/lens/files", "files");
-      lens.search_in_global = true;
-      lens.search_hint = _("Search Files & Folders");
-      lens.visible = true;
       populate_categories ();
       populate_filters ();
-      lens.add_local_scope (scope);
 
       /* Bring up Zeitgeist interfaces */
       log = new Zeitgeist.Log ();
@@ -103,53 +100,48 @@
         scope.queue_search_changed (SearchType.GLOBAL);
       });
 
-      /* Listen for filter changes */
-      scope.filters_changed.connect (() => {
-        scope.queue_search_changed (SearchType.DEFAULT);
-      });
-
-      scope.generate_search_key.connect ((lens_search) => {
-        return lens_search.search_string.strip ();
-      });
-
-      /* Listen for changes to the lens entry search */
-      scope.search_changed.connect ((lens_search, search_type, cancellable) =>
+      scope.generate_search_key.connect ((search) => {
+        return search.search_string.strip ();
+      });
+
+      /* Listen for changes to the search */
+      scope.search_changed.connect ((search, search_type, cancellable) =>
       {
-        dispatch_search.begin (lens_search, search_type, cancellable);
+        dispatch_search.begin (search, search_type, cancellable);
       });
 
-      lens.export ();
+      scope.export ();
     }
 
-    private async void dispatch_search (LensSearch lens_search,
+    private async void dispatch_search (DeprecatedScopeSearch scope_search,
                                         SearchType search_type,
-                                        Cancellable cancellable)
+                                        GLib.Cancellable cancellable)
     {
       if (search_type == SearchType.GLOBAL)
       {
-        yield update_global_search_async (lens_search, cancellable);
+        yield update_global_search_async (scope_search, cancellable);
       }
       else
       {
-        yield update_search_async (lens_search, cancellable);
+        yield update_search_async (scope_search, cancellable);
       }
 
       // make sure we don't forget to emit finished (if we didn't get cancelled)
       if (!cancellable.is_cancelled ())
       {
-        if (lens_search.results_model.get_n_rows () == 0)
+        if (scope_search.results_model.get_n_rows () == 0)
         {
-          lens_search.set_reply_hint ("no-results-hint",
+          scope_search.set_reply_hint ("no-results-hint",
             _("Sorry, there are no files or folders that match your search."));
         }
 
-        lens_search.finished ();
       }
+      scope_search.finished ();
     }
 
     private void populate_filters ()
     {
-      var filters = new GLib.List<Unity.Filter> ();
+      var filters = new Unity.FilterSet ();
 
       /* Last modified */
       {
@@ -159,7 +151,7 @@
         filter.add_option ("last-30-days", _("Last 30 days"));
         filter.add_option ("last-year", _("Last year"));
 
-        filters.append (filter);
+        filters.add (filter);
       }
 
       /* Type filter */
@@ -175,7 +167,7 @@
         filter.add_option ("presentations", _("Presentations"));
         filter.add_option ("other", _("Other"));
 
-        filters.append (filter);
+        filters.add (filter);
       }
 
       /* Size filter */
@@ -190,38 +182,34 @@
         filter.add_option ("1GB", _("1GB"));
         filter.add_option (">1GB", _(">1GB"));
 
-        filters.append (filter);
+        filters.add (filter);
       }
 
-      lens.filters = filters;
+      scope.filters = filters;
     }
 
     private void populate_categories ()
     {
-      var categories = new GLib.List<Unity.Category> ();
+      var categories = new Unity.CategorySet ();
       var icon_dir = File.new_for_path (ICON_PATH);
 
-      var cat = new Unity.Category (_("Recent"),
-                                    new FileIcon (icon_dir.get_child ("group-recent.svg")));
-      categories.append (cat);
+      var cat = new Unity.Category ("global", _("Files & Folders"),
+                                    new FileIcon (icon_dir.get_child ("group-folders.svg")));
+      categories.add (cat);
 
-      cat = new Unity.Category (_("Recent Files"),
+      cat = new Unity.Category ("recent", _("Recent"),
                                 new FileIcon (icon_dir.get_child ("group-recent.svg")));
-      categories.append (cat);
+      categories.add (cat);
 
-      cat =  new Unity.Category (_("Downloads"),
+      cat =  new Unity.Category ("downloads", _("Downloads"),
                                  new FileIcon (icon_dir.get_child ("group-downloads.svg")));
-      categories.append (cat);
-
-      cat = new Unity.Category (_("Folders"),
-                                new FileIcon (icon_dir.get_child ("group-folders.svg")));
-      categories.append (cat);
-
-      cat = new Unity.Category (_("Files & Folders"),
-                                new FileIcon (icon_dir.get_child ("group-folders.svg")));
-      categories.append (cat);
-
-      lens.categories = categories;
+      categories.add (cat);
+
+      cat = new Unity.Category ("folders", _("Folders"),
+                                new FileIcon (icon_dir.get_child ("group-folders.svg")));
+      categories.add (cat);
+
+      scope.categories = categories;
     }
 
     private void init_templates (HashTable<string, Event> templates,
@@ -374,14 +362,14 @@
       return templates;
     }
 
-    private bool is_search_empty (LensSearch search)
+    private bool is_search_empty (DeprecatedScopeSearch search)
     {
       if (search.search_string == null) return true;
 
       return search.search_string.strip () == "";
     }
 
-    private string prepare_search_string (LensSearch search)
+    private string prepare_search_string (DeprecatedScopeSearch search)
     {
       var s = search.search_string;
 
@@ -401,8 +389,8 @@
       return s;
     }
 
-    private async void update_global_search_async (LensSearch search,
-                                                   Cancellable cancellable)
+    private async void update_global_search_async (DeprecatedScopeSearch search,
+                                                   GLib.Cancellable cancellable)
     {
       var has_search = !is_search_empty (search);
       var results_model = search.results_model;
@@ -416,7 +404,7 @@
         /* Get results ranked by recency */
         var results = yield run_zg_query (search,
                                           new Zeitgeist.TimeRange.anytime (),
-                                          ResultType.MOST_RECENT_CURRENT_URI,
+                                          Zeitgeist.ResultType.MOST_RECENT_CURRENT_URI,
                                           null,
                                           20,
                                           cancellable);
@@ -431,12 +419,12 @@
         {
           results_model.append (checked_url, urls.get_icon_for_type(url_type),
                 Categories.FILES_AND_FOLDERS,
+                ResultType.PERSONAL,
                 "text/html", search.search_string,
-                checked_url, checked_url);
+                checked_url, checked_url, empty_asv);
         }
 
-        var category_id = has_search ?
-          Categories.FILES_AND_FOLDERS : Categories.RECENT_FILES;
+        var category_id = Categories.FILES_AND_FOLDERS;
 
         Set<string>? bookmark_uris = null;
         if (has_search)
@@ -456,10 +444,10 @@
         }
 
         var result_flags = has_search ? ResultFlags.EXTRACT_ORIGINS : 0;
-        Unity.FilesLens.append_events_sorted (search.search_string,
-                                              results, results_model,
-                                              0, int64.MAX, result_flags,
-                                              bookmark_uris, category_id);
+        append_events_sorted (search.search_string,
+                              results, results_model,
+                              0, int64.MAX, result_flags,
+                              bookmark_uris, category_id);
 
         if (has_search)
         {
@@ -478,21 +466,21 @@
         {
           results = yield run_zg_query (search,
                                         new Zeitgeist.TimeRange.anytime (),
-                                        ResultType.MOST_RECENT_CURRENT_URI,
+                                        Zeitgeist.ResultType.MOST_RECENT_CURRENT_URI,
                                         null,
                                         40,
                                         cancellable,
                                         true);
 
-          Unity.FilesLens.append_events_sorted (search.search_string,
-                                                results, results_model,
-                                                0, int64.MAX, ResultFlags.NONE,
-                                                null, Categories.DOWNLOADS);
+          append_events_sorted (search.search_string,
+                                results, results_model,
+                                0, int64.MAX, ResultFlags.NONE,
+                                null, Categories.DOWNLOADS);
         }
 
         if (has_search && use_locate)
         {
-          yield perform_locate (500, search.search_string,
+          yield perform_locate (search, 500, search.search_string,
                                 search.results_model, cancellable,
                                 Categories.FILES_AND_FOLDERS,
                                 Categories.FILES_AND_FOLDERS);
@@ -506,16 +494,16 @@
       }
     }
 
-    private async void update_search_async (LensSearch search,
-                                            Cancellable cancellable)
+    private async void update_search_async (DeprecatedScopeSearch search,
+                                            GLib.Cancellable cancellable)
     {
       var results_model = search.results_model;
       var txn = new Dee.Transaction (results_model);
       var has_search = !is_search_empty (search);
 
-      var filter = scope.get_filter ("type") as OptionsFilter;
+      var filter = search.get_filter ("type") as OptionsFilter;
 
-      var active_filters = get_current_types ();
+      var active_filters = get_current_types (search);
       bool only_folders = active_filters != null &&
         active_filters.length == 1 && active_filters[0] == "folders";
       uint timer_id = 0;
@@ -523,12 +511,12 @@
       try
       {
         /* Get results ranked by recency */
-        ResultSet? results = null;
+        Zeitgeist.ResultSet? results = null;
         if (!only_folders)
         {
           results = yield run_zg_query (search,
-                                        get_current_timerange (),
-                                        ResultType.MOST_RECENT_CURRENT_URI,
+                                        get_current_timerange (search),
+                                        Zeitgeist.ResultType.MOST_RECENT_CURRENT_URI,
                                         filter,
                                         50,
                                         cancellable);
@@ -543,37 +531,37 @@
         if (checked_url != null)
         {
           txn.append (checked_url, urls.get_icon_for_type(url_type),
-                Categories.RECENT,
+                Categories.RECENT, ResultType.PERSONAL,
                 "text/html", search.search_string,
-                checked_url, checked_url);
+                checked_url, checked_url, empty_asv);
         }
 
         /* apply filters to results found by zeitgeist */
         int64 min_size, max_size;
-        get_current_size_limits (out min_size, out max_size);
+        get_current_size_limits (search, out min_size, out max_size);
 
         if (results != null)
         {
-          Unity.FilesLens.append_events_sorted (search.search_string,
-                                                results, txn,
-                                                min_size, max_size,
-                                                ResultFlags.SKIP_FOLDERS);
+          append_events_sorted (search.search_string,
+                                results, txn,
+                                min_size, max_size,
+                                ResultFlags.SKIP_FOLDERS);
         }
 
         /* get recently downloaded files */
         results = yield run_zg_query (search,
-                                      get_current_timerange (),
-                                      ResultType.MOST_RECENT_CURRENT_URI,
+                                      get_current_timerange (search),
+                                      Zeitgeist.ResultType.MOST_RECENT_CURRENT_URI,
                                       filter,
                                       50,
                                       cancellable,
                                       true);
 
-        Unity.FilesLens.append_events_sorted (search.search_string,
-                                              results, txn,
-                                              min_size, max_size,
-                                              ResultFlags.NONE,
-                                              null, Categories.DOWNLOADS);
+        append_events_sorted (search.search_string,
+                              results, txn,
+                              min_size, max_size,
+                              ResultFlags.NONE,
+                              null, Categories.DOWNLOADS);
 
         /* commit if the origin query is taking too long, if we committed right
          * away, we'd cause flicker */
@@ -595,8 +583,8 @@
         if (filter == null ||
             !filter.filtering || filter.get_option ("folders").active)
         {
-          results = yield run_zg_query (search, get_current_timerange (),
-                                        ResultType.MOST_RECENT_ORIGIN,
+          results = yield run_zg_query (search, get_current_timerange (search),
+                                        Zeitgeist.ResultType.MOST_RECENT_ORIGIN,
                                         null, 50, cancellable);
 
           if (!txn.is_committed ()) txn.commit ();
@@ -618,11 +606,11 @@
             bookmark_uris.add (bookmark_obj.dnd_uri);
           }
 
-          Unity.FilesLens.append_events_sorted (search.search_string,
-                                                results, results_model,
-                                                min_size, max_size,
-                                                ResultFlags.USE_ORIGIN,
-                                                bookmark_uris);
+          append_events_sorted (search.search_string,
+                                results, results_model,
+                                min_size, max_size,
+                                ResultFlags.USE_ORIGIN,
+                                bookmark_uris);
 
           GLib.List<Device> matching_devices;
 
@@ -642,7 +630,7 @@
 
         if (has_search && use_locate)
         {
-          yield perform_locate (500, search.search_string,
+          yield perform_locate (search, 500, search.search_string,
                                 search.results_model, cancellable);
         }
 
@@ -658,10 +646,10 @@
       }
     }
 
-    private string[]? get_current_types ()
+    private string[]? get_current_types (DeprecatedScopeSearch search)
     {
       /* returns null if the filter is disabled / all options selected */
-      var filter = scope.get_filter ("type") as CheckOptionFilter;
+      var filter = search.get_filter ("type") as CheckOptionFilter;
 
       if (filter == null || !filter.filtering) return null;
       string[] types = {};
@@ -679,9 +667,9 @@
       return types;
     }
 
-    private TimeRange get_current_timerange ()
+    private TimeRange get_current_timerange (DeprecatedScopeSearch search)
     {
-      var filter = scope.get_filter ("modified") as RadioOptionFilter;
+      var filter = search.get_filter ("modified") as RadioOptionFilter;
       Unity.FilterOption? option = filter.get_active_option ();
 
       string date = option == null ? "all" : option.id;
@@ -696,9 +684,9 @@
         return new TimeRange.anytime ();
     }
 
-    private void get_current_size_limits (out int64 min_size, out int64 max_size)
+    private void get_current_size_limits (DeprecatedScopeSearch search, out int64 min_size, out int64 max_size)
     {
-      var filter = scope.get_filter ("size") as MultiRangeFilter;
+      var filter = search.get_filter ("size") as MultiRangeFilter;
       Unity.FilterOption? min_opt = filter.get_first_active ();
       Unity.FilterOption? max_opt = filter.get_last_active ();
 
@@ -766,16 +754,16 @@
       }
     }
 
-    private async ResultSet? run_zg_query (LensSearch search,
-                                           TimeRange time_range,
-                                           ResultType result_type,
-                                           OptionsFilter? filters,
-                                           uint num_results,
-                                           Cancellable cancellable,
-                                           bool downloads_only = false)
-        throws Error
+    private async Zeitgeist.ResultSet? run_zg_query (
+        DeprecatedScopeSearch search,
+        TimeRange time_range,
+        Zeitgeist.ResultType result_type,
+        OptionsFilter? filters,
+        uint num_results,
+        GLib.Cancellable cancellable,
+        bool downloads_only = false) throws Error
     {
-      ResultSet results;
+      Zeitgeist.ResultSet results;
       var timer = new Timer ();
       var templates = create_template (filters, downloads_only);
       if (templates == null) return null;
@@ -824,8 +812,9 @@
       foreach (var bookmark in bookmarks)
       {
         results_model.append (bookmark.uri, bookmark.icon, category,
-                              bookmark.mimetype, bookmark.display_name,
-                              bookmark.dnd_uri);
+                              ResultType.PERSONAL,
+                              bookmark.mimetype, bookmark.display_name, "",
+                              bookmark.dnd_uri, empty_asv);
       }
     }
 
@@ -836,22 +825,36 @@
       foreach (var device in devices)
       {
         results_model.append (device.uri, device.icon_name, category,
-                              "", device.display_name,
-                              device.dnd_uri);
+                              ResultType.PERSONAL, "", device.display_name, "",
+                              device.dnd_uri, empty_asv);
       }
     }
 
-    private async void perform_locate (uint timeout,
+    private async void perform_locate (DeprecatedScopeSearch search,
+                                       uint timeout,
                                        string query,
                                        Dee.Model results_model,
-                                       Cancellable cancellable,
+                                       GLib.Cancellable cancellable,
                                        int files_category = Categories.RECENT,
                                        int dirs_category = Categories.FOLDERS)
       throws Error
     {
+      cancellable.set_error_if_cancelled (); // throws IOError
       /* Wait a while before starting the locate search */
-      Timeout.add_full (Priority.LOW, timeout, perform_locate.callback);
+      uint timer_src_id = Timeout.add_full (Priority.LOW, timeout,
+                                            perform_locate.callback);
+      var canc_id = cancellable.connect (() =>
+      {
+        if (timer_src_id != 0) Source.remove (timer_src_id);
+        timer_src_id = 0;
+        // can't invoke directly, the disconnect call would deadlock
+        Idle.add_full (Priority.DEFAULT, perform_locate.callback);
+      });
       yield;
+
+      cancellable.disconnect (canc_id);
+      if (timer_src_id != 0) Source.remove (timer_src_id);
+
       cancellable.set_error_if_cancelled (); // throws IOError
 
       var results = yield Locate.locate (query, cancellable);
@@ -867,10 +870,10 @@
         model_iter = results_model.next (model_iter);
       }
 
-      var timerange = get_current_timerange ();
+      var timerange = get_current_timerange (search);
       int64 min_size, max_size;
-      get_current_size_limits (out min_size, out max_size);
-      var types = get_current_types ();
+      get_current_size_limits (search, out min_size, out max_size);
+      var types = get_current_types (search);
 
       foreach (var info in results)
       {
@@ -898,8 +901,9 @@
         uint category_id = mimetype == "inode/directory" ?
           dirs_category : files_category;
 
-        results_model.append (uri, icon_hint, category_id,
-                              mimetype, info.get_display_name (), uri);
+        results_model.append (uri, icon_hint, category_id, ResultType.PERSONAL,
+                              mimetype, info.get_display_name (), "", uri,
+                              empty_asv);
       }
     }
 
@@ -1184,180 +1188,180 @@
       scope.queue_search_changed (SearchType.DEFAULT);
       scope.queue_search_changed (SearchType.GLOBAL);
     }
-  }
-
-  private const string ATTRS_TYPE_HIDDEN = FileAttribute.STANDARD_TYPE +
-    "," + FileAttribute.STANDARD_IS_HIDDEN;
-  private const string ATTRS_TYPE_SIZE_HIDDEN = FileAttribute.STANDARD_TYPE +
-    "," + FileAttribute.STANDARD_SIZE +
-    "," + FileAttribute.STANDARD_IS_HIDDEN;
-
-  [Flags]
-  public enum ResultFlags
-  {
-    NONE = 0,
-    USE_ORIGIN,
-    EXTRACT_ORIGINS,
-    SKIP_FOLDERS,
-  }
-
-  /* Appends a set of Zeitgeist.Events to our Dee.Model assuming that
-   * these events are already sorted with descending timestamps */
-  public void append_events_sorted (string search_string,
-                                    Zeitgeist.ResultSet? events,
-                                    Dee.Model results,
-                                    int64 min_size, int64 max_size,
-                                    ResultFlags flags,
-                                    Gee.Set<string>? excluded_uris = null,
-                                    int category_override = -1)
-  {
-    if (events == null) return;
-    uint category_id;
-    Set<string>? extracted_directories = null;
-
-    if (ResultFlags.EXTRACT_ORIGINS in flags)
-    {
-      var folded_search = search_string.casefold ();
-      var origins = new HashSet<string> ();
-      // loop through all found events, take a look at origin field, add it
-      // to result set if it matches our search
-      // NOTE: using separate zg query with MOST_RECENT_ORIGINS grouping
-      // is more likely to find relevant directories, but is much slower
-      // than this kind of "approximation"
+
+    private const string ATTRS_TYPE_HIDDEN = FileAttribute.STANDARD_TYPE +
+      "," + FileAttribute.STANDARD_IS_HIDDEN;
+    private const string ATTRS_TYPE_SIZE_HIDDEN = FileAttribute.STANDARD_TYPE +
+      "," + FileAttribute.STANDARD_SIZE +
+      "," + FileAttribute.STANDARD_IS_HIDDEN;
+
+    [Flags]
+    public enum ResultFlags
+    {
+      NONE = 0,
+      USE_ORIGIN,
+      EXTRACT_ORIGINS,
+      SKIP_FOLDERS,
+    }
+
+    /* Appends a set of Zeitgeist.Events to our Dee.Model assuming that
+     * these events are already sorted with descending timestamps */
+    public void append_events_sorted (string search_string,
+                                      Zeitgeist.ResultSet? events,
+                                      Dee.Model results,
+                                      int64 min_size, int64 max_size,
+                                      ResultFlags flags,
+                                      Gee.Set<string>? excluded_uris = null,
+                                      int category_override = -1)
+    {
+      if (events == null) return;
+      uint category_id;
+      Set<string>? extracted_directories = null;
+
+      if (ResultFlags.EXTRACT_ORIGINS in flags)
+      {
+        var folded_search = search_string.casefold ();
+        var origins = new HashSet<string> ();
+        // loop through all found events, take a look at origin field, add it
+        // to result set if it matches our search
+        // NOTE: using separate zg query with MOST_RECENT_ORIGINS grouping
+        // is more likely to find relevant directories, but is much slower
+        // than this kind of "approximation"
+        foreach (var ev in events)
+        {
+          if (ev.num_subjects () > 0)
+          {
+            string origin = ev.get_subject (0).get_origin ();
+            if (origin == null || origin == "") continue;
+            var f = File.new_for_uri (origin);
+            origin = f.get_uri ();
+            if (excluded_uris != null && origin in excluded_uris) continue;
+            if (!(origin in origins) && f.is_native () && f.query_exists ())
+            {
+              string? path = f.get_path ();
+              if (path != null && path.contains ("/."))
+                continue;
+
+              var display_name = Path.get_basename (f.get_parse_name ());
+              if (display_name.casefold ().has_prefix (folded_search))
+              {
+                string mimetype = "inode/directory";
+                string icon = Utils.get_icon_for_uri (origin, mimetype);
+                if (category_override >= 0)
+                  category_id = category_override;
+                else
+                  category_id = Categories.FOLDERS;
+                results.append (origin, icon, category_id, ResultType.PERSONAL,
+                                mimetype, display_name, "", origin, empty_asv);
+              }
+              else
+              {
+                if (extracted_directories == null)
+                {
+                  extracted_directories = new HashSet<string> ();
+                }
+                extracted_directories.add (origin);
+              }
+              origins.add (origin);
+            }
+          }
+        }
+        // we need this because of way ResultSet works with foreach
+        if (events.size () > 0) events.seek (0);
+      }
       foreach (var ev in events)
       {
         if (ev.num_subjects () > 0)
         {
-          string origin = ev.get_subject (0).get_origin ();
-          if (origin == null || origin == "") continue;
-          var f = File.new_for_uri (origin);
-          origin = f.get_uri ();
-          if (excluded_uris != null && origin in excluded_uris) continue;
-          if (!(origin in origins) && f.is_native () && f.query_exists ())
-          {
-            string? path = f.get_path ();
-            if (path != null && path.contains ("/."))
-              continue;
-
-            var display_name = Path.get_basename (f.get_parse_name ());
-            if (display_name.casefold ().has_prefix (folded_search))
-            {
-              string mimetype = "inode/directory";
-              string icon = Utils.get_icon_for_uri (origin, mimetype);
-              if (category_override >= 0)
-                category_id = category_override;
-              else
-                category_id = Categories.FOLDERS;
-              results.append (origin, icon, category_id, mimetype,
-                              display_name, "", origin);
-            }
-            else
-            {
-              if (extracted_directories == null)
+          // FIXME: We only use the first subject...
+          Zeitgeist.Subject su = ev.get_subject (0);
+
+          string uri;
+          string display_name;
+          string mimetype;
+
+          if (ResultFlags.USE_ORIGIN in flags)
+          {
+            uri = su.get_origin ();
+            display_name = "";
+            mimetype = "inode/directory";
+          }
+          else
+          {
+            uri = su.get_current_uri ();
+            display_name = su.get_text ();
+            mimetype = su.get_mimetype ();
+            mimetype = su.get_mimetype () != null ?
+                       su.get_mimetype () : "application/octet-stream";
+          }
+          if (uri == null) continue;
+          File file = File.new_for_uri (uri);
+          if (excluded_uris != null && file.get_uri () in excluded_uris) continue;
+
+          if (display_name == null || display_name == "")
+          {
+            display_name = Path.get_basename (file.get_parse_name ());
+          }
+
+          bool check_size = min_size > 0 || max_size < int64.MAX;
+          /* Don't check existence on non-native files as http:// and
+           * friends are *very* expensive to query */
+          FileType file_type = FileType.UNKNOWN;
+          if (file.is_native ())
+          {
+            // hidden files should be ignored
+            try
+            {
+              FileInfo info = file.query_info (check_size ?
+                ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
+              string? path = file.get_path ();
+              if (path != null && path.contains ("/."))
+                continue;
+              if (check_size &&
+                (info.get_size () < min_size || info.get_size () > max_size))
               {
-                extracted_directories = new HashSet<string> ();
+                continue;
               }
-              extracted_directories.add (origin);
+              file_type = info.get_file_type ();
             }
-            origins.add (origin);
-          }
-        }
-      }
-      // we need this because of way ResultSet works with foreach
-      if (events.size () > 0) events.seek (0);
-    }
-    foreach (var ev in events)
-    {
-      if (ev.num_subjects () > 0)
-      {
-        // FIXME: We only use the first subject...
-        Zeitgeist.Subject su = ev.get_subject (0);
-
-        string uri;
-        string display_name;
-        string mimetype;
-
-        if (ResultFlags.USE_ORIGIN in flags)
-        {
-          uri = su.get_origin ();
-          display_name = "";
-          mimetype = "inode/directory";
-        }
-        else
-        {
-          uri = su.get_current_uri ();
-          display_name = su.get_text ();
-          mimetype = su.get_mimetype ();
-          mimetype = su.get_mimetype () != null ?
-                     su.get_mimetype () : "application/octet-stream";
-        }
-        if (uri == null) continue;
-        File file = File.new_for_uri (uri);
-        if (excluded_uris != null && file.get_uri () in excluded_uris) continue;
-
-        if (display_name == null || display_name == "")
-        {
-          display_name = Path.get_basename (file.get_parse_name ());
-        }
-
-        bool check_size = min_size > 0 || max_size < int64.MAX;
-        /* Don't check existence on non-native files as http:// and
-         * friends are *very* expensive to query */
-        FileType file_type = FileType.UNKNOWN;
-        if (file.is_native ())
-        {
-          // hidden files should be ignored
-          try
-          {
-            FileInfo info = file.query_info (check_size ?
-              ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
-            string? path = file.get_path ();
-            if (path != null && path.contains ("/."))
-              continue;
-            if (check_size &&
-              (info.get_size () < min_size || info.get_size () > max_size))
+            catch (GLib.Error e)
             {
+              // as error occurred file must be missing therefore ignoring it
               continue;
             }
-            file_type = info.get_file_type ();
-          }
-          catch (GLib.Error e)
-          {
-            // as error occurred file must be missing therefore ignoring it
-            continue;
-          }
+          }
+          string icon = Utils.get_icon_for_uri (uri, mimetype);
+          string comment = file.get_parse_name ();
+
+          var is_dir = file_type == FileType.DIRECTORY;
+          if (is_dir && ResultFlags.SKIP_FOLDERS in flags) continue;
+
+          if (category_override >= 0)
+            category_id = category_override;
+          else
+            category_id = is_dir ? Categories.FOLDERS : Categories.RECENT;
+
+          results.append (uri, icon, category_id, ResultType.PERSONAL, mimetype,
+                          display_name, comment, uri, empty_asv);
+
         }
-        string icon = Utils.get_icon_for_uri (uri, mimetype);
-        string comment = file.get_parse_name ();
-
-        var is_dir = file_type == FileType.DIRECTORY;
-        if (is_dir && ResultFlags.SKIP_FOLDERS in flags) continue;
-
-        if (category_override >= 0)
-          category_id = category_override;
-        else
-          category_id = is_dir ? Categories.FOLDERS : Categories.RECENT;
-
-        results.append (uri, icon, category_id, mimetype,
-                        display_name, comment, uri);
-
       }
-    }
 
-    if (extracted_directories != null)
-    {
-      foreach (var dir_uri in extracted_directories)
+      if (extracted_directories != null)
       {
-        var f = File.new_for_uri (dir_uri);
-        var display_name = Path.get_basename (f.get_parse_name ());
-        string mimetype = "inode/directory";
-        string icon = Utils.get_icon_for_uri (dir_uri, mimetype);
-        if (category_override >= 0)
-          category_id = category_override;
-        else
-          category_id = Categories.FOLDERS;
-        results.append (dir_uri, icon, category_id, mimetype,
-                        display_name, "", dir_uri);
+        foreach (var dir_uri in extracted_directories)
+        {
+          var f = File.new_for_uri (dir_uri);
+          var display_name = Path.get_basename (f.get_parse_name ());
+          string mimetype = "inode/directory";
+          string icon = Utils.get_icon_for_uri (dir_uri, mimetype);
+          if (category_override >= 0)
+            category_id = category_override;
+          else
+            category_id = Categories.FOLDERS;
+          results.append (dir_uri, icon, category_id, ResultType.PERSONAL,
+                          mimetype, display_name, "", dir_uri, empty_asv);
+        }
       }
     }
   }

=== modified file 'src/locate.vala'
--- src/locate.vala	2012-08-10 13:05:07 +0000
+++ src/locate.vala	2013-05-16 21:24:24 +0000
@@ -39,7 +39,7 @@
   private BlacklistTracker blacklist_tracker;
 
   public async GLib.SList<FileInfo> locate (string input_query,
-                                            Cancellable cancellable) throws Error
+                                            GLib.Cancellable cancellable) throws Error
   {
     if (blacklist_tracker == null) blacklist_tracker = new BlacklistTracker ();
     var result = new GLib.SList<FileInfo> ();

=== modified file 'src/main.vala'
--- src/main.vala	2011-09-29 13:25:10 +0000
+++ src/main.vala	2013-05-16 21:24:24 +0000
@@ -22,6 +22,7 @@
 
 namespace Unity.FilesLens {
 
+  static const string DBUS_NAME = "com.canonical.Unity.Scope.LocalFiles";
   static Application? app = null;
   static Daemon? daemon = null;
 
@@ -71,7 +72,7 @@
      * making it race against GDBus' worker thread to export our
      * objects on the bus before/after owning our name and receiving
      * method calls on our objects (which may not yet be up!)*/
-    if (dbus_name_has_owner ("com.canonical.Unity.Lens.Files"))
+    if (dbus_name_has_owner (DBUS_NAME))
       {
         print ("Another instance of the Unity Files Daemon " +
                "already appears to be running.\nBailing out.\n");
@@ -83,8 +84,7 @@
     daemon = new Daemon ();
   
     /* Use GApplication directly for single instance app functionality */
-    app = new Application ("com.canonical.Unity.Lens.Files",
-                           ApplicationFlags.IS_SERVICE);
+    app = new Application (DBUS_NAME, ApplicationFlags.IS_SERVICE);
     try {
       app.register ();
     } catch (Error e) {

=== modified file 'src/schemas.vala'
--- src/schemas.vala	2012-01-18 13:08:40 +0000
+++ src/schemas.vala	2013-05-16 21:24:24 +0000
@@ -19,30 +19,11 @@
 
 namespace Unity.FilesLens {
 
-  public enum ResultsColumn
-  {
-    URI = 0,
-    ICON_HINT,
-    GROUP_ID,
-    MIMETYPE,
-    DISPLAY_NAME,
-    COMMENT
-  }
-  
- public enum CategoriesColumn
-  {
-    RENDERER = 0,
-    DISPLAY_NAME,
-    ICON_HINT
-  }
-  
   public enum Categories
   {
+    FILES_AND_FOLDERS,
     RECENT,
-    RECENT_FILES,
     DOWNLOADS,
     FOLDERS,
-    FILES_AND_FOLDERS,
-    
   }
 }

=== modified file 'src/utils.vala'
--- src/utils.vala	2012-08-22 18:53:25 +0000
+++ src/utils.vala	2013-05-16 21:24:24 +0000
@@ -378,65 +378,23 @@
       }
     }
     
-  /* Run through @filter_set and remove any row from the result set's model
-   * in which URI is not in @valid_uris */
-  public void apply_uri_filter (Set<string> valid_uris,
-                                Dee.ResultSet filter_set)
-  {
-    var model = filter_set.get_model ();
-    uint n_removed = 0;
-    string uri;
-    
-    /* Anything in filter_set that is not in the event_uris set, is removed
-     * from the results_model */
-    foreach (var row in filter_set)
+    /* Extract a hash set of all subject uris in a Zeitgeist.ResultSet */
+    public Set<string> get_uri_set (Zeitgeist.ResultSet results)
     {
-      uri = model.get_string (row, ResultsColumn.URI);
-      if (!(uri in valid_uris))
+      Set<string> uris = new HashSet<string> ();
+      
+      foreach (var ev in results)
         {
-          model.remove (row);
-          n_removed++;
-          //debug ("  - %s", uri);
+          for (int i = 0; i  < ev.num_subjects(); i++)
+            uris.add (ev.get_subject (i).get_uri ());
         }
-    }
-    
-    if (n_removed > 0)
-      debug ("Removed %u rows from result set", n_removed);
-  }
-  
-  /* Returns true iff new_search is a query that simply restricts the
-   * result set of old_query */
-  public bool check_is_filter_search (LensSearch new_search, LensSearch? old_search)
-  {
-    bool is_filter_search = false;      
-    if (old_search != null)
-      {
-        string previous_search_string = old_search.search_string;
-        if (previous_search_string != null && previous_search_string != "")
-          is_filter_search = new_search.search_string.has_prefix (
-                                                      previous_search_string);
-      }
-    
-    return is_filter_search;
-  }
-  
-  /* Extract a hash set of all subject uris in a Zeitgeist.ResultSet */
-  public Set<string> get_uri_set (Zeitgeist.ResultSet results)
-  {
-    Set<string> uris = new HashSet<string> ();
-    
-    foreach (var ev in results)
-      {
-        for (int i = 0; i  < ev.num_subjects(); i++)
-          uris.add (ev.get_subject (i).get_uri ());
-      }
-    
-    return uris;
-  }
-  
-  public string normalize_string (string input)
-  {
-    return input.normalize (-1, NormalizeMode.ALL_COMPOSE).casefold ();
-  }
+      
+      return uris;
+    }
+    
+    public string normalize_string (string input)
+    {
+      return input.normalize (-1, NormalizeMode.ALL_COMPOSE).casefold ();
+    }
    
 } /* namespace */

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-03-20 09:40:56 +0000
+++ tests/Makefile.am	2013-05-16 21:24:24 +0000
@@ -4,7 +4,7 @@
 
 AM_CPPFLAGS = \
   -w \
-  $(LENS_DAEMON_CFLAGS) \
+  $(SCOPE_DAEMON_CFLAGS) \
   $(NULL)
 
 AM_VALAFLAGS = \
@@ -13,7 +13,7 @@
   $(NULL)
 
 test_libs = \
-  $(LENS_DAEMON_LIBS) \
+  $(SCOPE_DAEMON_LIBS) \
   $(NULL)
 
 test_url_checker_LDADD = $(test_libs)