Merge lp:~mhr3/unity-scope-click/handle-non-click into lp:unity-scope-click

[Michal Hruby]

Add a new scope which handles non-click apps and scopes.

Add a new scope which handles non-click apps and scopes, so we can remove the legacy applications scope from phone.

[lp:~mhr3/unity-scope-click/handle-non-click]

70. By Michal Hruby on 2013-10-07

Make the binary link properly

71. By Michal Hruby on 2013-10-07

Make activation work

72. By Michal Hruby on 2013-10-07

Fix activation

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://10.97.0.26:8080/job/unity-scope-click-ci/92/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/unity-scope-click-saucy-amd64-ci/92/console
    FAILURE: http://10.97.0.26:8080/job/unity-scope-click-saucy-armhf-ci/86/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/92/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://10.97.0.26:8080/job/unity-scope-click-ci/93/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-amd64-ci/93
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-armhf-ci/87

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/93/rebuild

review: Approve (continuous-integration)

[lp:~mhr3/unity-scope-click/handle-non-click]

73. By Michal Hruby on 2013-10-07

Wait to load local scopes

[dobey (dobey)]

It seems quite late in the cycle to be introducing this large of a change to the system, especially for something that is supposed to be going away very soon anyway, given all the core apps are supposed to be migrated to click packages.

It also seems like a bad idea to hard code a list of .desktop file names to be used here. What happens if the click package for an app is installed after it is migrated, on a system that still has the same app installed via dpkg?

And what about people who choose to test Unity 8 on non-phones in 13.10, given it will be installable as an environment to use as opposed to classic Unity or GNOME? How will they be able to launch Firefox, Inkscape, GIMP, and other apps, for example?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://10.97.0.26:8080/job/unity-scope-click-ci/94/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-amd64-ci/94
    SUCCESS: http://10.97.0.26:8080/job/unity-scope-click-saucy-armhf-ci/88

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/94/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Also, if you're going to keep making changes, then the branch isn't ready for review. Please stop adding commits to fix or change things, if it's ready for review. If you haven't finished testing and fixing it, then please change the status back to work in progress, and commit away.

[Michal Hruby (mhr3)]

> It seems quite late in the cycle to be introducing this large of a change to
> the system, especially for something that is supposed to be going away very
> soon anyway, given all the core apps are supposed to be migrated to click
> packages.

The original plan was that all apps would be click, and we'd be able to remove the apps scope by the end of this cycle, because the desktop apps scope has far too much legacy code in it. Obviously that didn't happen (and will not before 13.10 release), yet we still want to get rid of the desktop apps scope (problems with previews, libraries it uses keep waking up the system, etc..)

> It also seems like a bad idea to hard code a list of .desktop file names to be
> used here. What happens if the click package for an app is installed after it
> is migrated, on a system that still has the same app installed via dpkg?

This is really list of apps that should be click, yet are not. If you want handling of standard .desktop files, you'd install the standard unity-lens-applications.

> And what about people who choose to test Unity 8 on non-phones in 13.10, given
> it will be installable as an environment to use as opposed to classic Unity or
> GNOME? How will they be able to launch Firefox, Inkscape, GIMP, and other
> apps, for example?

See above.

[Alejandro J. Cura (alecu)]

I agree with dobey's comment about this branch being risky. In any case, I can see that the changes are isolated from the other bits of code, and while testing it on my device everything seems to work, but I'd like for more testing to be done before approving.

I need to run an unexpected errand, so I'm setting my review to abstain. I can re-review when I get back.

review: Abstain

[dobey (dobey)]

> The original plan was that all apps would be click, and we'd be able to remove
> the apps scope by the end of this cycle, because the desktop apps scope has
> far too much legacy code in it. Obviously that didn't happen (and will not
> before 13.10 release), yet we still want to get rid of the desktop apps scope
> (problems with previews, libraries it uses keep waking up the system, etc..)

Why is an 850+ line diff to move some of that code into this scope, better than smaller changes to fix some of the more pressing issues in the other scope? And how is it less risky to do so, this late in the cycle?

How does this set of changes fix only the linked bug? How does removing the existing scope and making this large change here, related to that bug? Shouldn't there be some other bug about the current scope you wish to get rid of, where these risks and such are being discussed, that this branch would then be linked to?

And how can we be certain there are no regressions from the current scope behavior, by moving the code here and dropping that scope?

[Michal Hruby (mhr3)]

> Why is an 850+ line diff to move some of that code into this scope, better
> than smaller changes to fix some of the more pressing issues in the other
> scope? And how is it less risky to do so, this late in the cycle?

Yes, it's 850 lines of additions, yet what you don't see here is the ~6k lines of removed code (no legacy apps scope). For example the power issue is not fixable in apps scope, cause we can't simply remove the backend bit that causes it. On the other hand, this uses parts of code that were present in apps scope for the entire cycle (the scopes + index bits), so it's well tested in a way.

> How does this set of changes fix only the linked bug? How does removing the
> existing scope and making this large change here, related to that bug?
> Shouldn't there be some other bug about the current scope you wish to get rid
> of, where these risks and such are being discussed, that this branch would
> then be linked to?

We're also fixing the power issue (lp:1231536) by removing apps scope, I didn't find it a fix for the bug though (click scope never had the issue) as legacy apps scope remains to have the bug, that's why I didn't link it.

> And how can we be certain there are no regressions from the current scope
> behavior, by moving the code here and dropping that scope?

Manually tested + as I said it's using similar, yet not the same code.

[dobey (dobey)]

> If you want handling of standard .desktop files, you'd install the standard unity-lens-applications.

This is installed on my workstation, but when running unity8 (from trunk with ./build and ./run), it is not showing all the apps I have installed. It's only showing 5 apps (and I have no idea why exactly it's showing only those), and won't let me launch them.

I also see that unity-lens-applications provides the "running apps" scope. Is that scope being moved into here as well? A new separate project? Or where? If it's not moving anywhere, then the unity-lens-applications package will still have to remain on the touch image, meaning this change would introduce duplication, unless the alluded to 6K LoC are actually removed and that scope no longer provides this functionality at all.

[Michal Hruby (mhr3)]

> This is installed on my workstation, but when running unity8 (from trunk with
> ./build and ./run), it is not showing all the apps I have installed. It's only
> showing 5 apps (and I have no idea why exactly it's showing only those), and
> won't let me launch them.

It's showing only X-Ubuntu-Touch apps, that's by design.

> I also see that unity-lens-applications provides the "running apps" scope. Is
> that scope being moved into here as well? A new separate project? Or where? If
> it's not moving anywhere, then the unity-lens-applications package will still
> have to remain on the touch image, meaning this change would introduce
> duplication, unless the alluded to 6K LoC are actually removed and that scope
> no longer provides this functionality at all.

running-apps scope was supposed to be used with MIR, but it's not going to be used for 13.10, there are a couple of bits missing. Still, it's a standalone scope that's not in any way tied to the rest of apps scopes, so could be very easily moved here if when we need to.

[dobey (dobey)]

review: Abstain

[Alejandro J. Cura (alecu)]

445 + apps_model.append ("application://" + desktop_file_id,

I think this needs to be changed to "application:///" (triple slashes) because of bug 1231393.
I don't think this merits blocking the branch, since all relevant .desktop files are already lowercase.

Otherwise, the branch looks fine.

I've tested it on my Nexus 4 by copying non-click.scope to /usr/share/unity/scopes/applications, and removing applications.scope and scopes.scope from said folder, and then manually running from a compiled checkout in the device; and I did not find anything broken.

+1

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-08-15 22:56:14 +0000
+++ Makefile.am	2013-10-07 16:27:29 +0000
@@ -3,10 +3,8 @@
 #
 # Install the click.scope 
 #
-scope_in_files = \
-  click.scope
 scopedir = $(SCOPESDIR)/applications
-scope_DATA = $(scope_in_files)
+scope_DATA = click.scope non-click.scope
 
 icondir = $(datadir)/unity/themes
 
@@ -29,7 +27,7 @@
 
 EXTRA_DIST = \
   autogen.sh \
-  $(scope_in_files) \
+  $(scope_DATA) \
   AUTHORS \
   COPYING \
   MAINTAINERS \

=== modified file 'configure.ac'
--- configure.ac	2013-09-23 18:26:19 +0000
+++ configure.ac	2013-10-07 16:27:29 +0000
@@ -42,6 +42,7 @@
 GLIB_REQUIRED=2.32
 PKG_CHECK_MODULES(SCOPE_DAEMON,
                   unity >= 7.0.0
+                  unity-protocol-private >= 7.1.0
                   json-glib-1.0
                   gio-unix-2.0
                   libsoup-2.4
@@ -102,12 +103,19 @@
 AC_SUBST(SCOPESDIR)
 
 #####################################################
+# Look for protocol-private lib dir
+#####################################################
+PROTOCOLPRIVATELIBDIR="`$PKG_CONFIG --variable=libdir unity-protocol-private`/libunity"
+AC_SUBST(PROTOCOLPRIVATELIBDIR)
+
+#####################################################
 # Create the Makefiles
 #####################################################
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
   src/Makefile
+  src/config.vala
 ])
 AC_OUTPUT
 

=== added file 'non-click.scope'
--- non-click.scope	1970-01-01 00:00:00 +0000
+++ non-click.scope	2013-10-07 16:27:29 +0000
@@ -0,0 +1,13 @@
+[Scope]
+GroupName=com.canonical.Unity.Scope.Applications.Click
+UniqueName=/com/canonical/unity/scope/applications/non_click
+Icon=/usr/share/unity/icons/lens-nav-app.svg
+Keywords=
+RemoteContent=false
+Type=applications
+Name=Click Packages
+Description=Find Click Packages
+SearchHint=Search Click Packages
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=unity-scope-click

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-09-24 20:14:43 +0000
+++ src/Makefile.am	2013-10-07 16:27:29 +0000
@@ -10,7 +10,7 @@
 # we're using Vala, C warnings are useless
 AM_CFLAGS = -w
 AM_CPPFLAGS = $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS) -R $(PROTOCOLPRIVATELIBDIR)
 
 pkglibexec_PROGRAMS = \
   click-scope \
@@ -19,6 +19,7 @@
 click_scope_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   -DG_LOG_DOMAIN=\"unity-scope-click\" \
   $(SCOPE_DAEMON_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
@@ -28,6 +29,7 @@
 click_scope_VALAFLAGS = \
   -C \
   --pkg unity \
+  --pkg unity-protocol \
   --pkg gee-1.0 \
   --pkg gio-unix-2.0 \
   --pkg json-glib-1.0 \
@@ -44,12 +46,15 @@
   $(NULL)
 
 click_scope_VALASOURCES = \
+  config.vala \
   click-scope.vala \
   click-webservice.vala \
   fake-data.vala \
   download-manager.vala \
   click-interface.vala \
   ubuntuone-credentials.vala \
+  non-click-scope.vala \
+  utils.vala \
   $(NULL)
 
 click_scope_SOURCES = \

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-03 22:35:56 +0000
+++ src/click-scope.vala	2013-10-07 16:27:29 +0000
@@ -495,6 +495,7 @@
 {
     var scope = new ClickScope();
     var exporter = new Unity.ScopeDBusConnector (scope);
+    var exporter2 = new Unity.ScopeDBusConnector (new NonClickScope ());
 	var cache_dir = Environment.get_user_cache_dir ();
 	if (FileUtils.test (cache_dir, FileTest.EXISTS | FileTest.IS_DIR)) {
 			var log_path = Path.build_filename (cache_dir,
@@ -506,6 +507,7 @@
 
     try {
         exporter.export ();
+        exporter2.export ();
     } catch (GLib.Error e) {
         error ("Cannot export scope to DBus: %s", e.message);
     }

=== added file 'src/config.vala.in'
--- src/config.vala.in	1970-01-01 00:00:00 +0000
+++ src/config.vala.in	2013-10-07 16:27:29 +0000
@@ -0,0 +1,12 @@
+namespace Config {
+
+  const string PREFIX = "@prefix@";
+  
+  const string DATADIR = "@DATADIR@";
+  
+  const string LOCALEDIR = "@DATADIR@/locale";
+  
+  const string PACKAGE = "@PACKAGE@";
+  
+  const string VERSION = "@VERSION@";
+}

=== added file 'src/non-click-scope.vala'
--- src/non-click-scope.vala	1970-01-01 00:00:00 +0000
+++ src/non-click-scope.vala	2013-10-07 16:27:29 +0000
@@ -0,0 +1,582 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License 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, see <http://www.gnu.org/licenses/>.
+ */
+
+using Unity;
+
+class NonClickScope: Unity.SimpleScope
+{
+  /* List of app IDs that aren't proper click packages yet */
+  const string[] NON_CLICK_DESKTOPS =
+  {
+    "address-book-app.desktop",
+    "calendar-app.desktop",
+    "camera-app.desktop",
+    "click-update-manager.desktop",
+    "dialer-app.desktop",
+    "friends-app.desktop",
+    "gallery-app.desktop",
+    "mediaplayer-app.desktop",
+    "messaging-app.desktop",
+    "music-app.desktop",
+    "notes-app.desktop",
+    "rssreader-app.desktop",
+    "ubuntu-calculator-app.desktop",
+    "ubuntu-clock-app.desktop",
+    "ubuntu-filemanager-app.desktop",
+    "ubuntu-system-settings.desktop",
+    "ubuntu-terminal-app.desktop",
+    "ubuntu-weather-app.desktop",
+    "webbrowser-app.desktop"
+  };
+
+  const string[] invisible_scope_ids =
+  {
+    "home.scope",
+    "applications-scopes.scope",
+    "applications-non-click.scope"
+  };
+
+  const string LIBUNITY_SCHEMA = "com.canonical.Unity.Lenses";
+  const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
+  const string GENERIC_SCOPE_ICON = ICON_PATH + "service-generic.svg";
+  const string SCOPES_MODEL = "com.canonical.Unity.SmartScopes.RemoteScopesModel";
+
+  private enum RemoteScopesColumn
+  {
+    SCOPE_ID,
+    NAME,
+    DESCRIPTION,
+    ICON_HINT,
+    SCREENSHOT_URL,
+    KEYWORDS
+  }
+
+  private enum AppsColumn
+  {
+    APP_URI,
+    NAME,
+    ICON_HINT,
+    DESCRIPTION,
+    SCREENSHOT_URL
+  }
+
+  private enum ResultCategory
+  {
+    INSTALLED,
+    SCOPES
+  }
+
+  private Dee.Model remote_scopes_model;
+  private Dee.Model local_scopes_model;
+  private Dee.Index remote_scopes_index;
+  private Dee.Index local_scopes_index;
+  private Dee.Model apps_model;
+  private Dee.Index apps_index;
+
+  private bool scopes_loaded = false;
+
+  private HashTable<unowned string, unowned string> disabled_scope_ids;
+  private HashTable<string, bool> locked_scope_ids;
+
+  public NonClickScope ()
+  {
+    Object ();
+  }
+
+  construct
+  {
+    this.group_name = "com.canonical.Unity.Scope.Applications.Click";
+    this.unique_name = "/com/canonical/unity/scope/applications/non_click";
+
+    /* set schema */
+    var schema = new Schema ();
+    schema.add_field ("scope_disabled", "u", Schema.FieldType.OPTIONAL);
+    this.schema = schema;
+
+    Category cat;
+    var icon_dir = File.new_for_path (ICON_PATH);
+
+    /* set categories */
+    var categories = new CategorySet ();
+    cat = new Unity.Category ("installed", _("Installed"),
+                              new FileIcon (icon_dir.get_child ("group-installed.svg")));
+    categories.add (cat);
+
+    cat = new Unity.Category ("scopes", _("Dash plugins"),
+                              new FileIcon (icon_dir.get_child ("group-installed.svg")));
+    categories.add (cat);
+    this.category_set = categories;
+
+    /* set filters */
+    var filters = new FilterSet ();
+    {
+      var filter = new CheckOptionFilter ("type", _("Type"));
+      filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
+
+      filter.add_option ("accessories", _("Accessories"));
+      filter.add_option ("education", _("Education"));
+      filter.add_option ("game", _("Games"));
+      filter.add_option ("graphics", _("Graphics"));
+      filter.add_option ("internet", _("Internet"));
+      filter.add_option ("fonts", _("Fonts"));
+      filter.add_option ("office", _("Office"));
+      filter.add_option ("media", _("Media"));
+      filter.add_option ("customization", _("Customization"));
+      filter.add_option ("accessibility", _("Accessibility"));
+      filter.add_option ("developer", _("Developer"));
+      filter.add_option ("science-and-engineering", _("Science & engineering"));
+      filter.add_option ("scopes", _("Dash plugins"));
+      filter.add_option ("system", _("System"));
+
+      filters.add (filter);
+    }
+    this.filter_set = filters;
+
+    /* get all the remote scopes */
+    var shared_model = new Dee.SharedModel (SCOPES_MODEL);
+    shared_model.set_schema ("s", "s", "s", "s", "s", "as");
+    shared_model.end_transaction.connect (this.remote_scopes_changed);
+    remote_scopes_model = shared_model;
+
+    remote_scopes_index = Utils.prepare_index (remote_scopes_model,
+                                               RemoteScopesColumn.NAME,
+                                               (model, iter) =>
+    {
+      unowned string name = model.get_string (iter, RemoteScopesColumn.NAME);
+      return "%s\n%s".printf (_("scope"), name);
+    }, null);
+
+    local_scopes_model = new Dee.SequenceModel ();
+    // use similar schema as remote_scopes_model, so we can share code
+    local_scopes_model.set_schema ("s", "s", "s", "s", "s");
+
+    local_scopes_index = Utils.prepare_index (local_scopes_model,
+                                              RemoteScopesColumn.NAME,
+                                              (model, iter) =>
+    {
+      unowned string name = model.get_string (iter, RemoteScopesColumn.NAME);
+      return "%s\n%s".printf (_("scope"), name);
+    }, null);
+
+    /* monitor scopes dconf keys */
+    disabled_scope_ids = new HashTable<unowned string, unowned string> (str_hash, str_equal);
+    var pref_man = PreferencesManager.get_default ();
+    pref_man.notify["disabled-scopes"].connect (update_disabled_scopes_hash);
+    update_disabled_scopes_hash ();
+
+    locked_scope_ids = new HashTable<string, bool> (str_hash, str_equal);
+    var settings = new Settings (LIBUNITY_SCHEMA);
+    foreach (unowned string scope_id in settings.get_strv ("locked-scopes"))
+    {
+      locked_scope_ids[scope_id] = true;
+    }
+
+    apps_model = new Dee.SequenceModel ();
+    // uri, app title, description, screenshot?
+    apps_model.set_schema ("s", "s", "s", "s", "s");
+    apps_model.set_column_names ("uri", "name", "icon", "description", "screenshot");
+
+    apps_index = Utils.prepare_index (apps_model, AppsColumn.NAME, (model, iter) =>
+    {
+      return model.get_string (iter, AppsColumn.NAME);
+    }, null);
+
+    build_scope_index.begin ();
+    build_apps_data ();
+
+    /* set the search functions */
+    set_search_async_func (this.dispatch_search);
+    set_preview_async_func (this.dispatch_preview);
+    set_activate_func (this.activate);
+  }
+
+  private void update_disabled_scopes_hash ()
+  {
+    disabled_scope_ids.remove_all ();
+    var pref_man = PreferencesManager.get_default ();
+    foreach (unowned string scope_id in pref_man.disabled_scopes)
+    {
+      // using HashTable as a set (optimized in glib when done like this)
+      disabled_scope_ids[scope_id] = scope_id;
+    }
+  }
+
+  private async void build_scope_index ()
+  {
+    try
+    {
+      var registry = yield Unity.Protocol.ScopeRegistry.find_scopes (null);
+      var flattened = new SList<Protocol.ScopeRegistry.ScopeMetadata> ();
+      foreach (var node in registry.scopes)
+      {
+        flattened.prepend (node.scope_info);
+        foreach (var subscope_info in node.sub_scopes)
+          flattened.prepend (subscope_info);
+      }
+      flattened.reverse ();
+      foreach (var info in flattened)
+      {
+        if (info.is_master) continue;
+        if (info.id in invisible_scope_ids) continue;
+
+        local_scopes_model.append (info.id, info.name, info.description,
+                                   info.icon, "");
+      }
+    }
+    catch (Error err)
+    {
+      warning ("Unable to find scopes: %s", err.message);
+    }
+    scopes_loaded = true;
+  }
+
+  private void build_apps_data ()
+  {
+    var keyfile = new KeyFile ();
+    foreach (unowned string desktop_file_id in NON_CLICK_DESKTOPS)
+    {
+      bool loaded = false;
+      try
+      {
+        loaded = keyfile.load_from_dirs ("applications/" + desktop_file_id,
+                                         Environment.get_system_data_dirs (),
+                                         null,
+                                         KeyFileFlags.KEEP_TRANSLATIONS);
+      }
+      catch (Error err)
+      {
+        loaded = false;
+      }
+      if (!loaded)
+      {
+        continue;
+      }
+      var app_info = new DesktopAppInfo.from_keyfile (keyfile);
+      if (app_info == null) continue;
+
+      string? screenshot = null;
+      bool is_touch_app = false;
+      try
+      {
+        is_touch_app = keyfile.get_boolean (KeyFileDesktop.GROUP, "X-Ubuntu-Touch");
+        screenshot = keyfile.get_string (KeyFileDesktop.GROUP, "X-Screenshot");
+      }
+      catch (Error err)
+      {
+        // ignore
+      }
+
+      if (!is_touch_app) continue;
+
+      apps_model.append ("application://" + desktop_file_id,
+                         app_info.get_display_name (),
+                         app_info.get_icon ().to_string (),
+                         app_info.get_description (),
+                         screenshot);
+    }
+  }
+
+  private void remote_scopes_changed ()
+  {
+    this.results_invalidated (SearchType.DEFAULT);
+  }
+
+  private void disable_scope (string scope_id)
+  {
+    if (scope_id in disabled_scope_ids) return;
+
+    var pref_man = PreferencesManager.get_default ();
+    var disabled_scopes = pref_man.disabled_scopes;
+    disabled_scopes += scope_id;
+
+    var settings = new Settings (LIBUNITY_SCHEMA);
+    settings.set_strv ("disabled-scopes", disabled_scopes);
+  }
+
+  private void enable_scope (string scope_id)
+  {
+    if (!(scope_id in disabled_scope_ids)) return;
+
+    var pref_man = PreferencesManager.get_default ();
+    string[] disabled_scopes = {};
+    foreach (unowned string disabled_scope_id in pref_man.disabled_scopes)
+    {
+      if (disabled_scope_id != scope_id)
+        disabled_scopes += disabled_scope_id;
+    }
+
+    var settings = new Settings (LIBUNITY_SCHEMA);
+    settings.set_strv ("disabled-scopes", disabled_scopes);
+  }
+
+  private string get_scope_icon (string icon_hint, bool is_disabled)
+  {
+    try
+    {
+      Icon base_icon = icon_hint == null || icon_hint == "" ?
+        Icon.new_for_string (GENERIC_SCOPE_ICON) :
+        Icon.new_for_string (icon_hint);
+      var anno_icon = new AnnotatedIcon (base_icon);
+      anno_icon.size_hint = IconSizeHint.SMALL;
+      // dim disabled icons by decreasing their alpha
+      if (is_disabled)
+        anno_icon.set_colorize_rgba (1.0, 1.0, 1.0, 0.5);
+      return anno_icon.to_string ();
+    }
+    catch (Error err)
+    {
+      return "";
+    }
+  }
+
+  private void add_apps_results (string query, ResultSet result_set)
+  {
+    var model = apps_index.model;
+    var analyzer = apps_index.analyzer;
+    var results = Utils.search_index (apps_index, analyzer, query);
+    foreach (var iter in results)
+    {
+      unowned string app_id = model.get_string (iter, AppsColumn.APP_URI);
+      unowned string icon_hint = model.get_string (iter, AppsColumn.ICON_HINT);
+      unowned string name = model.get_string (iter, AppsColumn.NAME);
+
+      var result = ScopeResult ();
+      result.uri = app_id;
+      result.category = ResultCategory.INSTALLED;
+      result.icon_hint = icon_hint;
+      result.result_type = Unity.ResultType.PERSONAL;
+      result.mimetype = "application/x-desktop";
+      result.title = name;
+      result.comment = "";
+      result.dnd_uri = app_id;
+
+      result_set.add_result (result);
+    }
+  }
+
+  /* Models backing the index need to have similar enough schema! */
+  private void add_scope_results (Dee.Index index, string query,
+                                  ResultSet result_set)
+  {
+    var model = index.model;
+    var analyzer = index.analyzer;
+    var results = Utils.search_index (index, analyzer, query);
+    foreach (var iter in results)
+    {
+      unowned string scope_id =
+        model.get_string (iter, RemoteScopesColumn.SCOPE_ID);
+      unowned string icon_hint =
+        model.get_string (iter, RemoteScopesColumn.ICON_HINT);
+      bool is_disabled = scope_id in disabled_scope_ids;
+
+      var result = Unity.ScopeResult ();
+      result.uri = @"scope://$(scope_id)";
+      result.category = ResultCategory.SCOPES;
+      result.icon_hint = get_scope_icon (icon_hint, is_disabled);
+      result.result_type = Unity.ResultType.DEFAULT;
+      result.mimetype = "application/x-unity-scope";
+      result.title = model.get_string (iter, RemoteScopesColumn.NAME);
+      result.comment = "";
+      result.dnd_uri = result.uri;
+      result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
+      result.metadata["scope_disabled"] = new Variant.uint32 (is_disabled ? 1 : 0);
+
+      result_set.add_result (result);
+    }
+
+  }
+
+  private void dispatch_search (ScopeSearchBase search, ScopeSearchBaseCallback cb)
+  {
+    perform_search.begin (search, (obj, res) =>
+    {
+      perform_search.end (res);
+      cb (search);
+    });
+  }
+
+  private void dispatch_preview (ResultPreviewer previewer, AbstractPreviewCallback cb)
+  {
+    perform_preview.begin (previewer, (obj, res) =>
+    {
+      var preview = perform_preview.end (res);
+      cb (previewer, preview);
+    });
+  }
+
+  private async void perform_search (ScopeSearchBase search)
+  {
+    // are we properly initialized?
+    while (!scopes_loaded)
+    {
+      Timeout.add (100, perform_search.callback);
+      yield;
+    }
+    var search_type = search.search_context.search_type;
+    bool include_scope_results = true;
+    if (search.search_context.filter_state != null)
+    {
+      var filter = search.search_context.filter_state.get_filter_by_id ("type");
+      if (filter != null && filter.filtering)
+      {
+        var of = filter as OptionsFilter;
+        include_scope_results = of.get_option ("scopes").active;
+      }
+    }
+
+    add_apps_results (search.search_context.search_query,
+                      search.search_context.result_set);
+
+    if (include_scope_results && search_type == SearchType.DEFAULT)
+    {
+      add_scope_results (local_scopes_index, search.search_context.search_query,
+                         search.search_context.result_set);
+      add_scope_results (remote_scopes_index, search.search_context.search_query,
+                         search.search_context.result_set);
+    }
+  }
+
+  private async Preview? perform_preview (ResultPreviewer previewer)
+  {
+    unowned string uri = previewer.result.uri;
+    if (uri.has_prefix ("scope://"))
+    {
+      // linear search, "yey"!
+      string scope_id = uri.substring (8);
+      var model = local_scopes_model;
+      var iter = model.get_first_iter ();
+      var end_iter = model.get_last_iter ();
+      var found_iter = end_iter;
+      while (iter != end_iter)
+      {
+        if (model.get_string (iter, RemoteScopesColumn.SCOPE_ID) == scope_id)
+        {
+          found_iter = iter;
+          break;
+        }
+        iter = model.next (iter);
+      }
+
+      if (found_iter == end_iter)
+      {
+        // try in the remote_scopes_model
+        model = remote_scopes_model;
+        iter = model.get_first_iter ();
+        end_iter = model.get_last_iter ();
+        while (iter != end_iter)
+        {
+          if (model.get_string (iter, RemoteScopesColumn.SCOPE_ID) == scope_id)
+          {
+            found_iter = iter;
+            break;
+          }
+          iter = model.next (iter);
+        }
+      }
+
+      if (found_iter == end_iter) return null;
+
+      unowned string name = model.get_string (found_iter, RemoteScopesColumn.NAME);
+      unowned string description = model.get_string (found_iter, RemoteScopesColumn.DESCRIPTION);
+      unowned string icon = model.get_string (found_iter, RemoteScopesColumn.ICON_HINT);
+      unowned string screenshot = model.get_string (found_iter, RemoteScopesColumn.SCREENSHOT_URL);
+      Icon? app_icon = null;
+      Icon? screenshot_icon = null;
+      try
+      {
+        if (icon != "") app_icon = Icon.new_for_string (icon);
+        if (screenshot != "") screenshot_icon = Icon.new_for_string (screenshot);
+      }
+      catch (Error err) {}
+
+      var preview = new ApplicationPreview (name, "", description,
+                                            app_icon, screenshot_icon);
+      PreviewAction action;
+      bool scope_disabled = scope_id in disabled_scope_ids;
+      if (scope_disabled)
+      {
+        action = new Unity.PreviewAction ("enable-scope", _("Enable"), null);
+      }
+      else
+      {
+        action = new Unity.PreviewAction ("disable-scope", _("Disable"), null);
+      }
+      if (!(scope_id in locked_scope_ids))
+      {
+        preview.add_action (action);
+      }
+      return preview;
+    }
+    else if (uri.has_prefix ("application:"))
+    {
+      // linear search, "yey"!
+      var iter = apps_model.get_first_iter ();
+      var end_iter = apps_model.get_last_iter ();
+      var found_iter = end_iter;
+      while (iter != end_iter)
+      {
+        if (apps_model.get_string (iter, AppsColumn.APP_URI) == uri)
+        {
+          found_iter = iter;
+          break;
+        }
+        iter = apps_model.next (iter);
+      }
+      if (found_iter == end_iter) return null; // uh oh
+
+      unowned string name = apps_model.get_string (found_iter, AppsColumn.NAME);
+      unowned string description = apps_model.get_string (found_iter, AppsColumn.DESCRIPTION);
+      unowned string icon = apps_model.get_string (found_iter, AppsColumn.ICON_HINT);
+      unowned string screenshot = apps_model.get_string (found_iter, AppsColumn.SCREENSHOT_URL);
+      Icon? app_icon = null;
+      Icon? screenshot_icon = null;
+      try
+      {
+        if (icon != "") app_icon = Icon.new_for_string (icon);
+        if (screenshot != "") screenshot_icon = Icon.new_for_string (screenshot);
+      }
+      catch (Error err) {}
+      var preview = new ApplicationPreview (name, "", description,
+                                            app_icon, screenshot_icon);
+      var launch_action = new Unity.PreviewAction ("launch", _("Launch"), null);
+      preview.add_action (launch_action);
+      return preview;
+    }
+    return null;
+  }
+
+  private ActivationResponse? activate (ScopeResult result,
+                                        SearchMetadata metadata,
+                                        string? action_id)
+  {
+    if (result.uri.has_prefix ("scope://"))
+    {
+      var scope_id = result.uri.substring (8);
+      if (action_id == "enable-scope")
+      {
+        enable_scope (scope_id);
+      }
+      else if (action_id == "disable-scope")
+      {
+        disable_scope (scope_id);
+      }
+      return new Unity.ActivationResponse (HandledType.SHOW_PREVIEW, result.uri);
+    }
+
+    return null;
+  }
+}
+

=== added file 'src/utils.vala'
--- src/utils.vala	1970-01-01 00:00:00 +0000
+++ src/utils.vala	2013-10-07 16:27:29 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2010-2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * 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 Michal Hruby <[e-mail]>
+ *
+ */
+
+namespace Utils
+{
+  private static Dee.ICUTermFilter icu_filter;
+
+  public Dee.Index prepare_index (Dee.Model model,
+                                  uint sort_column,
+                                  owned Dee.ModelReaderFunc reader_func,
+                                  out Dee.Analyzer out_analyzer)
+  {
+    // reuse the icu_filter
+    if (icu_filter == null)
+    {
+      icu_filter = new Dee.ICUTermFilter.ascii_folder ();
+    }
+
+    var sort_filter = Dee.Filter.new_collator (sort_column);
+    var filter_model = new Dee.FilterModel (model, sort_filter);
+
+    var analyzer = new Dee.TextAnalyzer ();
+    analyzer.add_term_filter ((terms_in, terms_out) =>
+    {
+      for (uint i = 0; i < terms_in.num_terms (); i++)
+      {
+        unowned string term = terms_in.get_term (i);
+        var folded = icu_filter.apply (term);
+        terms_out.add_term (term);
+        if (folded != term) terms_out.add_term (folded);
+      }
+    });
+    out_analyzer = analyzer;
+
+    var reader = Dee.ModelReader.new ((owned) reader_func);
+    return new Dee.TreeIndex (filter_model, analyzer, reader);
+  }
+
+  public SList<Dee.ModelIter> search_index (Dee.Index index,
+                                            Dee.Analyzer analyzer,
+                                            string query)
+  {
+    if (query.strip ().length == 0)
+    {
+      var model = index.get_model ();
+      var iter = model.get_first_iter ();
+      var end_iter = model.get_last_iter ();
+
+      var result = new SList<Dee.ModelIter> ();
+      while (iter != end_iter)
+      {
+        result.prepend (iter);
+        iter = model.next (iter);
+      }
+      result.reverse ();
+      return result;
+    }
+
+    var term_list = Object.new (typeof (Dee.TermList)) as Dee.TermList;
+    analyzer.tokenize (query, term_list);
+    var matches = new Sequence<Dee.ModelIter> ();
+
+    uint num_terms = term_list.num_terms ();
+    for (uint i = 0; i < num_terms; i++)
+    {
+      var rs = index.lookup (term_list.get_term (i),
+                             i < num_terms - 1 ? Dee.TermMatchFlag.EXACT : Dee.TermMatchFlag.PREFIX);
+
+      bool first_pass = i == 0;
+      CompareDataFunc<Dee.ModelIter> cmp_func = (a, b) =>
+      {
+        return a == b ? 0 : ((void*) a > (void*) b ? 1 : -1);
+      };
+      // intersect the results (cause we want to AND the terms)
+      var remaining = new Sequence<Dee.ModelIter> ();
+      foreach (var item in rs)
+      {
+        if (first_pass)
+          matches.insert_sorted (item, cmp_func);
+        else if (matches.lookup (item, cmp_func) != null)
+          remaining.insert_sorted (item, cmp_func);
+      }
+      if (!first_pass) matches = (owned) remaining;
+      // final result set empty already?
+      if (matches.get_begin_iter () == matches.get_end_iter ()) break;
+    }
+
+    var result = new SList<Dee.ModelIter> ();
+    var iter = matches.get_begin_iter ();
+    var end_iter = matches.get_end_iter ();
+    while (iter != end_iter)
+    {
+      result.prepend (iter.get ());
+      iter = iter.next ();
+    }
+
+    result.reverse ();
+    return result;
+  }
+}