Merge lp:~fabiozaramella/slingshot/code-style into lp:~elementary-pantheon/slingshot/trunk

[Fabio Zaramella]

Synapse-core and synapse-plugins:
* Code style

Synapse-core and synapse-plugins:
* Code style

[Corentin Noël (tintou)]

can you make so that the _() function has no space ?

[lp:~fabiozaramella/slingshot/code-style]

726. By Fabio Zaramella on 2017-01-26

add elementary LLC to copyright and remove spaces in _()

[Fabio Zaramella (fabiozaramella)]

Done :)

[lp:~fabiozaramella/slingshot/code-style]

727. By Fabio Zaramella on 2017-01-26

Copyright indentation

[Fabio Zaramella (fabiozaramella)]

Can you take a look at it again please?

[Corentin Noël (tintou)]

Well, this is not really reviewable so I'll trust you on this. If someone wants to review it, feel free otherwise I'll approve it at the end of the day (UTC)

review: Approve

[Fabio Zaramella (fabiozaramella)]

Good, because I will propose another branch for merge soon.

=== modified file 'lib/synapse-core/common-actions.vala'
--- lib/synapse-core/common-actions.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/common-actions.vala	2017-01-26 19:54:51 +0000
@@ -1,419 +1,343 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  public abstract class BaseAction: Object, Match
-  {
-    // from Match interface
-    public string title { get; construct set; }
-    public string description { get; set; }
-    public string icon_name { get; construct set; }
-    public bool has_thumbnail { get; construct set; }
-    public string thumbnail_path { get; construct set; }
-    public MatchType match_type { get; construct set; }
-
-    public int default_relevancy { get; set; }
-    public bool notify_match { get; set; default = true; }
-
-    public abstract bool valid_for_match (Match match);
-    public virtual int get_relevancy_for_match (Match match)
-    {
-      return default_relevancy;
-    }
-
-    public abstract void do_execute (Match? source, Match? target = null);
-    public void execute_with_target (Match? source, Match? target = null)
-    {
-      do_execute (source, target);
-      if (notify_match) source.executed ();
-    }
-    
-    public virtual bool needs_target () {
-      return false;
-    }
-    
-    public virtual QueryFlags target_flags ()
-    {
-      return QueryFlags.ALL;
-    }
-  }
-
-  public class CommonActions: Object, Activatable, ActionProvider
-  {
-    public bool enabled { get; set; default = true; }
-    
-    public void activate ()
-    {
-      
-    }
-
-    public void deactivate ()
-    {
-      
-    }
-
-    private class Runner: BaseAction
-    {
-      public Runner ()
-      {
-        Object (title: _ ("Run"),
-                description: _ ("Run an application, action or script"),
-                icon_name: "system-run", has_thumbnail: false,
-                match_type: MatchType.ACTION,
-                default_relevancy: Match.Score.EXCELLENT);
-      }
-
-      public override void do_execute (Match? match, Match? target = null)
-      {
-        if (match.match_type == MatchType.APPLICATION)
-        {
-          ApplicationMatch? app_match = match as ApplicationMatch;
-          return_if_fail (app_match != null);
-
-          AppInfo app = app_match.app_info ??
-            new DesktopAppInfo.from_filename (app_match.filename);
-
-          try
-          {
-            var display = Gdk.Display.get_default ();
-            app.launch (null, display.get_app_launch_context ());
-            
-            RelevancyService.get_default ().application_launched (app);
-          }
-          catch (Error err)
-          {
-            Utils.Logger.warning (this, "%s", err.message);
-          }
-        }
-        else // MatchType.ACTION
-        {
-          match.execute (null);
-        }
-      }
-
-      public override bool valid_for_match (Match match)
-      {
-        switch (match.match_type)
-        {
-          case MatchType.SEARCH:
-            return true;
-          case MatchType.ACTION:
-            return true;
-          case MatchType.APPLICATION:
-            ApplicationMatch? am = match as ApplicationMatch;
-            return am == null || !am.needs_terminal;
-          default:
-            return false;
-        }
-      }
-    }
-
-    private class TerminalRunner: BaseAction
-    {
-      public TerminalRunner ()
-      {
-        Object (title: _ ("Run in Terminal"),
-                description: _ ("Run application or command in terminal"),
-                icon_name: "terminal", has_thumbnail: false,
-                match_type: MatchType.ACTION,
-                default_relevancy: Match.Score.BELOW_AVERAGE);
-      }
-
-      public override void do_execute (Match? match, Match? target = null)
-      {
-        if (match.match_type == MatchType.APPLICATION)
-        {
-          ApplicationMatch? app_match = match as ApplicationMatch;
-          return_if_fail (app_match != null);
-
-          AppInfo original = app_match.app_info ??
-            new DesktopAppInfo.from_filename (app_match.filename);
-
-          try
-          {
-            AppInfo app = AppInfo.create_from_commandline (
-              original.get_commandline (), original.get_name (),
-              AppInfoCreateFlags.NEEDS_TERMINAL);
-            var display = Gdk.Display.get_default ();
-            app.launch (null, display.get_app_launch_context ());
-          }
-          catch (Error err)
-          {
-            Utils.Logger.warning (this, "%s", err.message);
-          }
-        }
-      }
-
-      public override bool valid_for_match (Match match)
-      {
-        switch (match.match_type)
-        {
-          case MatchType.APPLICATION:
-            ApplicationMatch? am = match as ApplicationMatch;
-            return am != null;
-          default:
-            return false;
-        }
-      }
-    }
-    
-    private class Opener: BaseAction
-    {
-      public Opener ()
-      {
-        Object (title: _ ("Open"),
-                description: _ ("Open using default application"),
-                icon_name: "fileopen", has_thumbnail: false,
-                match_type: MatchType.ACTION,
-                default_relevancy: Match.Score.GOOD);
-      }
-
-      public override void do_execute (Match? match, Match? target = null)
-      {
-        UriMatch uri_match = match as UriMatch;
-
-        if (uri_match != null)
-        {
-          CommonActions.open_uri (uri_match.uri);
-        }
-        else if (file_path.match (match.title))
-        {
-          File f;
-          if (match.title.has_prefix ("~"))
-          {
-            f = File.new_for_path (Path.build_filename (Environment.get_home_dir (),
-                                                        match.title.substring (1),
-                                                        null));
-          }
-          else
-          {
-            f = File.new_for_path (match.title);
-          }
-          CommonActions.open_uri (f.get_uri ());
-        }
-        else
-        {
-          CommonActions.open_uri (match.title);
-        }
-      }
-
-      public override bool valid_for_match (Match match)
-      {
-        switch (match.match_type)
-        {
-          case MatchType.GENERIC_URI:
-            return true;
-          case MatchType.UNKNOWN:
-            return web_uri.match (match.title) || file_path.match (match.title);
-          default:
-            return false;
-        }
-      }
-      
-      private Regex web_uri;
-      private Regex file_path;
-      
-      construct
-      {
-        try
-        {
-          web_uri = new Regex ("^(ftp|http(s)?)://[^.]+\\.[^.]+", RegexCompileFlags.OPTIMIZE);
-          file_path = new Regex ("^(/|~/)[^/]+", RegexCompileFlags.OPTIMIZE);
-        }
-        catch (Error err)
-        {
-          Utils.Logger.warning (this, "%s", err.message);
-        }
-      }
-    }
-
-    private class OpenFolder: BaseAction
-    {
-      public OpenFolder ()
-      {
-        Object (title: _ ("Open folder"),
-                description: _ ("Open folder containing this file"),
-                icon_name: "folder-open", has_thumbnail: false,
-                match_type: MatchType.ACTION,
-                default_relevancy: Match.Score.AVERAGE);
-      }
-
-      public override void do_execute (Match? match, Match? target = null)
-      {
-        UriMatch uri_match = match as UriMatch;
-        return_if_fail (uri_match != null);
-        var f = File.new_for_uri (uri_match.uri);
-        f = f.get_parent ();
-        try
-        {
-          var app_info = f.query_default_handler (null);
-          List<File> files = new List<File> ();
-          files.prepend (f);
-          var display = Gdk.Display.get_default ();
-          app_info.launch (files, display.get_app_launch_context ());
-        }
-        catch (Error err)
-        {
-          Utils.Logger.warning (this, "%s", err.message);
-        }
-      }
-
-      public override bool valid_for_match (Match match)
-      {
-        if (match.match_type != MatchType.GENERIC_URI) return false;
-        UriMatch uri_match = match as UriMatch;
-        var f = File.new_for_uri (uri_match.uri);
-        var parent = f.get_parent ();
-        return parent != null && f.is_native ();
-      }
-    }
-
-    private class ClipboardCopy: BaseAction
-    {
-      public ClipboardCopy ()
-      {
-        Object (title: _ ("Copy to Clipboard"),
-                description: _ ("Copy selection to clipboard"),
-                icon_name: "gtk-copy", has_thumbnail: false,
-                match_type: MatchType.ACTION,
-                default_relevancy: Match.Score.AVERAGE);
-      }
-
-      public override void do_execute (Match? match, Match? target = null)
-      {
-        var cb = Gtk.Clipboard.get (Gdk.Atom.NONE);
-        if (match.match_type == MatchType.GENERIC_URI)
-        {
-          UriMatch uri_match = match as UriMatch;
-          return_if_fail (uri_match != null);
-          
-          /*
-           // just wow, Gtk and also Vala are trying really hard to make this hard to do...
-          Gtk.TargetEntry[] no_entries = {};
-          Gtk.TargetList l = new Gtk.TargetList (no_entries);
-          l.add_uri_targets (0);
-          l.add_text_targets (0);
-          Gtk.TargetEntry te = Gtk.target_table_new_from_list (l, 2);
-          cb.set_with_data ();
-          */
-          cb.set_text (uri_match.uri, -1);
-        }
-        else if (match.match_type == MatchType.TEXT)
-        {
-          TextMatch? text_match = match as TextMatch;
-          string content = text_match != null ? text_match.get_text () : match.title;
-
-          cb.set_text (content, -1);
-        }
-      }
-
-      public override bool valid_for_match (Match match)
-      {
-        switch (match.match_type)
-        {
-          case MatchType.GENERIC_URI:
-            return true;
-          case MatchType.TEXT:
-            return true;
-          default:
-            return false;
-        }
-      }
-      
-      public override int get_relevancy_for_match (Match match)
-      {
-        TextMatch? text_match = match as TextMatch;
-        if (text_match != null && text_match.text_origin == TextOrigin.CLIPBOARD)
-        {
-          return 0;
-        }
-        
-        return default_relevancy;
-      }
-    }
-
-    private Gee.List<BaseAction> actions;
-
-    construct
-    {
-      actions = new Gee.ArrayList<BaseAction> ();
-
-      actions.add (new Runner ());
-      actions.add (new TerminalRunner ());
-      actions.add (new Opener ());
-      actions.add (new OpenFolder ());
-      actions.add (new ClipboardCopy ());
-    }
-
-    public ResultSet? find_for_match (ref Query query, Match match)
-    {
-      bool query_empty = query.query_string == "";
-      var results = new ResultSet ();
-      
-      if (query_empty)
-      {
-        foreach (var action in actions)
-        {
-          if (action.valid_for_match (match))
-          {
-            results.add (action, action.get_relevancy_for_match (match));
-          }
-        }
-      }
-      else
-      {
-        var matchers = Query.get_matchers_for_query (query.query_string, 0,
-          RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
-        foreach (var action in actions)
-        {
-          if (!action.valid_for_match (match)) continue;
-          foreach (var matcher in matchers)
-          {
-            if (matcher.key.match (action.title))
-            {
-              results.add (action, matcher.value);
-              break;
-            }
-          }
-        }
-      }
-
-      return results;
-    }
-    
-    public static void open_uri (string uri)
-    {
-      var f = File.new_for_uri (uri);
-      try
-      {
-        var app_info = f.query_default_handler (null);
-        List<File> files = new List<File> ();
-        files.prepend (f);
-        var display = Gdk.Display.get_default ();
-        app_info.launch (files, display.get_app_launch_context ());
-      }
-      catch (Error err)
-      {
-        Utils.Logger.warning (null, "%s", err.message);
-      }
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+	public abstract class BaseAction: Object, Match {
+		// from Match interface
+		public string title { get; construct set; }
+		public string description { get; set; }
+		public string icon_name { get; construct set; }
+		public bool has_thumbnail { get; construct set; }
+		public string thumbnail_path { get; construct set; }
+		public MatchType match_type { get; construct set; }
+
+		public int default_relevancy { get; set; }
+		public bool notify_match { get; set; default = true; }
+
+		public abstract bool valid_for_match (Match match);
+		public virtual int get_relevancy_for_match (Match match) {
+		  return default_relevancy;
+		}
+
+		public abstract void do_execute (Match? source, Match? target = null);
+		public void execute_with_target (Match? source, Match? target = null) {
+		  do_execute (source, target);
+		  if (notify_match) source.executed ();
+		}
+		
+		public virtual bool needs_target () {
+		  return false;
+		}
+		
+		public virtual QueryFlags target_flags () {
+		  return QueryFlags.ALL;
+		}
+	}
+
+	public class CommonActions: Object, Activatable, ActionProvider {
+		public bool enabled { get; set; default = true; }
+    
+        public void activate () { }
+
+        public void deactivate () { }
+
+        private class Runner: BaseAction {
+		    public Runner () {
+			    Object (title: _("Run"),
+					    description: _("Run an application, action or script"),
+					    icon_name: "system-run", has_thumbnail: false,
+					    match_type: MatchType.ACTION,
+					    default_relevancy: Match.Score.EXCELLENT);
+		    }
+
+            public override void do_execute (Match? match, Match? target = null) {
+                if (match.match_type == MatchType.APPLICATION) {
+                    ApplicationMatch? app_match = match as ApplicationMatch;
+                    return_if_fail (app_match != null);
+
+                    AppInfo app = app_match.app_info ??
+                    new DesktopAppInfo.from_filename (app_match.filename);
+
+                    try {
+                        var display = Gdk.Display.get_default ();
+                        app.launch (null, display.get_app_launch_context ());
+
+                        RelevancyService.get_default ().application_launched (app);
+                    } catch (Error err) {
+                        Utils.Logger.warning (this, "%s", err.message);
+                    }
+                } else { // MatchType.ACTION
+                    match.execute (null);
+                }
+            }
+
+            public override bool valid_for_match (Match match) {
+                switch (match.match_type) {
+                    case MatchType.SEARCH:
+                        return true;
+                    case MatchType.ACTION:
+                        return true;
+                    case MatchType.APPLICATION:
+                        ApplicationMatch? am = match as ApplicationMatch;
+                        return am == null || !am.needs_terminal;
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        private class TerminalRunner: BaseAction {
+            public TerminalRunner () {
+            Object (title: _("Run in Terminal"),
+            description: _("Run application or command in terminal"),
+            icon_name: "terminal", has_thumbnail: false,
+            match_type: MatchType.ACTION,
+            default_relevancy: Match.Score.BELOW_AVERAGE);
+            }
+
+            public override void do_execute (Match? match, Match? target = null) {
+                if (match.match_type == MatchType.APPLICATION) {
+                    ApplicationMatch? app_match = match as ApplicationMatch;
+                    return_if_fail (app_match != null);
+
+                    AppInfo original = app_match.app_info ??
+                    new DesktopAppInfo.from_filename (app_match.filename);
+
+                    try {
+                        AppInfo app = AppInfo.create_from_commandline (
+                        original.get_commandline (), original.get_name (),
+                        AppInfoCreateFlags.NEEDS_TERMINAL);
+                        var display = Gdk.Display.get_default ();
+                        app.launch (null, display.get_app_launch_context ());
+                    } catch (Error err) {
+                        Utils.Logger.warning (this, "%s", err.message);
+                    }
+                }
+            }
+
+            public override bool valid_for_match (Match match) {
+                switch (match.match_type) {
+                case MatchType.APPLICATION:
+                    ApplicationMatch? am = match as ApplicationMatch;
+                    return am != null;
+                default:
+                    return false;
+                }
+            }
+        }
+    
+        private class Opener: BaseAction {
+            public Opener () {
+                Object (title: _("Open"),
+                        description: _("Open using default application"),
+                        icon_name: "fileopen", has_thumbnail: false,
+                        match_type: MatchType.ACTION,
+                        default_relevancy: Match.Score.GOOD);
+            }
+
+            public override void do_execute (Match? match, Match? target = null) {
+                UriMatch uri_match = match as UriMatch;
+
+                if (uri_match != null) {
+                    CommonActions.open_uri (uri_match.uri);
+                } else if (file_path.match (match.title)) {
+                    File f;
+                    if (match.title.has_prefix ("~")) {
+                        f = File.new_for_path (Path.build_filename (Environment.get_home_dir (), match.title.substring (1), null));
+                    } else {
+                        f = File.new_for_path (match.title);
+                    }
+                    CommonActions.open_uri (f.get_uri ());
+                } else {
+                    CommonActions.open_uri (match.title);
+                }
+            }
+
+            public override bool valid_for_match (Match match) {
+                switch (match.match_type) {
+                    case MatchType.GENERIC_URI:
+                        return true;
+                    case MatchType.UNKNOWN:
+                        return web_uri.match (match.title) || file_path.match (match.title);
+                    default:
+                        return false;
+                }
+            }
+
+            private Regex web_uri;
+            private Regex file_path;
+
+            construct {
+                try {
+                    web_uri = new Regex ("^(ftp|http(s)?)://[^.]+\\.[^.]+", RegexCompileFlags.OPTIMIZE);
+                    file_path = new Regex ("^(/|~/)[^/]+", RegexCompileFlags.OPTIMIZE);
+                } catch (Error err) {
+                    Utils.Logger.warning (this, "%s", err.message);
+                }
+            }
+        }
+
+        private class OpenFolder: BaseAction {
+            public OpenFolder () {
+                Object (title: _("Open folder"),
+                        description: _("Open folder containing this file"),
+                        icon_name: "folder-open", has_thumbnail: false,
+                        match_type: MatchType.ACTION,
+                        default_relevancy: Match.Score.AVERAGE);
+            }
+
+            public override void do_execute (Match? match, Match? target = null) {
+                UriMatch uri_match = match as UriMatch;
+                return_if_fail (uri_match != null);
+                var f = File.new_for_uri (uri_match.uri);
+                f = f.get_parent ();
+                try {
+                    var app_info = f.query_default_handler (null);
+                    List<File> files = new List<File> ();
+                    files.prepend (f);
+                    var display = Gdk.Display.get_default ();
+                    app_info.launch (files, display.get_app_launch_context ());
+                } catch (Error err) {
+                    Utils.Logger.warning (this, "%s", err.message);
+                }
+            }
+
+            public override bool valid_for_match (Match match) {
+                if (match.match_type != MatchType.GENERIC_URI) {
+                    return false;
+                }
+                UriMatch uri_match = match as UriMatch;
+                var f = File.new_for_uri (uri_match.uri);
+                var parent = f.get_parent ();
+
+                return parent != null && f.is_native ();
+            }
+        }
+
+        private class ClipboardCopy: BaseAction {
+            public ClipboardCopy () {
+                Object (title: _("Copy to Clipboard"),
+                        description: _("Copy selection to clipboard"),
+                        icon_name: "gtk-copy", has_thumbnail: false,
+                        match_type: MatchType.ACTION,
+                        default_relevancy: Match.Score.AVERAGE);
+            }
+
+            public override void do_execute (Match? match, Match? target = null) {
+                var cb = Gtk.Clipboard.get (Gdk.Atom.NONE);
+                if (match.match_type == MatchType.GENERIC_URI) {
+                    UriMatch uri_match = match as UriMatch;
+                    return_if_fail (uri_match != null);
+
+                    /*  Just wow, Gtk and also Vala are trying really hard to make this hard to do...
+                        Gtk.TargetEntry[] no_entries = {};
+                        Gtk.TargetList l = new Gtk.TargetList (no_entries);
+                        l.add_uri_targets (0);
+                        l.add_text_targets (0);
+                        Gtk.TargetEntry te = Gtk.target_table_new_from_list (l, 2);
+                        cb.set_with_data ();
+                    */
+                    cb.set_text (uri_match.uri, -1);
+                } else if (match.match_type == MatchType.TEXT) {
+                    TextMatch? text_match = match as TextMatch;
+                    string content = text_match != null ? text_match.get_text () : match.title;
+
+                    cb.set_text (content, -1);
+                }
+            }
+
+            public override bool valid_for_match (Match match) {
+                switch (match.match_type) {
+                    case MatchType.GENERIC_URI:
+                        return true;
+                    case MatchType.TEXT:
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+
+            public override int get_relevancy_for_match (Match match) {
+                TextMatch? text_match = match as TextMatch;
+                if (text_match != null && text_match.text_origin == TextOrigin.CLIPBOARD) {
+                    return 0;
+                }
+
+                return default_relevancy;
+            }
+        }
+
+        private Gee.List<BaseAction> actions;
+
+        construct {
+            actions = new Gee.ArrayList<BaseAction> ();
+
+            actions.add (new Runner ());
+            actions.add (new TerminalRunner ());
+            actions.add (new Opener ());
+            actions.add (new OpenFolder ());
+            actions.add (new ClipboardCopy ());
+        }
+
+        public ResultSet? find_for_match (ref Query query, Match match) {
+            bool query_empty = query.query_string == "";
+            var results = new ResultSet ();
+
+            if (query_empty) {
+                foreach (var action in actions) {
+                    if (action.valid_for_match (match)) {
+                        results.add (action, action.get_relevancy_for_match (match));
+                    }
+                }
+            } else {
+                var matchers = Query.get_matchers_for_query (query.query_string, 0, RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
+                foreach (var action in actions) {
+                    if (!action.valid_for_match (match)) {
+                        continue;
+                    }
+
+                    foreach (var matcher in matchers) {
+                        if (matcher.key.match (action.title)) {
+                            results.add (action, matcher.value);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return results;
+        }
+    
+        public static void open_uri (string uri) {
+            var f = File.new_for_uri (uri);
+            try {
+                var app_info = f.query_default_handler (null);
+                List<File> files = new List<File> ();
+                files.prepend (f);
+                var display = Gdk.Display.get_default ();
+                app_info.launch (files, display.get_app_launch_context ());
+            } catch (Error err) {
+                Utils.Logger.warning (null, "%s", err.message);
+            }
+        }
+    }
 }

=== modified file 'lib/synapse-core/config-service.vala'
--- lib/synapse-core/config-service.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/config-service.vala	2017-01-26 19:54:51 +0000
@@ -1,192 +1,173 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
 
 using Json;
 
-namespace Synapse
-{
-  public abstract class ConfigObject : GLib.Object
-  {
-  }
-
-  public class ConfigService : GLib.Object
-  {
-    // singleton that can be easily destroyed
-    private static unowned ConfigService? instance;
-    public static ConfigService get_default ()
-    {
-      return instance ?? new ConfigService ();
-    }
-
-    private ConfigService ()
-    {
-    }
-    
-    ~ConfigService ()
-    {
-      // useless cause the timer takes a reference on self
-      if (save_timer_id != 0) save ();
-      instance = null;
-    }
-
-    private Json.Node root_node;
-    private string config_file_name;
-    private uint save_timer_id = 0;
-    
-    construct
-    {
-      instance = this;
-      
-      var parser = new Parser ();
-      config_file_name = 
-        GLib.Path.build_filename (Environment.get_user_config_dir (), "synapse",
-                             "config.json");
-      try
-      {
-        parser.load_from_file (config_file_name);
-        root_node = parser.get_root ().copy ();
-        if (root_node.get_node_type () != NodeType.OBJECT)
-        {
-          root_node = new Json.Node (NodeType.OBJECT);
-          root_node.take_object (new Json.Object ());
-        }
-      }
-      catch (Error err)
-      {
-        root_node = new Json.Node (NodeType.OBJECT);
-        root_node.take_object (new Json.Object ());
-      }
-    }
-
-    /**
-     * Creates an instance of an object derived from ConfigObject class, which
-     * will have its public properties set to values stored in config file, or
-     * to the default values if this object wasn't yet stored.
-     *
-     * @param group A group name.
-     * @param key A key name.
-     * @param config_type Type of the object (must be subclass of ConfigObject)
-     * @return An instance of config_type.
-     */
-    public ConfigObject get_config (string group, string key, Type config_type)
-    {
-      unowned Json.Object obj = root_node.get_object ();
-      unowned Json.Node group_node = obj.get_member (group);
-      if (group_node != null)
-      {
-        if (group_node.get_node_type () == NodeType.OBJECT)
-        {
-          unowned Json.Object group_obj = group_node.get_object ();
-          unowned Json.Node key_node = group_obj.get_member (key);
-          if (key_node != null && key_node.get_node_type () == NodeType.OBJECT)
-          {
-            var result = Json.gobject_deserialize (config_type, key_node);
-            return result as ConfigObject;
-          }
-        }
-      }
-      
-      return GLib.Object.new (config_type) as ConfigObject;
-    }
-    
-    /**
-     * Behaves in a similar way to get_config, but it also watches for changes
-     * in the returned config object and saves them back to the config file
-     * (without the need of calling set_config).
-     *
-     * @param group A group name.
-     * @param key A key name.
-     * @param config_type Type of the object (must be subclass of ConfigObject)
-     */
-    public ConfigObject bind_config (string group, string key, Type config_type)
-    {
-      ConfigObject config_object = get_config (group, key, config_type);
-      // make sure the lambda doesn't take a ref on the config_object
-      unowned ConfigObject co = config_object;
-      co.notify.connect (() => { this.set_config (group, key, co); });
-      return config_object;
-    }
-    
-    /**
-     * Stores all public properties of the object to the config file under
-     * specified group and key names.
-     *
-     * @param group A group name.
-     * @param key A key name.
-     * @param cfg_obj ConfigObject instance.
-     */
-    public void set_config (string group, string key, ConfigObject cfg_obj)
-    {
-      unowned Json.Object obj = root_node.get_object ();
-      if (!obj.has_member (group) || 
-          obj.get_member (group).get_node_type () != NodeType.OBJECT)
-      {
-        // why set_object_member works, but set_member doesn't ?!
-        obj.set_object_member (group, new Json.Object ());
-      }
-
-      unowned Json.Object group_obj = obj.get_object_member (group);
-      // why the hell is this necessary?
-      if (group_obj.has_member (key)) group_obj.remove_member (key);
-
-      Json.Node node = Json.gobject_serialize (cfg_obj);
-      group_obj.set_object_member (key, node.get_object ());
-      
-      if (save_timer_id != 0) Source.remove (save_timer_id);
-      // on crap, this takes a reference on self
-      save_timer_id = Timeout.add (30000, this.save_timeout);
-    }
-    
-    private bool save_timeout ()
-    {
-      save_timer_id = 0;
-      save ();
-
-      return false;
-    }
-
-    /**
-     * Forces immediate saving of the configuration file to the filesystem.
-     */
-    public void save ()
-    {
-      if (save_timer_id != 0)
-      {
-        Source.remove (save_timer_id);
-        save_timer_id = 0;
-      }
-      
-      var generator = new Generator ();
-      generator.pretty = true;
-      generator.set_root (root_node);
-
-      DirUtils.create_with_parents (GLib.Path.get_dirname (config_file_name), 0755);
-      try
-      {
-        generator.to_file (config_file_name);
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-      }
-    }
-  }
+namespace Synapse {
+    public abstract class ConfigObject : GLib.Object { }
+
+    public class ConfigService : GLib.Object {
+        // singleton that can be easily destroyed
+        private static unowned ConfigService? instance;
+
+        public static ConfigService get_default () {
+            return instance ?? new ConfigService ();
+        }
+
+        private ConfigService () { }
+
+        ~ConfigService () {
+            // useless cause the timer takes a reference on self
+            if (save_timer_id != 0) save ();
+            instance = null;
+        }
+
+        private Json.Node root_node;
+        private string config_file_name;
+        private uint save_timer_id = 0;
+
+        construct {
+            instance = this;
+
+            var parser = new Parser ();
+            config_file_name = 
+            GLib.Path.build_filename (Environment.get_user_config_dir (), "synapse", "config.json");
+            try {
+                parser.load_from_file (config_file_name);
+                root_node = parser.get_root ().copy ();
+                if (root_node.get_node_type () != NodeType.OBJECT) {
+                    root_node = new Json.Node (NodeType.OBJECT);
+                    root_node.take_object (new Json.Object ());
+                }
+            } catch (Error err) {
+                root_node = new Json.Node (NodeType.OBJECT);
+                root_node.take_object (new Json.Object ());
+            }
+        }
+
+        /**
+        * Creates an instance of an object derived from ConfigObject class, which
+        * will have its public properties set to values stored in config file, or
+        * to the default values if this object wasn't yet stored.
+        *
+        * @param group A group name.
+        * @param key A key name.
+        * @param config_type Type of the object (must be subclass of ConfigObject)
+        * @return An instance of config_type.
+        */
+        public ConfigObject get_config (string group, string key, Type config_type) {
+            unowned Json.Object obj = root_node.get_object ();
+            unowned Json.Node group_node = obj.get_member (group);
+
+            if (group_node != null) {
+                if (group_node.get_node_type () == NodeType.OBJECT) {
+                    unowned Json.Object group_obj = group_node.get_object ();
+                    unowned Json.Node key_node = group_obj.get_member (key);
+
+                    if (key_node != null && key_node.get_node_type () == NodeType.OBJECT) {
+                        var result = Json.gobject_deserialize (config_type, key_node);
+                        return result as ConfigObject;
+                    }
+                }
+            }
+
+            return GLib.Object.new (config_type) as ConfigObject;
+        }
+
+        /**
+        * Behaves in a similar way to get_config, but it also watches for changes
+        * in the returned config object and saves them back to the config file
+        * (without the need of calling set_config).
+        *
+        * @param group A group name.
+        * @param key A key name.
+        * @param config_type Type of the object (must be subclass of ConfigObject)
+        */
+        public ConfigObject bind_config (string group, string key, Type config_type) {
+            ConfigObject config_object = get_config (group, key, config_type);
+            // make sure the lambda doesn't take a ref on the config_object
+            unowned ConfigObject co = config_object;
+            co.notify.connect (() => { this.set_config (group, key, co); });
+
+            return config_object;
+        }
+
+        /**
+        * Stores all public properties of the object to the config file under
+        * specified group and key names.
+        *
+        * @param group A group name.
+        * @param key A key name.
+        * @param cfg_obj ConfigObject instance.
+        */
+        public void set_config (string group, string key, ConfigObject cfg_obj) {
+            unowned Json.Object obj = root_node.get_object ();
+            if (!obj.has_member (group) || obj.get_member (group).get_node_type () != NodeType.OBJECT) {
+                // why set_object_member works, but set_member doesn't ?!
+                obj.set_object_member (group, new Json.Object ());
+            }
+
+            unowned Json.Object group_obj = obj.get_object_member (group);
+            // why the hell is this necessary?
+            if (group_obj.has_member (key)) {
+                group_obj.remove_member (key);
+            }
+
+            Json.Node node = Json.gobject_serialize (cfg_obj);
+            group_obj.set_object_member (key, node.get_object ());
+
+            if (save_timer_id != 0) {
+                Source.remove (save_timer_id);
+            }
+            // on crap, this takes a reference on self
+            save_timer_id = Timeout.add (30000, this.save_timeout);
+        }
+
+        private bool save_timeout () {
+            save_timer_id = 0;
+            save ();
+
+            return false;
+        }
+
+        /**
+        * Forces immediate saving of the configuration file to the filesystem.
+        */
+        public void save () {
+            if (save_timer_id != 0) {
+                Source.remove (save_timer_id);
+                save_timer_id = 0;
+            }
+
+            var generator = new Generator ();
+            generator.pretty = true;
+            generator.set_root (root_node);
+
+            DirUtils.create_with_parents (GLib.Path.get_dirname (config_file_name), 0755);
+            try {
+                generator.to_file (config_file_name);
+            } catch (Error err) {
+                warning ("%s", err.message);
+            }
+        }
+    }
 }
-

=== modified file 'lib/synapse-core/data-sink.vala'
--- lib/synapse-core/data-sink.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/data-sink.vala	2017-01-26 19:54:51 +0000
@@ -1,574 +1,512 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  public errordomain SearchError
-  {
-    SEARCH_CANCELLED,
-    UNKNOWN_ERROR
-  }
-  
-  public interface SearchProvider : Object
-  {
-    public abstract async Gee.List<Match> search (string query,
-                                                  QueryFlags flags,
-                                                  ResultSet? dest_result_set,
-                                                  Cancellable? cancellable = null) throws SearchError;
-  }
-
-  // don't move into a class, gir doesn't like it
-  [CCode (has_target = false)]
-  public delegate void PluginRegisterFunc ();
-  
-  public class DataSink : Object, SearchProvider
-  {
-    public class PluginRegistry : Object
-    {
-      public class PluginInfo
-      {
-        public Type plugin_type;
-        public string title;
-        public string description;
-        public string icon_name;
-        public PluginRegisterFunc register_func;
-        public bool runnable;
-        public string runnable_error;
-        public PluginInfo (Type type, string title, string desc,
-                           string icon_name, PluginRegisterFunc reg_func,
-                           bool runnable, string runnable_error)
-        {
-          this.plugin_type = type;
-          this.title = title;
-          this.description = desc;
-          this.icon_name = icon_name;
-          this.register_func = reg_func;
-          this.runnable = runnable;
-          this.runnable_error = runnable_error;
-        }
-      }
-
-      public static unowned PluginRegistry instance = null;
-
-      private Gee.List<PluginInfo> plugins;
-      
-      construct
-      {
-        instance = this;
-        plugins = new Gee.ArrayList<PluginInfo> ();
-      }
-      
-      ~PluginRegistry ()
-      {
-        instance = null;
-      }
-      
-      public static PluginRegistry get_default ()
-      {
-        return instance ?? new PluginRegistry ();
-      }
-      
-      public void register_plugin (Type plugin_type,
-                                   string title,
-                                   string description,
-                                   string icon_name,
-                                   PluginRegisterFunc reg_func,
-                                   bool runnable = true,
-                                   string runnable_error = "")
-      {
-        // FIXME: how about a frickin Type -> PluginInfo map?!
-        int index = -1;
-        for (int i=0; i < plugins.size; i++)
-        {
-          if (plugins[i].plugin_type == plugin_type)
-          {
-            index = i;
-            break;
-          }
-        }
-        if (index >= 0) plugins.remove_at (index);
-        
-        var p = new PluginInfo (plugin_type, title, description, icon_name,
-                                reg_func, runnable, runnable_error);
-        plugins.add (p);
-      }
-      
-      public Gee.List<PluginInfo> get_plugins ()
-      {
-        return plugins.read_only_view;
-      }
-      
-      public PluginInfo? get_plugin_info_for_type (Type plugin_type)
-      {
-        foreach (PluginInfo pi in plugins)
-        {
-          if (pi.plugin_type == plugin_type) return pi;
-        }
-        
-        return null;
-      }
-    }
-    
-    private class DataSinkConfiguration : ConfigObject
-    {
-      // vala keeps array lengths, and therefore doesn't support setting arrays
-      // via automatic public properties
-      private string[] _disabled_plugins = null;
-      public string[] disabled_plugins
-      {
-        get
-        {
-          return _disabled_plugins;
-        }
-        set
-        {
-          _disabled_plugins = value;
-        }
-      }
-      
-      public void set_plugin_enabled (Type t, bool enabled)
-      {
-        if (enabled) enable_plugin (t.name ());
-        else disable_plugin (t.name ());
-      }
-      
-      public bool is_plugin_enabled (Type t)
-      {
-        if (_disabled_plugins == null) return true;
-        unowned string plugin_name = t.name ();
-        foreach (string s in _disabled_plugins)
-        {
-          if (s == plugin_name) return false;
-        }
-        return true;
-      }
-      
-      private void enable_plugin (string name)
-      {
-        if (_disabled_plugins == null) return;
-        if (!(name in _disabled_plugins)) return;
-        
-        string[] cpy = {};
-        foreach (string s in _disabled_plugins)
-        {
-          if (s != name) cpy += s;
-        }
-        _disabled_plugins = (owned) cpy;
-      }
-      
-      private void disable_plugin (string name)
-      {
-        if (_disabled_plugins == null || !(name in _disabled_plugins))
-        {
-          _disabled_plugins += name;
-        }
-      }
-    }
-    
-    public DataSink ()
-    {
-    }
-
-    ~DataSink ()
-    {
-      Utils.Logger.debug (this, "DataSink died...");
-    }
-
-    private DataSinkConfiguration config;
-    private Gee.Set<ItemProvider> item_plugins;
-    private Gee.Set<ActionProvider> action_plugins;
-    private uint query_id;
-    // data sink will keep reference to the name cache, so others will get this
-    // instance on call to get_default()
-    private DBusService dbus_name_cache;
-    private DesktopFileService desktop_file_service;
-    private PluginRegistry registry;
-    private RelevancyService relevancy_service;
-    private VolumeService volume_service;
-    private Type[] plugin_types;
-
-    construct
-    {
-      item_plugins = new Gee.HashSet<ItemProvider> ();
-      action_plugins = new Gee.HashSet<ActionProvider> ();
-      plugin_types = {};
-      query_id = 0;
-
-      var cfg = ConfigService.get_default ();
-      config = (DataSinkConfiguration)
-        cfg.get_config ("data-sink", "global", typeof (DataSinkConfiguration));
-
-      // oh well, yea we need a few singletons
-      registry = PluginRegistry.get_default ();
-      relevancy_service = RelevancyService.get_default ();
-      volume_service = VolumeService.get_default ();
-
-      initialize_caches.begin ();
-      register_static_plugin (typeof (CommonActions));
-    }
-
-    private async void initialize_caches ()
-    {
-      Idle.add_full (Priority.LOW, initialize_caches.callback);
-      yield;
-
-      int initialized_components = 0;
-      int NUM_COMPONENTS = 2;
-
-      dbus_name_cache = DBusService.get_default ();
-      dbus_name_cache.initialize.begin (() =>
-      {
-        initialized_components++;
-        if (initialized_components >= NUM_COMPONENTS)
-        {
-          initialize_caches.callback ();
-        }
-      });
-
-      desktop_file_service = DesktopFileService.get_default ();
-      desktop_file_service.reload_done.connect (this.check_plugins);
-      desktop_file_service.initialize.begin (() =>
-      {
-        initialized_components++;
-        if (initialized_components >= NUM_COMPONENTS)
-        {
-          initialize_caches.callback ();
-        }
-      });
-
-      yield;
-
-      Idle.add (() => { this.load_plugins (); return false; });
-    }
-    
-    private void check_plugins ()
-    {
-      PluginRegisterFunc[] reg_funcs = {};
-      foreach (var pi in registry.get_plugins ())
-      {
-        reg_funcs += pi.register_func;
-      }
-
-      foreach (PluginRegisterFunc func in reg_funcs)
-      {
-        func ();
-      }
-    }
-
-    public bool has_empty_handlers { get; set; default = false; }
-    public bool has_unknown_handlers { get; set; default = false; }
-
-    private bool plugins_loaded = false;
-
-    public signal void plugin_registered (Object plugin);
-
-    protected void register_plugin (Object plugin)
-    {
-      if (plugin is ActionProvider)
-      {
-        ActionProvider action_plugin = plugin as ActionProvider;
-        action_plugins.add (action_plugin);
-        has_unknown_handlers |= action_plugin.handles_unknown ();
-      }
-      if (plugin is ItemProvider)
-      {
-        ItemProvider item_plugin = plugin as ItemProvider;
-        item_plugins.add (item_plugin);
-        has_empty_handlers |= item_plugin.handles_empty_query ();
-      }
-
-      plugin_registered (plugin);
-    }
-    
-    private void update_has_unknown_handlers ()
-    {
-      bool tmp = false;
-      foreach (var action in action_plugins)
-      {
-        if (action.enabled && action.handles_unknown ())
-        {
-          tmp = true;
-          break;
-        }
-      }
-      has_unknown_handlers = tmp;
-    }
-
-    private void update_has_empty_handlers ()
-    {
-      bool tmp = false;
-      foreach (var item_plugin in item_plugins)
-      {
-        if (item_plugin.enabled && item_plugin.handles_empty_query ())
-        {
-          tmp = true;
-          break;
-        }
-      }
-      has_empty_handlers = tmp;
-    }
-
-    private Object? create_plugin (Type t)
-    {
-      var obj_class = (ObjectClass) t.class_ref ();
-      if (obj_class != null && obj_class.find_property ("data-sink") != null)
-      {
-        return Object.new (t, "data-sink", this, null);
-      }
-      else
-      {
-        return Object.new (t, null);
-      }
-    }
-
-    private void load_plugins ()
-    {
-      // FIXME: fetch and load modules
-      foreach (Type t in plugin_types)
-      {
-        t.class_ref (); // makes the plugin register itself into PluginRegistry
-        PluginRegistry.PluginInfo? info = registry.get_plugin_info_for_type (t);
-        bool skip = info != null && info.runnable == false;
-        if (config.is_plugin_enabled (t) && !skip)
-        {
-          var plugin = create_plugin (t);
-          register_plugin (plugin);
-          (plugin as Activatable).activate ();
-        }
-      }
-
-      plugins_loaded = true;
-    }
-    
-    /* This needs to be called right after instantiation,
-     * if plugins_loaded == true, it won't have any effect. */
-    public void register_static_plugin (Type plugin_type)
-    {
-      if (plugin_type in plugin_types) return;
-      plugin_types += plugin_type;
-    }
-    
-    public unowned Object? get_plugin (string name)
-    {
-      unowned Object? result = null;
-
-      foreach (var plugin in item_plugins)
-      {
-        if (plugin.get_type ().name () == name)
-        {
-          result = plugin;
-          break;
-        }
-      }
-
-      return result;
-    }
-    
-    public bool is_plugin_enabled (Type plugin_type)
-    {
-      foreach (var plugin in item_plugins)
-      {
-        if (plugin.get_type () == plugin_type) return plugin.enabled;
-      }
-      
-      foreach (var action in action_plugins)
-      {
-        if (action.get_type () == plugin_type) return action.enabled;
-      }
-      
-      return false;
-    }
-    
-    public void set_plugin_enabled (Type plugin_type, bool enabled)
-    {
-      // save it into our config object
-      config.set_plugin_enabled (plugin_type, enabled);
-      ConfigService.get_default ().set_config ("data-sink", "global", config);
-
-      foreach (var plugin in item_plugins)
-      {
-        if (plugin.get_type () == plugin_type)
-        {
-          plugin.enabled = enabled;
-          if (enabled) plugin.activate ();
-          else plugin.deactivate ();
-          update_has_empty_handlers ();
-          return;
-        }
-      }
-
-      foreach (var action in action_plugins)
-      {
-        if (action.get_type () == plugin_type)
-        {
-          action.enabled = enabled;
-          if (enabled) action.activate ();
-          else action.deactivate ();
-          update_has_unknown_handlers ();
-          return;
-        }
-      }
-
-      // plugin isn't instantiated yet
-      if (enabled)
-      {
-        var new_instance = create_plugin (plugin_type);
-        register_plugin (new_instance);
-        (new_instance as Activatable).activate ();
-      }
-    }
-
-    [Signal (detailed = true)]
-    public signal void search_done (ResultSet rs, uint query_id);
-
-    public async Gee.List<Match> search (string query,
-                                         QueryFlags flags,
-                                         ResultSet? dest_result_set,
-                                         Cancellable? cancellable = null) throws SearchError
-    {
-      // wait for our initialization
-      while (!plugins_loaded)
-      {
-        Timeout.add (100, search.callback);
-        yield;
-        if (cancellable != null && cancellable.is_cancelled ())
-        {
-          throw new SearchError.SEARCH_CANCELLED ("Cancelled");
-        }
-      }
-      var q = Query (query_id++, query, flags);
-      string query_stripped = query.strip ();
-
-      var cancellables = new GLib.List<Cancellable> ();
-
-      var current_result_set = dest_result_set ?? new ResultSet ();
-      int search_size = item_plugins.size;
-      // FIXME: this is probably useless, if async method finishes immediately,
-      // it'll call complete_in_idle
-      bool waiting = false;
-
-      foreach (var data_plugin in item_plugins)
-      {
-        bool skip = !data_plugin.enabled ||
-          (query == "" && !data_plugin.handles_empty_query ()) ||
-          !data_plugin.handles_query (q);
-        if (skip)
-        {
-          search_size--;
-          continue;
-        }
-        // we need to pass separate cancellable to each plugin, because we're
-        // running them in parallel
-        var c = new Cancellable ();
-        cancellables.prepend (c);
-        q.cancellable = c;
-        // magic comes here
-        data_plugin.search.begin (q, (src_obj, res) =>
-        {
-          var plugin = src_obj as ItemProvider;
-          try
-          {
-            var results = plugin.search.end (res);
-            this.search_done[plugin.get_type ().name ()] (results, q.query_id);
-            current_result_set.add_all (results);
-          }
-          catch (SearchError err)
-          {
-            if (!(err is SearchError.SEARCH_CANCELLED))
-            {
-              warning ("%s returned error: %s",
-                       plugin.get_type ().name (), err.message);
-            }
-          }
-
-          if (--search_size == 0 && waiting) search.callback ();
-        });
-      }
-      cancellables.reverse ();
-      
-      if (cancellable != null)
-      {
-        cancellable.connect (() =>
-        {
-          foreach (var c in cancellables) c.cancel ();
-        });
-      }
-
-      waiting = true;
-      if (search_size > 0) yield;
-
-      if (cancellable != null && cancellable.is_cancelled ())
-      {
-        throw new SearchError.SEARCH_CANCELLED ("Cancelled");
-      }
-
-      if (has_unknown_handlers && query_stripped != "")
-      {
-        var unknown_match = new DefaultMatch (query);
-        bool add_to_rs = false;
-        if (QueryFlags.ACTIONS in flags || QueryFlags.TEXT in flags)
-        {
-          // FIXME: maybe we should also check here if there are any matches
-          add_to_rs = true;
-        }
-        else
-        {
-          // check whether any of the actions support this category
-          var unknown_match_actions = find_actions_for_unknown_match (unknown_match, flags);
-          if (unknown_match_actions.size > 0) add_to_rs = true;
-        }
-
-        if (add_to_rs) current_result_set.add (unknown_match, 0);
-      }
-
-      return current_result_set.get_sorted_list ();
-    }
-    
-    protected Gee.List<Match> find_actions_for_unknown_match (Match match,
-                                                              QueryFlags flags)
-    {
-      var rs = new ResultSet ();
-      var q = Query (0, "", flags);
-      foreach (var action_plugin in action_plugins)
-      {
-        if (!action_plugin.enabled) continue;
-        if (!action_plugin.handles_unknown ()) continue;
-        rs.add_all (action_plugin.find_for_match (ref q, match));
-      }
-
-      return rs.get_sorted_list ();
-    }
-
-    public Gee.List<Match> find_actions_for_match (Match match, string? query,
-                                                   QueryFlags flags)
-    {
-      var rs = new ResultSet ();
-      var q = Query (0, query ?? "", flags);
-      foreach (var action_plugin in action_plugins)
-      {
-        if (!action_plugin.enabled) continue;
-        rs.add_all (action_plugin.find_for_match (ref q, match));
-      }
-      
-      return rs.get_sorted_list ();
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+    public errordomain SearchError {
+        SEARCH_CANCELLED,
+        UNKNOWN_ERROR
+    }
+
+    public interface SearchProvider : Object {
+        public abstract async Gee.List<Match> search (string query,
+                                                        QueryFlags flags,
+                                                        ResultSet? dest_result_set,
+                                                        Cancellable? cancellable = null) throws SearchError;
+    }
+
+    // don't move into a class, gir doesn't like it
+    [CCode (has_target = false)]
+    public delegate void PluginRegisterFunc ();
+
+    public class DataSink : Object, SearchProvider {
+        public class PluginRegistry : Object {
+            public class PluginInfo {
+                public Type plugin_type;
+                public string title;
+                public string description;
+                public string icon_name;
+                public PluginRegisterFunc register_func;
+                public bool runnable;
+                public string runnable_error;
+
+                public PluginInfo (Type type, string title, string desc, string icon_name, PluginRegisterFunc reg_func, bool runnable, string runnable_error) {
+                    this.plugin_type = type;
+                    this.title = title;
+                    this.description = desc;
+                    this.icon_name = icon_name;
+                    this.register_func = reg_func;
+                    this.runnable = runnable;
+                    this.runnable_error = runnable_error;
+                }
+            }
+
+            public static unowned PluginRegistry instance = null;
+
+            private Gee.List<PluginInfo> plugins;
+
+            construct {
+                instance = this;
+                plugins = new Gee.ArrayList<PluginInfo> ();
+            }
+
+            ~PluginRegistry () {
+                instance = null;
+            }
+
+            public static PluginRegistry get_default () {
+                return instance ?? new PluginRegistry ();
+            }
+
+            public void register_plugin (Type plugin_type, string title, string description, string icon_name, PluginRegisterFunc reg_func, bool runnable = true, string runnable_error = "") {
+                // FIXME: how about a frickin Type -> PluginInfo map?!
+                int index = -1;
+                for (int i = 0; i < plugins.size; i++) {
+                    if (plugins[i].plugin_type == plugin_type) {
+                        index = i;
+                        break;
+                    }
+                }
+                if (index >= 0) {
+                    plugins.remove_at (index);
+                }
+
+                var p = new PluginInfo (plugin_type, title, description, icon_name, reg_func, runnable, runnable_error);
+                plugins.add (p);
+            }
+
+            public Gee.List<PluginInfo> get_plugins () {
+                return plugins.read_only_view;
+            }
+
+            public PluginInfo? get_plugin_info_for_type (Type plugin_type) {
+                foreach (PluginInfo pi in plugins) {
+                    if (pi.plugin_type == plugin_type) {
+                        return pi;
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        private class DataSinkConfiguration : ConfigObject {
+            // vala keeps array lengths, and therefore doesn't support setting arrays
+            // via automatic public properties
+            private string[] _disabled_plugins = null;
+            public string[] disabled_plugins { get { return _disabled_plugins; } set { _disabled_plugins = value; } }
+
+            public void set_plugin_enabled (Type t, bool enabled) {
+                if (enabled) {
+                    enable_plugin (t.name ());
+                } else {
+                    disable_plugin (t.name ());
+                }
+            }
+
+            public bool is_plugin_enabled (Type t) {
+                if (_disabled_plugins == null) {
+                    return true;
+                }
+                unowned string plugin_name = t.name ();
+                foreach (string s in _disabled_plugins) {
+                    if (s == plugin_name) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            private void enable_plugin (string name) {
+                if (_disabled_plugins == null) {
+                    return;
+                }
+                if (!(name in _disabled_plugins)) {
+                    return;
+                }
+
+                string[] cpy = {};
+                foreach (string s in _disabled_plugins) {
+                    if (s != name) {
+                        cpy += s;
+                    }
+                }
+                _disabled_plugins = (owned) cpy;
+            }
+
+            private void disable_plugin (string name) {
+                if (_disabled_plugins == null || !(name in _disabled_plugins)) {
+                    _disabled_plugins += name;
+                }
+            }
+        }
+
+        public DataSink () { }
+
+        ~DataSink () {
+            Utils.Logger.debug (this, "DataSink died...");
+        }
+
+        private DataSinkConfiguration config;
+        private Gee.Set<ItemProvider> item_plugins;
+        private Gee.Set<ActionProvider> action_plugins;
+        private uint query_id;
+        // data sink will keep reference to the name cache, so others will get this
+        // instance on call to get_default()
+        private DBusService dbus_name_cache;
+        private DesktopFileService desktop_file_service;
+        private PluginRegistry registry;
+        private RelevancyService relevancy_service;
+        private VolumeService volume_service;
+        private Type[] plugin_types;
+
+        construct {
+            item_plugins = new Gee.HashSet<ItemProvider> ();
+            action_plugins = new Gee.HashSet<ActionProvider> ();
+            plugin_types = {};
+            query_id = 0;
+
+            var cfg = ConfigService.get_default ();
+            config = (DataSinkConfiguration)
+            cfg.get_config ("data-sink", "global", typeof (DataSinkConfiguration));
+
+            // oh well, yea we need a few singletons
+            registry = PluginRegistry.get_default ();
+            relevancy_service = RelevancyService.get_default ();
+            volume_service = VolumeService.get_default ();
+
+            initialize_caches.begin ();
+            register_static_plugin (typeof (CommonActions));
+        }
+
+        private async void initialize_caches () {
+            Idle.add_full (Priority.LOW, initialize_caches.callback);
+            yield;
+
+            int initialized_components = 0;
+            int NUM_COMPONENTS = 2;
+
+            dbus_name_cache = DBusService.get_default ();
+            dbus_name_cache.initialize.begin (() => {
+                initialized_components++;
+                if (initialized_components >= NUM_COMPONENTS) {
+                    initialize_caches.callback ();
+                }
+            });
+
+            desktop_file_service = DesktopFileService.get_default ();
+            desktop_file_service.reload_done.connect (this.check_plugins);
+            desktop_file_service.initialize.begin (() => {
+                initialized_components++;
+                if (initialized_components >= NUM_COMPONENTS) {
+                    initialize_caches.callback ();
+                }
+            });
+
+            yield;
+
+            Idle.add (() => { this.load_plugins (); return false; });
+        }
+
+        private void check_plugins () {
+            PluginRegisterFunc[] reg_funcs = {};
+            foreach (var pi in registry.get_plugins ()) {
+                reg_funcs += pi.register_func;
+            }
+
+            foreach (PluginRegisterFunc func in reg_funcs) {
+                func ();
+            }
+        }
+
+        public bool has_empty_handlers { get; set; default = false; }
+        public bool has_unknown_handlers { get; set; default = false; }
+
+        private bool plugins_loaded = false;
+
+        public signal void plugin_registered (Object plugin);
+
+        protected void register_plugin (Object plugin) {
+            if (plugin is ActionProvider) {
+                ActionProvider action_plugin = plugin as ActionProvider;
+                action_plugins.add (action_plugin);
+                has_unknown_handlers |= action_plugin.handles_unknown ();
+            }
+            if (plugin is ItemProvider) {
+                ItemProvider item_plugin = plugin as ItemProvider;
+                item_plugins.add (item_plugin);
+                has_empty_handlers |= item_plugin.handles_empty_query ();
+            }
+
+            plugin_registered (plugin);
+        }
+
+        private void update_has_unknown_handlers () {
+            bool tmp = false;
+            foreach (var action in action_plugins) {
+                if (action.enabled && action.handles_unknown ()) {
+                    tmp = true;
+                    break;
+                }
+            }
+            has_unknown_handlers = tmp;
+        }
+
+        private void update_has_empty_handlers () {
+            bool tmp = false;
+            foreach (var item_plugin in item_plugins) {
+                if (item_plugin.enabled && item_plugin.handles_empty_query ())  {
+                    tmp = true;
+                    break;
+                }
+            }
+            has_empty_handlers = tmp;
+        }
+
+        private Object? create_plugin (Type t) {
+            var obj_class = (ObjectClass) t.class_ref ();
+            if (obj_class != null && obj_class.find_property ("data-sink") != null) {
+                return Object.new (t, "data-sink", this, null);
+            } else {
+                return Object.new (t, null);
+            }
+        }
+
+        private void load_plugins () {
+            // FIXME: fetch and load modules
+            foreach (Type t in plugin_types) {
+                t.class_ref (); // makes the plugin register itself into PluginRegistry
+                PluginRegistry.PluginInfo? info = registry.get_plugin_info_for_type (t);
+                bool skip = info != null && info.runnable == false;
+                if (config.is_plugin_enabled (t) && !skip) {
+                    var plugin = create_plugin (t);
+                    register_plugin (plugin);
+                    (plugin as Activatable).activate ();
+                }
+            }
+
+            plugins_loaded = true;
+        }
+
+        /* This needs to be called right after instantiation,
+        * if plugins_loaded == true, it won't have any effect. */
+        public void register_static_plugin (Type plugin_type) {
+            if (plugin_type in plugin_types) {
+                return;
+            }
+            plugin_types += plugin_type;
+        }
+
+        public unowned Object? get_plugin (string name) {
+            unowned Object? result = null;
+
+            foreach (var plugin in item_plugins) {
+                if (plugin.get_type ().name () == name) {
+                    result = plugin;
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        public bool is_plugin_enabled (Type plugin_type) {
+            foreach (var plugin in item_plugins) {
+                if (plugin.get_type () == plugin_type) {
+                    return plugin.enabled;
+                }
+            }
+
+            foreach (var action in action_plugins) {
+                if (action.get_type () == plugin_type) {
+                    return action.enabled;
+                }
+            }
+
+            return false;
+        }
+
+        public void set_plugin_enabled (Type plugin_type, bool enabled) {
+            // save it into our config object
+            config.set_plugin_enabled (plugin_type, enabled);
+            ConfigService.get_default ().set_config ("data-sink", "global", config);
+
+            foreach (var plugin in item_plugins) {
+                if (plugin.get_type () == plugin_type) {
+                    plugin.enabled = enabled;
+                    if (enabled) {
+                        plugin.activate ();
+                    } else {
+                        plugin.deactivate ();
+                    }
+                    update_has_empty_handlers ();
+
+                    return;
+                }
+            }
+
+            foreach (var action in action_plugins) {
+                if (action.get_type () == plugin_type) {
+                    action.enabled = enabled;
+                    if (enabled) {
+                        action.activate ();
+                    } else {
+                        action.deactivate ();
+                    }
+                    update_has_unknown_handlers ();
+
+                    return;
+                }
+            }
+
+            // plugin isn't instantiated yet
+            if (enabled) {
+                var new_instance = create_plugin (plugin_type);
+                register_plugin (new_instance);
+                (new_instance as Activatable).activate ();
+            }
+        }
+
+        [Signal (detailed = true)]
+        public signal void search_done (ResultSet rs, uint query_id);
+
+        public async Gee.List<Match> search (string query, QueryFlags flags, ResultSet? dest_result_set, Cancellable? cancellable = null) throws SearchError {
+            // wait for our initialization
+            while (!plugins_loaded) {
+                Timeout.add (100, search.callback);
+                yield;
+                if (cancellable != null && cancellable.is_cancelled ()) {
+                    throw new SearchError.SEARCH_CANCELLED ("Cancelled");
+                }
+            }
+
+            var q = Query (query_id++, query, flags);
+            string query_stripped = query.strip ();
+
+            var cancellables = new GLib.List<Cancellable> ();
+
+            var current_result_set = dest_result_set ?? new ResultSet ();
+            int search_size = item_plugins.size;
+            // FIXME: this is probably useless, if async method finishes immediately,
+            // it'll call complete_in_idle
+            bool waiting = false;
+
+            foreach (var data_plugin in item_plugins) {
+                bool skip = !data_plugin.enabled || (query == "" && !data_plugin.handles_empty_query ()) || !data_plugin.handles_query (q);
+                if (skip) {
+                    search_size--;
+                    continue;
+                }
+                // we need to pass separate cancellable to each plugin, because we're
+                // running them in parallel
+                var c = new Cancellable ();
+                cancellables.prepend (c);
+                q.cancellable = c;
+                // magic comes here
+                data_plugin.search.begin (q, (src_obj, res) => {
+                    var plugin = src_obj as ItemProvider;
+                    try {
+                        var results = plugin.search.end (res);
+                        this.search_done[plugin.get_type ().name ()] (results, q.query_id);
+                        current_result_set.add_all (results);
+                    } catch (SearchError err) {
+                        if (!(err is SearchError.SEARCH_CANCELLED)) {
+                            warning ("%s returned error: %s",
+                            plugin.get_type ().name (), err.message);
+                        }
+                    }
+
+                    if (--search_size == 0 && waiting) {
+                        search.callback ();
+                    }
+                });
+            }
+            cancellables.reverse ();
+
+            if (cancellable != null) {
+                cancellable.connect (() => {
+                    foreach (var c in cancellables) {
+                        c.cancel ();
+                    }
+                });
+            }
+
+            waiting = true;
+            if (search_size > 0) {
+                yield;
+            }
+
+            if (cancellable != null && cancellable.is_cancelled ()) {
+                throw new SearchError.SEARCH_CANCELLED ("Cancelled");
+            }
+
+            if (has_unknown_handlers && query_stripped != "") {
+                var unknown_match = new DefaultMatch (query);
+                bool add_to_rs = false;
+
+                if (QueryFlags.ACTIONS in flags || QueryFlags.TEXT in flags) {
+                    // FIXME: maybe we should also check here if there are any matches
+                    add_to_rs = true;
+                } else {
+                    // check whether any of the actions support this category
+                    var unknown_match_actions = find_actions_for_unknown_match (unknown_match, flags);
+                    if (unknown_match_actions.size > 0) add_to_rs = true;
+                }
+
+                if (add_to_rs) current_result_set.add (unknown_match, 0);
+            }
+
+            return current_result_set.get_sorted_list ();
+        }
+
+        protected Gee.List<Match> find_actions_for_unknown_match (Match match, QueryFlags flags) {
+            var rs = new ResultSet ();
+            var q = Query (0, "", flags);
+
+            foreach (var action_plugin in action_plugins) {
+                if (!action_plugin.enabled) {
+                    continue;
+                }
+                if (!action_plugin.handles_unknown ()) {
+                    continue;
+                }
+                rs.add_all (action_plugin.find_for_match (ref q, match));
+            }
+
+            return rs.get_sorted_list ();
+        }
+
+        public Gee.List<Match> find_actions_for_match (Match match, string? query, QueryFlags flags) {
+            var rs = new ResultSet ();
+            var q = Query (0, query ?? "", flags);
+
+            foreach (var action_plugin in action_plugins) {
+                if (!action_plugin.enabled) {
+                    continue;
+                }
+
+                rs.add_all (action_plugin.find_for_match (ref q, match));
+            }
+
+            return rs.get_sorted_list ();
+        }
+    }
 }
-

=== modified file 'lib/synapse-core/dbus-service.vala'
--- lib/synapse-core/dbus-service.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/dbus-service.vala	2017-01-26 19:54:51 +0000
@@ -1,166 +1,145 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  [DBus (name = "org.freedesktop.DBus")]
-  public interface FreeDesktopDBus : GLib.Object
-  {
-    public const string UNIQUE_NAME = "org.freedesktop.DBus";
-    public const string OBJECT_PATH = "/org/freedesktop/DBus";
-
-    public abstract async string[] list_queued_owners (string name) throws IOError;
-    public abstract async string[] list_names () throws IOError;
-    public abstract async string[] list_activatable_names () throws IOError;
-    public abstract async bool name_has_owner (string name) throws IOError;
-    public signal void name_owner_changed (string name,
-                                           string old_owner,
-                                           string new_owner);
-    public abstract async uint32 start_service_by_name (string name,
-                                               uint32 flags) throws IOError;
-    public abstract async string get_name_owner (string name) throws IOError;
-  }
-  
-  public class DBusService : Object
-  {
-    private FreeDesktopDBus proxy;
-    private Gee.Set<string> owned_names;
-    private Gee.Set<string> activatable_names;
-    private Gee.Set<string> system_activatable_names;
-    
-    private Utils.AsyncOnce<bool> init_once;
-
-    // singleton that can be easily destroyed
-    public static DBusService get_default ()
-    {
-      return instance ?? new DBusService ();
-    }
-
-    private DBusService ()
-    {
-    }
-    
-    private static unowned DBusService? instance;
-    construct
-    {
-      instance = this;
-      owned_names = new Gee.HashSet<string> ();
-      activatable_names = new Gee.HashSet<string> ();
-      system_activatable_names = new Gee.HashSet<string> ();
-      init_once = new Utils.AsyncOnce<bool> ();
-
-      initialize.begin ();
-    }
-    
-    ~DBusService ()
-    {
-      instance = null;
-    }
-    
-    private void name_owner_changed (FreeDesktopDBus sender,
-                                     string name,
-                                     string old_owner,
-                                     string new_owner)
-    {
-      if (name.has_prefix (":")) return;
-
-      if (old_owner == "")
-      {
-        owned_names.add (name);
-        owner_changed (name, true);
-      }
-      else if (new_owner == "")
-      {
-        owned_names.remove (name);
-        owner_changed (name, false);
-      }
-    }
-    
-    public signal void owner_changed (string name, bool is_owned);
-    
-    public bool name_has_owner (string name)
-    {
-      return name in owned_names;
-    }
-    
-    public bool name_is_activatable (string name)
-    {
-      return name in activatable_names;
-    }
-    
-    public bool service_is_available (string name)
-    {
-      return name in system_activatable_names;
-    }
-
-    public async void initialize ()
-    {
-      if (init_once.is_initialized ()) return;
-      var is_locked = yield init_once.enter ();
-      if (!is_locked) return;
-
-      string[] names;
-      try
-      {
-        proxy = Bus.get_proxy_sync (BusType.SESSION,
-                                    FreeDesktopDBus.UNIQUE_NAME,
-                                    FreeDesktopDBus.OBJECT_PATH);
-
-        proxy.name_owner_changed.connect (this.name_owner_changed);
-        names = yield proxy.list_names ();
-        foreach (unowned string name in names)
-        {
-          if (name.has_prefix (":")) continue;
-          owned_names.add (name);
-        }
-        
-        names = yield proxy.list_activatable_names ();
-        foreach (unowned string session_act in names)
-        {
-          activatable_names.add (session_act);
-        }
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-      }
-
-      try
-      {
-        FreeDesktopDBus sys_proxy = Bus.get_proxy_sync (
-                                            BusType.SYSTEM,
-                                            FreeDesktopDBus.UNIQUE_NAME,
-                                            FreeDesktopDBus.OBJECT_PATH);
-
-        names = yield sys_proxy.list_activatable_names ();
-        foreach (unowned string system_act in names)
-        {
-          system_activatable_names.add (system_act);
-        }
-      }
-      catch (Error sys_err)
-      {
-        warning ("%s", sys_err.message);
-      }
-      init_once.leave (true);
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+	[DBus (name = "org.freedesktop.DBus")]
+	public interface FreeDesktopDBus : GLib.Object {
+		public const string UNIQUE_NAME = "org.freedesktop.DBus";
+		public const string OBJECT_PATH = "/org/freedesktop/DBus";
+
+		public abstract async string[] list_queued_owners (string name) throws IOError;
+		public abstract async string[] list_names () throws IOError;
+		public abstract async string[] list_activatable_names () throws IOError;
+		public abstract async bool name_has_owner (string name) throws IOError;
+		public signal void name_owner_changed (string name, string old_owner, string new_owner);
+		public abstract async uint32 start_service_by_name (string name, uint32 flags) throws IOError;
+		public abstract async string get_name_owner (string name) throws IOError;
+	}
+
+	public class DBusService : Object {
+		private FreeDesktopDBus proxy;
+		private Gee.Set<string> owned_names;
+		private Gee.Set<string> activatable_names;
+		private Gee.Set<string> system_activatable_names;
+
+		private Utils.AsyncOnce<bool> init_once;
+
+		// singleton that can be easily destroyed
+		public static DBusService get_default () {
+			return instance ?? new DBusService ();
+		}
+
+		private DBusService () { }
+
+		private static unowned DBusService? instance;
+
+		construct {
+			instance = this;
+			owned_names = new Gee.HashSet<string> ();
+			activatable_names = new Gee.HashSet<string> ();
+			system_activatable_names = new Gee.HashSet<string> ();
+			init_once = new Utils.AsyncOnce<bool> ();
+
+			initialize.begin ();
+		}
+
+		~DBusService () {
+			instance = null;
+		}
+
+		private void name_owner_changed (FreeDesktopDBus sender, string name, string old_owner, string new_owner) {
+			if (name.has_prefix (":")) {
+				return;
+			}
+
+			if (old_owner == "") {
+				owned_names.add (name);
+				owner_changed (name, true);
+			} else if (new_owner == "") {
+				owned_names.remove (name);
+				owner_changed (name, false);
+			}
+		}
+
+		public signal void owner_changed (string name, bool is_owned);
+
+		public bool name_has_owner (string name) {
+			return name in owned_names;
+		}
+
+		public bool name_is_activatable (string name) {
+			return name in activatable_names;
+		}
+
+		public bool service_is_available (string name) {
+			return name in system_activatable_names;
+		}
+
+		public async void initialize () {
+			if (init_once.is_initialized ()) {
+				return;
+			}
+			var is_locked = yield init_once.enter ();
+			if (!is_locked) {
+				return;
+			}
+
+			string[] names;
+			try {
+				proxy = Bus.get_proxy_sync (BusType.SESSION,
+				FreeDesktopDBus.UNIQUE_NAME,
+				FreeDesktopDBus.OBJECT_PATH);
+
+				proxy.name_owner_changed.connect (this.name_owner_changed);
+				names = yield proxy.list_names ();
+				foreach (unowned string name in names) {
+					if (name.has_prefix (":")) {
+						continue;
+					}
+					owned_names.add (name);
+				}
+
+				names = yield proxy.list_activatable_names ();
+				foreach (unowned string session_act in names) {
+					activatable_names.add (session_act);
+				}
+			} catch (Error err) {
+				warning ("%s", err.message);
+			}
+
+			try {
+				FreeDesktopDBus sys_proxy = Bus.get_proxy_sync (
+				BusType.SYSTEM,
+				FreeDesktopDBus.UNIQUE_NAME,
+				FreeDesktopDBus.OBJECT_PATH);
+
+				names = yield sys_proxy.list_activatable_names ();
+				foreach (unowned string system_act in names) {
+					system_activatable_names.add (system_act);
+				}
+			} catch (Error sys_err) {
+				warning ("%s", sys_err.message);
+			}
+			init_once.leave (true);
+		}
+	}
 }
-

=== modified file 'lib/synapse-core/desktop-file-service.vala'
--- lib/synapse-core/desktop-file-service.vala	2017-01-15 23:01:25 +0000
+++ lib/synapse-core/desktop-file-service.vala	2017-01-26 19:54:51 +0000
@@ -1,630 +1,560 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *             Alberto Aldegheri <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  errordomain DesktopFileError
-  {
-    UNINTERESTING_ENTRY
-  }
-
-  public class DesktopFileInfo: Object
-  {
-    // registered environments from http://standards.freedesktop.org/menu-spec/latest
-    // (and pantheon)
-    [Flags]
-    public enum EnvironmentType
-    {
-      GNOME     = 1 << 0,
-      KDE       = 1 << 1,
-      LXDE      = 1 << 2,
-      MATE      = 1 << 3,
-      RAZOR     = 1 << 4,
-      ROX       = 1 << 5,
-      TDE       = 1 << 6,
-      UNITY     = 1 << 7,
-      XFCE      = 1 << 8,
-      PANTHEON  = 1 << 9,
-      OLD       = 1 << 10,
-
-      ALL       = 0x3FF
-    }
-   
-    public string desktop_id { get; construct set; } 
-    public string name { get; construct set; }
-    public string generic_name { get; construct set; }
-    public string comment { get; set; default = ""; }
-    public string icon_name { get; construct set; default = ""; }
-    public string gettext_domain { get; construct set; }
-
-    public bool needs_terminal { get; set; default = false; }
-    public string filename { get; construct set; }
-
-    public string exec { get; set; }
-
-    public bool is_hidden { get; private set; default = false; }
-    public bool is_valid { get; private set; default = true; }
-
-    public string[] mime_types = null;
-    
-    private string? name_folded = null;
-    public unowned string get_name_folded ()
-    {
-      if (name_folded == null) name_folded = name.casefold ();
-      return name_folded;
-    }
-    
-    public EnvironmentType show_in { get; set; default = EnvironmentType.ALL; }
-
-    private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
-    private const string GROUP = "Desktop Entry";
-
-    public DesktopFileInfo.for_keyfile (string path, KeyFile keyfile,
-                                        string desktop_id)
-    {
-      Object (filename: path, desktop_id: desktop_id);
-
-      init_from_keyfile (keyfile);
-    }
-
-    private EnvironmentType parse_environments (string[] environments)
-    {
-      EnvironmentType result = 0;
-      foreach (unowned string env in environments)
-      {
-        string env_up = env.up ();
-        switch (env_up)
-        {
-          case "GNOME": result |= EnvironmentType.GNOME; break;
-          case "PANTHEON": result |= EnvironmentType.PANTHEON; break;
-          case "KDE": result |= EnvironmentType.KDE; break;
-          case "LXDE": result |= EnvironmentType.LXDE; break;
-          case "MATE": result |= EnvironmentType.MATE; break;
-          case "RAZOR": result |= EnvironmentType.RAZOR; break;
-          case "ROX": result |= EnvironmentType.ROX; break;
-          case "TDE": result |= EnvironmentType.TDE; break;
-          case "UNITY": result |= EnvironmentType.UNITY; break;
-          case "XFCE": result |= EnvironmentType.XFCE; break;
-          case "OLD": result |= EnvironmentType.OLD; break;
-          default: warning ("%s is not understood", env); break;
-        }
-      }
-      return result;
-    }
-
-    private void init_from_keyfile (KeyFile keyfile)
-    {
-      try
-      {
-        if (keyfile.get_string (GROUP, "Type") != "Application")
-        {
-          throw new DesktopFileError.UNINTERESTING_ENTRY ("Not Application-type desktop entry");
-        }
-        
-        if (keyfile.has_key (GROUP, "Categories"))
-        {
-          string[] categories = keyfile.get_string_list (GROUP, "Categories");
-          if ("Screensaver" in categories)
-          {
-            throw new DesktopFileError.UNINTERESTING_ENTRY ("Screensaver desktop entry");
-          }
-        }
-        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
-          if (keyfile.has_key (GROUP, domain_key)) {
-            gettext_domain = keyfile.get_string (GROUP, domain_key);
-            break;
-          }
-        }
-
-        DesktopAppInfo app_info;
-        app_info = new DesktopAppInfo.from_keyfile (keyfile);
-
-        if (app_info == null)
-        {
-          throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to create AppInfo");
-        }
-
-        name = app_info.get_name ();
-        generic_name = app_info.get_generic_name () ?? "";     
-        exec = app_info.get_commandline ();
-        if (exec == null)
-        {
-          throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
-        }
-
-        // check for hidden desktop files
-        if (keyfile.has_key (GROUP, "Hidden") &&
-          keyfile.get_boolean (GROUP, "Hidden"))
-        {
-          is_hidden = true;
-        }
-        if (keyfile.has_key (GROUP, "NoDisplay") &&
-          keyfile.get_boolean (GROUP, "NoDisplay"))
-        {
-          is_hidden = true;
-        }
-
-        comment = app_info.get_description () ?? "";
-
-        var icon = app_info.get_icon () ??
-          new ThemedIcon ("application-default-icon");
-        icon_name = icon.to_string ();
-
-        if (keyfile.has_key (GROUP, "MimeType"))
-        {
-          mime_types = keyfile.get_string_list (GROUP, "MimeType");
-        }
-        if (keyfile.has_key (GROUP, "Terminal"))
-        {
-          needs_terminal = keyfile.get_boolean (GROUP, "Terminal");
-        }
-        if (keyfile.has_key (GROUP, "OnlyShowIn"))
-        {
-          show_in = parse_environments (keyfile.get_string_list (GROUP, 
-                                                                 "OnlyShowIn"));
-        }
-        else if (keyfile.has_key (GROUP, "NotShowIn"))
-        {
-          var not_show = parse_environments (keyfile.get_string_list (GROUP,
-                                                                  "NotShowIn"));
-          show_in = EnvironmentType.ALL ^ not_show;
-        }
-        
-        // special case these, people are using them quite often and wonder
-        // why they don't appear
-        if (filename.has_suffix ("gconf-editor.desktop") ||
-            filename.has_suffix ("dconf-editor.desktop"))
-        {
-          is_hidden = false;
-        }
-      }
-      catch (Error err)
-      {
-        Utils.Logger.warning (this, "%s", err.message);
-        is_valid = false;
-      }
-    }
-  }
-
-  public class DesktopFileService : Object
-  {
-    private static unowned DesktopFileService? instance;
-    private Utils.AsyncOnce<bool> init_once;
-
-    // singleton that can be easily destroyed
-    public static DesktopFileService get_default ()
-    {
-      return instance ?? new DesktopFileService ();
-    }
-
-    private DesktopFileService ()
-    {
-    }
-
-    private Gee.List<FileMonitor> directory_monitors;
-    private Gee.List<DesktopFileInfo> all_desktop_files;
-    private Gee.List<DesktopFileInfo> non_hidden_desktop_files;
-    private Gee.Map<unowned string, Gee.List<DesktopFileInfo> > mimetype_map;
-    private Gee.Map<string, Gee.List<DesktopFileInfo> > exec_map;
-    private Gee.Map<string, DesktopFileInfo> desktop_id_map;
-    private Gee.MultiMap<string, string> mimetype_parent_map;
-    
-    construct
-    {
-      instance = this;
-
-      directory_monitors = new Gee.ArrayList<FileMonitor> ();
-      all_desktop_files = new Gee.ArrayList<DesktopFileInfo> ();
-      non_hidden_desktop_files = new Gee.ArrayList<DesktopFileInfo> ();
-      mimetype_parent_map = new Gee.HashMultiMap<string, string> ();
-      init_once = new Utils.AsyncOnce<bool> ();
-
-      initialize.begin ();
-    }
-    
-    ~DesktopFileService ()
-    {
-      instance = null;
-    }
-
-    public async void initialize ()
-    {
-      if (init_once.is_initialized ()) return;
-      var is_locked = yield init_once.enter ();
-      if (!is_locked) return;
-
-      get_environment_type ();
-      DesktopAppInfo.set_desktop_env (session_type_str);
-
-      Idle.add_full (Priority.LOW, initialize.callback);
-      yield;
-
-      yield load_all_desktop_files ();
-
-      init_once.leave (true);
-    }
-    
-    private DesktopFileInfo.EnvironmentType session_type =
-      DesktopFileInfo.EnvironmentType.GNOME;
-    private string session_type_str = "GNOME";
-    
-    public DesktopFileInfo.EnvironmentType get_environment ()
-    {
-      return this.session_type;
-    }
-    
-    private void get_environment_type ()
-    {
-      unowned string? session_var;
-      session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
-      if (session_var == null)
-      {
-        session_var = Environment.get_variable ("DESKTOP_SESSION");
-      }
-
-      if (session_var == null) return;
-
-      string session = session_var.down ();
-
-      if (session.has_prefix ("unity") || session.has_prefix ("ubuntu"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.UNITY;
-        session_type_str = "Unity";
-      }
-      else if (session.has_prefix ("kde"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.KDE;
-        session_type_str = "KDE";
-      }
-      else if (session.has_prefix ("gnome"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.GNOME;
-        session_type_str = "GNOME";
-      }
-      else if (session.has_prefix ("lx"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.LXDE;
-        session_type_str = "LXDE";
-      }
-      else if (session.has_prefix ("xfce"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.XFCE;
-        session_type_str = "XFCE";
-      }
-      else if (session.has_prefix ("mate"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.MATE;
-        session_type_str = "MATE";
-      }
-      else if (session.has_prefix ("razor"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.RAZOR;
-        session_type_str = "Razor";
-      }
-      else if (session.has_prefix ("tde"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.TDE;
-        session_type_str = "TDE";
-      }
-      else if (session.has_prefix ("rox"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.ROX;
-        session_type_str = "ROX";
-      }
-      else if (session.has_prefix ("pantheon"))
-      {
-        session_type = DesktopFileInfo.EnvironmentType.PANTHEON;
-        session_type_str = "Pantheon";
-      }
-      else
-      {
-        warning ("Desktop session type is not recognized, assuming GNOME.");
-      }
-    }
-
-    private async void process_directory (File directory,
-                                          string id_prefix,
-                                          Gee.Set<File> monitored_dirs)
-    {
-      try
-      {
-        string path = directory.get_path ();
-        // we need to skip menu-xdg directory, see lp:686624
-        if (path != null && path.has_suffix ("menu-xdg")) return;
-        // screensavers don't interest us, skip those
-        if (path != null && path.has_suffix ("/screensavers")) return;
-
-        Utils.Logger.debug (this, "Searching for desktop files in: %s", path);
-        bool exists = yield Utils.query_exists_async (directory);
-        if (!exists) return;
-        /* Check if we already scanned this directory // lp:686624 */
-        foreach (var scanned_dir in monitored_dirs)
-        {
-          if (path == scanned_dir.get_path ()) return;
-        }
-        monitored_dirs.add (directory);
-        var enumerator = yield directory.enumerate_children_async (
-          FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE,
-          0, 0);
-        var files = yield enumerator.next_files_async (1024, 0);
-        foreach (var f in files)
-        {
-          unowned string name = f.get_name ();
-          if (f.get_file_type () == FileType.DIRECTORY)
-          {
-            // FIXME: this could cause too many open files error, or?
-            var subdir = directory.get_child (name);
-            var new_prefix = "%s%s-".printf (id_prefix, subdir.get_basename ());
-            yield process_directory (subdir, new_prefix, monitored_dirs);
-          }
-          else
-          {
-            // ignore ourselves
-            if (name.has_suffix ("synapse.desktop")) continue;
-            if (name.has_suffix (".desktop"))
-            {
-              yield load_desktop_file (directory.get_child (name), id_prefix);
-            }
-          }
-        }
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-      }
-    }
-
-    private async void load_all_desktop_files ()
-    {
-      string[] data_dirs = Environment.get_system_data_dirs ();
-      data_dirs += Environment.get_user_data_dir ();
-
-      Gee.Set<File> desktop_file_dirs = new Gee.HashSet<File> ();
-
-      mimetype_parent_map.clear ();
-
-      foreach (unowned string data_dir in data_dirs)
-      {
-        string dir_path = Path.build_filename (data_dir, "applications", null);
-        var directory = File.new_for_path (dir_path);
-        yield process_directory (directory, "", desktop_file_dirs);
-        dir_path = Path.build_filename (data_dir, "mime", "subclasses");
-        yield load_mime_parents_from_file (dir_path);
-      }
-      
-      create_indices ();
-
-      directory_monitors = new Gee.ArrayList<FileMonitor> ();
-      foreach (File d in desktop_file_dirs)
-      {
-        try
-        {
-          FileMonitor monitor = d.monitor_directory (0, null);
-          monitor.changed.connect (this.desktop_file_directory_changed);
-          directory_monitors.add (monitor);
-        }
-        catch (Error err)
-        {
-          warning ("Unable to monitor directory: %s", err.message);
-        }
-      }
-    }
-    
-    private uint timer_id = 0;
-
-    public signal void reload_started ();
-    public signal void reload_done ();
-
-    private void desktop_file_directory_changed ()
-    {
-      reload_started ();
-      if (timer_id != 0)
-      {
-        Source.remove (timer_id);
-      }
-      
-      timer_id = Timeout.add (5000, () =>
-      {
-        timer_id = 0;
-        reload_desktop_files.begin ();
-        return false;
-      });
-    }
-    
-    private async void reload_desktop_files ()
-    {
-      debug ("Reloading desktop files...");
-      all_desktop_files.clear ();
-      non_hidden_desktop_files.clear ();
-      yield load_all_desktop_files ();
-
-      reload_done ();
-    }
-
-    private async void load_desktop_file (File file, string id_prefix)
-    {
-      try
-      {
-        uint8[] file_contents;
-        bool success = yield file.load_contents_async (null, out file_contents,
-                                                       null);
-        if (success)
-        {
-          var keyfile = new KeyFile ();
-          keyfile.load_from_data ((string) file_contents,
-                                  file_contents.length, 0);
-
-          var desktop_id = "%s%s".printf (id_prefix, file.get_basename ());
-          var dfi = new DesktopFileInfo.for_keyfile (file.get_path (),
-                                                     keyfile,
-                                                     desktop_id);
-          if (dfi.is_valid)
-          {
-            all_desktop_files.add (dfi);
-            if (!dfi.is_hidden && session_type in dfi.show_in)
-            {
-              non_hidden_desktop_files.add (dfi);
-            }
-          }
-        }
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-      }
-    }
-    
-    private void create_indices ()
-    {
-      // create mimetype maps
-      mimetype_map =
-        new Gee.HashMap<unowned string, Gee.List<DesktopFileInfo> > ();
-      // and exec map
-      exec_map =
-        new Gee.HashMap<string, Gee.List<DesktopFileInfo> > ();
-      // and desktop id map
-      desktop_id_map =
-        new Gee.HashMap<string, DesktopFileInfo> ();
-
-      Regex exec_re;
-      try
-      {
-        exec_re = new Regex ("%[fFuU]");
-      }
-      catch (Error err)
-      {
-        critical ("%s", err.message);
-        return;
-      }
-
-      foreach (var dfi in all_desktop_files)
-      {
-        string exec = "";
-        try
-        {
-          exec = exec_re.replace_literal (dfi.exec, -1, 0, "");
-        }
-        catch (RegexError err)
-        {
-          Utils.Logger.error (this, "%s", err.message);
-        }
-        exec = exec.strip ();
-        // update exec map
-        Gee.List<DesktopFileInfo>? exec_list = exec_map[exec];
-        if (exec_list == null)
-        {
-          exec_list = new Gee.ArrayList<DesktopFileInfo> ();
-          exec_map[exec] = exec_list;
-        }
-        exec_list.add (dfi);
-
-        // update desktop id map
-        var desktop_id = dfi.desktop_id ?? Path.get_basename (dfi.filename);
-        desktop_id_map[desktop_id] = dfi;
-
-        // update mimetype map
-        if (dfi.is_hidden || dfi.mime_types == null) continue;
-        
-        foreach (unowned string mime_type in dfi.mime_types)
-        {
-          Gee.List<DesktopFileInfo>? list = mimetype_map[mime_type];
-          if (list == null)
-          {
-            list = new Gee.ArrayList<DesktopFileInfo> ();
-            mimetype_map[mime_type] = list;
-          }
-          list.add (dfi);
-        }
-      }
-    }
-
-    private async void load_mime_parents_from_file (string fi)
-    {
-      var file = File.new_for_path (fi);
-      bool exists = yield Utils.query_exists_async (file);
-      if (!exists) return;
-      try
-      {
-        var fis = yield file.read_async (GLib.Priority.DEFAULT);
-        var dis = new DataInputStream (fis);
-        string line = null;
-        string[] mimes = null;
-        int len = 0;
-        // Read lines until end of file (null) is reached
-        do {
-          line = yield dis.read_line_async (GLib.Priority.DEFAULT);
-          if (line == null) break;
-          if (line.has_prefix ("#")) continue; //comment line
-          mimes = line.split (" ");
-          len = (int)GLib.strv_length (mimes);
-          if (len != 2) continue;
-          // cannot be parent of myself!
-          if (mimes[0] == mimes[1]) continue;
-          //debug ("Map %s -> %s", mimes[0], mimes[1]);
-          mimetype_parent_map.set (mimes[0], mimes[1]);
-        } while (true);
-      } catch (GLib.Error err) { /* can't read file */ }
-    }
-    
-    private void add_dfi_for_mime (string mime, Gee.Set<DesktopFileInfo> ret)
-    {
-      var dfis = mimetype_map[mime];
-      if (dfis != null) ret.add_all (dfis);
-
-      var parents = mimetype_parent_map[mime];
-      if (parents == null) return;
-      foreach (string parent in parents)
-        add_dfi_for_mime (parent, ret);
-    }
-
-    // retuns desktop files available on the system (without hidden ones)
-    public Gee.List<DesktopFileInfo> get_desktop_files ()
-    {
-      return non_hidden_desktop_files.read_only_view;
-    }
-    
-    // returns all desktop files available on the system (even the ones which
-    // are hidden by default)
-    public Gee.List<DesktopFileInfo> get_all_desktop_files ()
-    {
-      return all_desktop_files.read_only_view;
-    }
-    
-    public Gee.List<DesktopFileInfo> get_desktop_files_for_type (string mime_type)
-    {
-      var dfi_set = new Gee.HashSet<DesktopFileInfo> ();
-      add_dfi_for_mime (mime_type, dfi_set);
-      var ret = new Gee.ArrayList<DesktopFileInfo> ();
-      ret.add_all (dfi_set);
-      return ret;
-    }
-
-    public Gee.List<DesktopFileInfo> get_desktop_files_for_exec (string exec)
-    {
-      return exec_map[exec] ?? new Gee.ArrayList<DesktopFileInfo> ();
-    }
-    
-    public DesktopFileInfo? get_desktop_file_for_id (string desktop_id)
-    {
-      return desktop_id_map[desktop_id];
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+    errordomain DesktopFileError {
+        UNINTERESTING_ENTRY
+    }
+
+    public class DesktopFileInfo: Object {
+        // registered environments from http://standards.freedesktop.org/menu-spec/latest
+        // (and pantheon)
+        [Flags]
+        public enum EnvironmentType {
+            GNOME     = 1 << 0,
+            KDE       = 1 << 1,
+            LXDE      = 1 << 2,
+            MATE      = 1 << 3,
+            RAZOR     = 1 << 4,
+            ROX       = 1 << 5,
+            TDE       = 1 << 6,
+            UNITY     = 1 << 7,
+            XFCE      = 1 << 8,
+            PANTHEON  = 1 << 9,
+            OLD       = 1 << 10,
+
+            ALL       = 0x3FF
+        }
+
+        public string desktop_id { get; construct set; } 
+        public string name { get; construct set; }
+        public string generic_name { get; construct set; }
+        public string comment { get; set; default = ""; }
+        public string icon_name { get; construct set; default = ""; }
+        public string gettext_domain { get; construct set; }
+
+        public bool needs_terminal { get; set; default = false; }
+        public string filename { get; construct set; }
+
+        public string exec { get; set; }
+
+        public bool is_hidden { get; private set; default = false; }
+        public bool is_valid { get; private set; default = true; }
+
+        public string[] mime_types = null;
+
+        private string? name_folded = null;
+        public unowned string get_name_folded () {
+            if (name_folded == null) {
+                name_folded = name.casefold ();
+            }
+
+            return name_folded;
+        }
+
+        public EnvironmentType show_in { get; set; default = EnvironmentType.ALL; }
+
+        private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
+        private const string GROUP = "Desktop Entry";
+
+        public DesktopFileInfo.for_keyfile (string path, KeyFile keyfile, string desktop_id) {
+            Object (filename: path, desktop_id: desktop_id);
+
+            init_from_keyfile (keyfile);
+        }
+
+        private EnvironmentType parse_environments (string[] environments) {
+            EnvironmentType result = 0;
+            foreach (unowned string env in environments) {
+                string env_up = env.up ();
+                switch (env_up) {
+                    case "GNOME":
+                        result |= EnvironmentType.GNOME;
+                        break;
+                    case "PANTHEON":
+                        result |= EnvironmentType.PANTHEON;
+                        break;
+                    case "KDE":
+                        result |= EnvironmentType.KDE;
+                        break;
+                    case "LXDE":
+                        result |= EnvironmentType.LXDE;
+                        break;
+                    case "MATE":
+                        result |= EnvironmentType.MATE;
+                        break;
+                    case "RAZOR":
+                        result |= EnvironmentType.RAZOR;
+                        break;
+                    case "ROX": result |= EnvironmentType.ROX; break;
+                    case "TDE": result |= EnvironmentType.TDE; break;
+                    case "UNITY": result |= EnvironmentType.UNITY; break;
+                    case "XFCE": result |= EnvironmentType.XFCE; break;
+                    case "OLD": result |= EnvironmentType.OLD; break;
+                    default: warning ("%s is not understood", env); break;
+                }
+            }
+            return result;
+        }
+
+        private void init_from_keyfile (KeyFile keyfile) {
+            try {
+                if (keyfile.get_string (GROUP, "Type") != "Application") {
+                    throw new DesktopFileError.UNINTERESTING_ENTRY ("Not Application-type desktop entry");
+                }
+
+                if (keyfile.has_key (GROUP, "Categories")) {
+                    string[] categories = keyfile.get_string_list (GROUP, "Categories");
+                    if ("Screensaver" in categories) {
+                        throw new DesktopFileError.UNINTERESTING_ENTRY ("Screensaver desktop entry");
+                    }
+                }
+                foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
+                    if (keyfile.has_key (GROUP, domain_key)) {
+                        gettext_domain = keyfile.get_string (GROUP, domain_key);
+                        break;
+                    }
+                }
+
+                DesktopAppInfo app_info;
+                app_info = new DesktopAppInfo.from_keyfile (keyfile);
+
+                if (app_info == null) {
+                    throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to create AppInfo");
+                }
+
+                name = app_info.get_name ();
+                generic_name = app_info.get_generic_name () ?? "";     
+                exec = app_info.get_commandline ();
+                if (exec == null) {
+                    throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
+                }
+
+                // check for hidden desktop files
+                if (keyfile.has_key (GROUP, "Hidden") && keyfile.get_boolean (GROUP, "Hidden")) {
+                    is_hidden = true;
+                }
+                if (keyfile.has_key (GROUP, "NoDisplay") && keyfile.get_boolean (GROUP, "NoDisplay")) {
+                    is_hidden = true;
+                }
+
+                comment = app_info.get_description () ?? "";
+
+                var icon = app_info.get_icon () ??
+                new ThemedIcon ("application-default-icon");
+                icon_name = icon.to_string ();
+
+                if (keyfile.has_key (GROUP, "MimeType")) {
+                    mime_types = keyfile.get_string_list (GROUP, "MimeType");
+                }
+                if (keyfile.has_key (GROUP, "Terminal")) {
+                    needs_terminal = keyfile.get_boolean (GROUP, "Terminal");
+                }
+                if (keyfile.has_key (GROUP, "OnlyShowIn")) {
+                    show_in = parse_environments (keyfile.get_string_list (GROUP, "OnlyShowIn"));
+                } else if (keyfile.has_key (GROUP, "NotShowIn")) {
+                    var not_show = parse_environments (keyfile.get_string_list (GROUP, "NotShowIn"));
+                    show_in = EnvironmentType.ALL ^ not_show;
+                }
+
+                // special case these, people are using them quite often and wonder
+                // why they don't appear
+                if (filename.has_suffix ("gconf-editor.desktop") || filename.has_suffix ("dconf-editor.desktop")) {
+                    is_hidden = false;
+                }
+            } catch (Error err) {
+                Utils.Logger.warning (this, "%s", err.message);
+                is_valid = false;
+            }
+        }
+    }
+
+    public class DesktopFileService : Object {
+        private static unowned DesktopFileService? instance;
+        private Utils.AsyncOnce<bool> init_once;
+
+        // singleton that can be easily destroyed
+        public static DesktopFileService get_default () {
+            return instance ?? new DesktopFileService ();
+        }
+
+        private DesktopFileService () { }
+
+        private Gee.List<FileMonitor> directory_monitors;
+        private Gee.List<DesktopFileInfo> all_desktop_files;
+        private Gee.List<DesktopFileInfo> non_hidden_desktop_files;
+        private Gee.Map<unowned string, Gee.List<DesktopFileInfo> > mimetype_map;
+        private Gee.Map<string, Gee.List<DesktopFileInfo> > exec_map;
+        private Gee.Map<string, DesktopFileInfo> desktop_id_map;
+        private Gee.MultiMap<string, string> mimetype_parent_map;
+
+        construct {
+            instance = this;
+
+            directory_monitors = new Gee.ArrayList<FileMonitor> ();
+            all_desktop_files = new Gee.ArrayList<DesktopFileInfo> ();
+            non_hidden_desktop_files = new Gee.ArrayList<DesktopFileInfo> ();
+            mimetype_parent_map = new Gee.HashMultiMap<string, string> ();
+            init_once = new Utils.AsyncOnce<bool> ();
+
+            initialize.begin ();
+        }
+
+        ~DesktopFileService () {
+            instance = null;
+        }
+
+        public async void initialize () {
+            if (init_once.is_initialized ()) {
+                return;
+            }
+            var is_locked = yield init_once.enter ();
+            if (!is_locked) {
+                return;
+            }
+
+            get_environment_type ();
+            DesktopAppInfo.set_desktop_env (session_type_str);
+
+            Idle.add_full (Priority.LOW, initialize.callback);
+            yield;
+            yield load_all_desktop_files ();
+
+            init_once.leave (true);
+        }
+
+        private DesktopFileInfo.EnvironmentType session_type = DesktopFileInfo.EnvironmentType.GNOME;
+        private string session_type_str = "GNOME";
+
+        public DesktopFileInfo.EnvironmentType get_environment () {
+            return this.session_type;
+        }
+
+        private void get_environment_type () {
+            unowned string? session_var;
+            session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
+            if (session_var == null) {
+                session_var = Environment.get_variable ("DESKTOP_SESSION");
+            }
+
+            if (session_var == null) {
+                return;
+            }
+
+            string session = session_var.down ();
+
+            if (session.has_prefix ("unity") || session.has_prefix ("ubuntu")) {
+                session_type = DesktopFileInfo.EnvironmentType.UNITY;
+                session_type_str = "Unity";
+            } else if (session.has_prefix ("kde")) {
+                session_type = DesktopFileInfo.EnvironmentType.KDE;
+                session_type_str = "KDE";
+            } else if (session.has_prefix ("gnome")) {
+                session_type = DesktopFileInfo.EnvironmentType.GNOME;
+                session_type_str = "GNOME";
+            } else if (session.has_prefix ("lx")) {
+                session_type = DesktopFileInfo.EnvironmentType.LXDE;
+                session_type_str = "LXDE";
+            } else if (session.has_prefix ("xfce")) {
+                session_type = DesktopFileInfo.EnvironmentType.XFCE;
+                session_type_str = "XFCE";
+            } else if (session.has_prefix ("mate")) {
+                session_type = DesktopFileInfo.EnvironmentType.MATE;
+                session_type_str = "MATE";
+            } else if (session.has_prefix ("razor")) {
+                session_type = DesktopFileInfo.EnvironmentType.RAZOR;
+                session_type_str = "Razor";
+            } else if (session.has_prefix ("tde")) {
+                session_type = DesktopFileInfo.EnvironmentType.TDE;
+                session_type_str = "TDE";
+            } else if (session.has_prefix ("rox")) {
+                session_type = DesktopFileInfo.EnvironmentType.ROX;
+                session_type_str = "ROX";
+            } else if (session.has_prefix ("pantheon")) {
+                session_type = DesktopFileInfo.EnvironmentType.PANTHEON;
+                session_type_str = "Pantheon";
+            } else {
+                warning ("Desktop session type is not recognized, assuming GNOME.");
+            }
+        }
+
+        private async void process_directory (File directory, string id_prefix, Gee.Set<File> monitored_dirs) {
+            try {
+                string path = directory.get_path ();
+                // we need to skip menu-xdg directory, see lp:686624
+                if (path != null && path.has_suffix ("menu-xdg")) {
+                    return;
+                }
+                // screensavers don't interest us, skip those
+                if (path != null && path.has_suffix ("/screensavers")) {
+                    return;
+                }
+
+                Utils.Logger.debug (this, "Searching for desktop files in: %s", path);
+                bool exists = yield Utils.query_exists_async (directory);
+                if (!exists) {
+                    return;
+                }
+                /* Check if we already scanned this directory // lp:686624 */
+                foreach (var scanned_dir in monitored_dirs) {
+                    if (path == scanned_dir.get_path ()) {
+                        return;
+                    }
+                }
+                monitored_dirs.add (directory);
+                var enumerator = yield directory.enumerate_children_async (FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE, 0, 0);
+                var files = yield enumerator.next_files_async (1024, 0);
+                foreach (var f in files) {
+                    unowned string name = f.get_name ();
+                    if (f.get_file_type () == FileType.DIRECTORY) {
+                        // FIXME: this could cause too many open files error, or?
+                        var subdir = directory.get_child (name);
+                        var new_prefix = "%s%s-".printf (id_prefix, subdir.get_basename ());
+                        yield process_directory (subdir, new_prefix, monitored_dirs);
+                    } else {
+                        // ignore ourselves
+                        if (name.has_suffix ("synapse.desktop")) {
+                            continue;
+                        }
+                        if (name.has_suffix (".desktop")) {
+                            yield load_desktop_file (directory.get_child (name), id_prefix);
+                        }
+                    }
+                }
+            } catch (Error err) {
+                warning ("%s", err.message);
+            }
+        }
+
+        private async void load_all_desktop_files () {
+            string[] data_dirs = Environment.get_system_data_dirs ();
+            data_dirs += Environment.get_user_data_dir ();
+
+            Gee.Set<File> desktop_file_dirs = new Gee.HashSet<File> ();
+            mimetype_parent_map.clear ();
+
+            foreach (unowned string data_dir in data_dirs) {
+                string dir_path = Path.build_filename (data_dir, "applications", null);
+                var directory = File.new_for_path (dir_path);
+                yield process_directory (directory, "", desktop_file_dirs);
+                dir_path = Path.build_filename (data_dir, "mime", "subclasses");
+                yield load_mime_parents_from_file (dir_path);
+            }
+
+            create_indices ();
+
+            directory_monitors = new Gee.ArrayList<FileMonitor> ();
+            foreach (File d in desktop_file_dirs) {
+                try {
+                    FileMonitor monitor = d.monitor_directory (0, null);
+                    monitor.changed.connect (this.desktop_file_directory_changed);
+                    directory_monitors.add (monitor);
+                } catch (Error err) {
+                    warning ("Unable to monitor directory: %s", err.message);
+                }
+            }
+        }
+
+        private uint timer_id = 0;
+
+        public signal void reload_started ();
+        public signal void reload_done ();
+
+        private void desktop_file_directory_changed () {
+            reload_started ();
+            if (timer_id != 0) {
+                Source.remove (timer_id);
+            }
+
+            timer_id = Timeout.add (5000, () => {
+                timer_id = 0;
+                reload_desktop_files.begin ();
+                return false;
+            });
+        }
+
+        private async void reload_desktop_files () {
+            debug ("Reloading desktop files...");
+            all_desktop_files.clear ();
+            non_hidden_desktop_files.clear ();
+            yield load_all_desktop_files ();
+
+            reload_done ();
+        }
+
+        private async void load_desktop_file (File file, string id_prefix) {
+            try {
+                uint8[] file_contents;
+                bool success = yield file.load_contents_async (null, out file_contents, null);
+                if (success) {
+                    var keyfile = new KeyFile ();
+                    keyfile.load_from_data ((string) file_contents,
+                    file_contents.length, 0);
+
+                    var desktop_id = "%s%s".printf (id_prefix, file.get_basename ());
+                    var dfi = new DesktopFileInfo.for_keyfile (file.get_path (), keyfile, desktop_id);
+                    if (dfi.is_valid) {
+                        all_desktop_files.add (dfi);
+                        if (!dfi.is_hidden && session_type in dfi.show_in) {
+                            non_hidden_desktop_files.add (dfi);
+                        }
+                    }
+                }
+            } catch (Error err) {
+                warning ("%s", err.message);
+            }
+        }
+
+        private void create_indices () {
+            // create mimetype maps
+            mimetype_map = new Gee.HashMap<unowned string, Gee.List<DesktopFileInfo> > ();
+            // and exec map
+            exec_map = new Gee.HashMap<string, Gee.List<DesktopFileInfo> > ();
+            // and desktop id map
+            desktop_id_map = new Gee.HashMap<string, DesktopFileInfo> ();
+
+            Regex exec_re;
+            try {
+            	exec_re = new Regex ("%[fFuU]");
+            } catch (Error err) {
+		        critical ("%s", err.message);
+		        return;
+            }
+
+            foreach (var dfi in all_desktop_files) {
+		        string exec = "";
+		        try {
+		        	exec = exec_re.replace_literal (dfi.exec, -1, 0, "");
+		        } catch (RegexError err) {
+		        	Utils.Logger.error (this, "%s", err.message);
+		        }
+		        exec = exec.strip ();
+		        // update exec map
+		        Gee.List<DesktopFileInfo>? exec_list = exec_map[exec];
+		        if (exec_list == null) {
+				    exec_list = new Gee.ArrayList<DesktopFileInfo> ();
+				    exec_map[exec] = exec_list;
+		        }
+		        exec_list.add (dfi);
+
+		        // update desktop id map
+		        var desktop_id = dfi.desktop_id ?? Path.get_basename (dfi.filename);
+		        desktop_id_map[desktop_id] = dfi;
+
+		        // update mimetype map
+		        if (dfi.is_hidden || dfi.mime_types == null) {
+					continue;
+				}
+
+		        foreach (unowned string mime_type in dfi.mime_types) {
+		            Gee.List<DesktopFileInfo>? list = mimetype_map[mime_type];
+		            if (list == null) {
+		                list = new Gee.ArrayList<DesktopFileInfo> ();
+		                mimetype_map[mime_type] = list;
+		            }
+		            list.add (dfi);
+		        }
+            }
+        }
+
+        private async void load_mime_parents_from_file (string fi) {
+            var file = File.new_for_path (fi);
+            bool exists = yield Utils.query_exists_async (file);
+            if (!exists) {
+                return;
+            }
+
+            try {
+                var fis = yield file.read_async (GLib.Priority.DEFAULT);
+                var dis = new DataInputStream (fis);
+                string line = null;
+                string[] mimes = null;
+                int len = 0;
+                // Read lines until end of file (null) is reached
+                do {
+                    line = yield dis.read_line_async (GLib.Priority.DEFAULT);
+                    if (line == null) {
+                        break;
+                    }
+                    if (line.has_prefix ("#")) {
+                        continue; //comment line
+                    }
+                    mimes = line.split (" ");
+                    len = (int)GLib.strv_length (mimes);
+                    if (len != 2) {
+                        continue;
+                    }
+                    // cannot be parent of myself!
+                    if (mimes[0] == mimes[1]) {
+                        continue;
+                    }
+                    //debug ("Map %s -> %s", mimes[0], mimes[1]);
+                    mimetype_parent_map.set (mimes[0], mimes[1]);
+                } while (true);
+            } catch (GLib.Error err) {
+                warning ("Can't read file.");
+            }
+        }
+
+        private void add_dfi_for_mime (string mime, Gee.Set<DesktopFileInfo> ret) {
+            var dfis = mimetype_map[mime];
+            if (dfis != null) {
+                ret.add_all (dfis);
+            }
+
+            var parents = mimetype_parent_map[mime];
+            if (parents == null) {
+                return;
+            }
+            foreach (string parent in parents) {
+                add_dfi_for_mime (parent, ret);
+            }
+        }
+
+        // retuns desktop files available on the system (without hidden ones)
+        public Gee.List<DesktopFileInfo> get_desktop_files () {
+            return non_hidden_desktop_files.read_only_view;
+        }
+
+        // returns all desktop files available on the system (even the ones which
+        // are hidden by default)
+        public Gee.List<DesktopFileInfo> get_all_desktop_files () {
+            return all_desktop_files.read_only_view;
+        }
+
+        public Gee.List<DesktopFileInfo> get_desktop_files_for_type (string mime_type) {
+            var dfi_set = new Gee.HashSet<DesktopFileInfo> ();
+            add_dfi_for_mime (mime_type, dfi_set);
+            var ret = new Gee.ArrayList<DesktopFileInfo> ();
+            ret.add_all (dfi_set);
+            return ret;
+        }
+
+        public Gee.List<DesktopFileInfo> get_desktop_files_for_exec (string exec) {
+            return exec_map[exec] ?? new Gee.ArrayList<DesktopFileInfo> ();
+        }
+
+        public DesktopFileInfo? get_desktop_file_for_id (string desktop_id) {
+            return desktop_id_map[desktop_id];
+        }
+    }
 }

=== modified file 'lib/synapse-core/match.vala'
--- lib/synapse-core/match.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/match.vala	2017-01-26 19:54:51 +0000
@@ -1,144 +1,133 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *             Alberto Aldegheri <[e-mail]>
- */
-
-namespace Synapse
-{
-  public enum MatchType
-  {
-    UNKNOWN = 0,
-    TEXT,
-    APPLICATION,
-    GENERIC_URI,
-    ACTION,
-    SEARCH,
-    CONTACT
-  }
-
-  public interface Match: Object
-  {
-    public enum Score
-    {
-      INCREMENT_MINOR = 2000,
-      INCREMENT_SMALL = 5000,
-      INCREMENT_MEDIUM = 10000,
-      INCREMENT_LARGE = 20000,
-      URI_PENALTY = 15000,
-
-      POOR = 50000,
-      BELOW_AVERAGE = 60000,
-      AVERAGE = 70000,
-      ABOVE_AVERAGE = 75000,
-      GOOD = 80000,
-      VERY_GOOD = 85000,
-      EXCELLENT = 90000,
-
-      HIGHEST = 100000
-    }
-    
-    // properties
-    public abstract string title { get; construct set; }
-    public abstract string description { get; set; }
-    public abstract string icon_name { get; construct set; }
-    public abstract bool has_thumbnail { get; construct set; }
-    public abstract string thumbnail_path { get; construct set; }
-    public abstract MatchType match_type { get; construct set; }
-
-    public virtual void execute (Match? match)
-    {
-      Utils.Logger.error (this, "execute () is not implemented");
-    }
-    
-    public virtual void execute_with_target (Match? source, Match? target = null)
-    {
-      if (target == null) execute (source);
-      else Utils.Logger.error (this, "execute () is not implemented");
-    }
-    
-    public virtual bool needs_target () {
-      return false;
-    }
-    
-    public virtual QueryFlags target_flags ()
-    {
-      return QueryFlags.ALL;
-    }
-    
-    public signal void executed ();
-  }
-  
-  public interface ApplicationMatch: Match
-  {
-    public abstract AppInfo? app_info { get; set; }
-    public abstract bool needs_terminal { get; set; }
-    public abstract string? filename { get; construct set; }
-  }
-
-  public interface UriMatch: Match
-  {
-    public abstract string uri { get; set; }
-    public abstract QueryFlags file_type { get; set; }
-    public abstract string mime_type { get; set; }
-  }
-  
-  public interface ContactMatch: Match
-  {
-    public abstract void send_message (string message, bool present);
-    public abstract void open_chat ();
-  }
-
-  public interface ExtendedInfo: Match
-  {
-    public abstract string? extended_info { get; set; }
-  }
-  
-  public enum TextOrigin
-  {
-    UNKNOWN,
-    CLIPBOARD
-  }
-  
-  public interface TextMatch: Match
-  {
-    public abstract TextOrigin text_origin { get; set; }
-    public abstract string get_text ();
-  }
-  
-  public interface SearchMatch: Match, SearchProvider
-  {
-    public abstract Match search_source { get; set; }
-  }
-
-  public class DefaultMatch: Object, Match
-  {
-    public string title { get; construct set; }
-    public string description { get; set; }
-    public string icon_name { get; construct set; }
-    public bool has_thumbnail { get; construct set; }
-    public string thumbnail_path { get; construct set; }
-    public MatchType match_type { get; construct set; }
-    
-    public DefaultMatch (string query_string)
-    {
-      Object (title: query_string, description: "", has_thumbnail: false,
-              icon_name: "unknown", match_type: MatchType.UNKNOWN);
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*              Alberto Aldegheri <[e-mail]>
+*/
+
+namespace Synapse {
+    public enum MatchType {
+        UNKNOWN = 0,
+        TEXT,
+        APPLICATION,
+        GENERIC_URI,
+        ACTION,
+        SEARCH,
+        CONTACT
+    }
+
+    public interface Match: Object {
+        public enum Score {
+            INCREMENT_MINOR = 2000,
+            INCREMENT_SMALL = 5000,
+            INCREMENT_MEDIUM = 10000,
+            INCREMENT_LARGE = 20000,
+            URI_PENALTY = 15000,
+
+            POOR = 50000,
+            BELOW_AVERAGE = 60000,
+            AVERAGE = 70000,
+            ABOVE_AVERAGE = 75000,
+            GOOD = 80000,
+            VERY_GOOD = 85000,
+            EXCELLENT = 90000,
+
+            HIGHEST = 100000
+        }
+
+        // properties
+        public abstract string title { get; construct set; }
+        public abstract string description { get; set; }
+        public abstract string icon_name { get; construct set; }
+        public abstract bool has_thumbnail { get; construct set; }
+        public abstract string thumbnail_path { get; construct set; }
+        public abstract MatchType match_type { get; construct set; }
+
+        public virtual void execute (Match? match) {
+            Utils.Logger.error (this, "execute () is not implemented");
+        }
+
+        public virtual void execute_with_target (Match? source, Match? target = null) {
+            if (target == null) {
+                execute (source);
+            } else {
+                Utils.Logger.error (this, "execute () is not implemented");
+            }
+        }
+
+        public virtual bool needs_target () {
+            return false;
+        }
+
+        public virtual QueryFlags target_flags () {
+            return QueryFlags.ALL;
+        }
+
+        public signal void executed ();
+    }
+
+    public interface ApplicationMatch: Match {
+        public abstract AppInfo? app_info { get; set; }
+        public abstract bool needs_terminal { get; set; }
+        public abstract string? filename { get; construct set; }
+    }
+
+    public interface UriMatch: Match {
+        public abstract string uri { get; set; }
+        public abstract QueryFlags file_type { get; set; }
+        public abstract string mime_type { get; set; }
+    }
+
+    public interface ContactMatch: Match {
+        public abstract void send_message (string message, bool present);
+        public abstract void open_chat ();
+    }
+
+    public interface ExtendedInfo: Match {
+        public abstract string? extended_info { get; set; }
+    }
+
+    public enum TextOrigin {
+        UNKNOWN,
+        CLIPBOARD
+    }
+
+    public interface TextMatch: Match {
+        public abstract TextOrigin text_origin { get; set; }
+        public abstract string get_text ();
+    }
+
+    public interface SearchMatch: Match, SearchProvider {
+        public abstract Match search_source { get; set; }
+    }
+
+    public class DefaultMatch: Object, Match {
+        public string title { get; construct set; }
+        public string description { get; set; }
+        public string icon_name { get; construct set; }
+        public bool has_thumbnail { get; construct set; }
+        public string thumbnail_path { get; construct set; }
+        public MatchType match_type { get; construct set; }
+
+        public DefaultMatch (string query_string) {
+            Object (title: query_string, description: "", has_thumbnail: false,
+                    icon_name: "unknown", match_type: MatchType.UNKNOWN);
+        }
+    }
 }
-

=== modified file 'lib/synapse-core/plugin.vala'
--- lib/synapse-core/plugin.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/plugin.vala	2017-01-26 19:54:51 +0000
@@ -1,59 +1,53 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  public interface Activatable : Object
-  {
-    // this property will eventually go away
-    public abstract bool enabled { get; set; default = true; }
-
-    public abstract void activate ();
-    public abstract void deactivate ();
-  }
-
-  public interface Configurable : Object
-  {
-    public abstract Gtk.Widget create_config_widget ();
-  }
-
-  public interface ItemProvider : Activatable
-  {
-    public abstract async ResultSet? search (Query query) throws SearchError;
-    public virtual bool handles_query (Query query)
-    {
-      return true;
-    }
-    public virtual bool handles_empty_query ()
-    {
-      return false;
-    }
-  }
-
-  public interface ActionProvider : Activatable
-  {
-    public abstract ResultSet? find_for_match (ref Query query, Match match);
-    public virtual bool handles_unknown ()
-    {
-      return false;
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+	public interface Activatable : Object {
+		// this property will eventually go away
+		public abstract bool enabled { get; set; default = true; }
+
+		public abstract void activate ();
+		public abstract void deactivate ();
+	}
+
+	public interface Configurable : Object {
+		public abstract Gtk.Widget create_config_widget ();
+	}
+
+	public interface ItemProvider : Activatable {
+		public abstract async ResultSet? search (Query query) throws SearchError;
+		public virtual bool handles_query (Query query) {
+			return true;
+		}
+
+		public virtual bool handles_empty_query () {
+			return false;
+		}
+	}
+
+	public interface ActionProvider : Activatable {
+		public abstract ResultSet? find_for_match (ref Query query, Match match);
+		public virtual bool handles_unknown () {
+			return false;
+		}
+	}
 }
-

=== modified file 'lib/synapse-core/query.vala'
--- lib/synapse-core/query.vala	2014-06-04 19:35:44 +0000
+++ lib/synapse-core/query.vala	2017-01-26 19:54:51 +0000
@@ -1,296 +1,231 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  [Flags]
-  public enum QueryFlags
-  {
-    /* HowTo create categories (32bit).
-     * Authored by Alberto Aldegheri <[e-mail]>
-     * Categories are "stored" in 3 Levels:
-     *  Super-Category
-     *  -> Category
-     *  ----> Sub-Category
-     * ------------------------------------
-     * if (Super-Category does NOT have childs):
-     *    SUPER = 1 << FreeBitPosition
-     * else:
-     *    if (Category does NOT have childs)
-     *      CATEGORY = 1 << FreeBitPosition
-     *    else
-     *      SUB = 1 << FreeBitPosition
-     *      CATEGORY = OR ([subcategories, ...]);
-     *
-     *    SUPER = OR ([categories, ...]);
-     *
-     *
-     * Remember: 
-     *   if you add or remove a category, 
-     *   change labels in UIInterface.CategoryConfig.init_labels
-     *
-     */
-    INCLUDE_REMOTE  = 1 << 0,
-    UNCATEGORIZED   = 1 << 1,
-
-    APPLICATIONS    = 1 << 2,
-    
-    ACTIONS         = 1 << 3,
-    
-      AUDIO           = 1 << 4,
-      VIDEO           = 1 << 5,
-      DOCUMENTS       = 1 << 6,
-      IMAGES          = 1 << 7,
-    FILES           = AUDIO | VIDEO | DOCUMENTS | IMAGES,
-    
-    PLACES          = 1 << 8,
-
-    // FIXME: shouldn't this be FILES | INCLUDE_REMOTE?
-    INTERNET        = 1 << 9,
-    
-    // FIXME: Text Query flag? kinda weird, why do we have this here?
-    TEXT            = 1 << 10,
-    
-    CONTACTS        = 1 << 11,
-
-    ALL           = 0xFFFFFFFF,
-    LOCAL_CONTENT = ALL ^ QueryFlags.INCLUDE_REMOTE
-  }
-  
-  [Flags]
-  public enum MatcherFlags
-  {
-    NO_REVERSED   = 1 << 0,
-    NO_SUBSTRING  = 1 << 1,
-    NO_PARTIAL    = 1 << 2,
-    NO_FUZZY      = 1 << 3
-  }
-
-  public struct Query
-  {
-    string query_string;
-    string query_string_folded;
-    Cancellable cancellable;
-    QueryFlags query_type;
-    uint max_results;
-    uint query_id;
-
-    public Query (uint query_id,
-                  string query,
-                  QueryFlags flags = QueryFlags.LOCAL_CONTENT,
-                  uint num_results = 96)
-    {
-      this.query_id = query_id;
-      this.query_string = query;
-      this.query_string_folded = query.casefold ();
-      this.query_type = flags;
-      this.max_results = num_results;
-    }
-
-    public bool is_cancelled ()
-    {
-      return cancellable.is_cancelled ();
-    }
-
-    public void check_cancellable () throws SearchError
-    {
-      if (cancellable.is_cancelled ())
-      {
-        throw new SearchError.SEARCH_CANCELLED ("Cancelled");
-      }
-    }
-
-    public static Gee.List<Gee.Map.Entry<Regex, int>>
-    get_matchers_for_query (string query,
-                            MatcherFlags match_flags = 0,
-                            RegexCompileFlags flags = GLib.RegexCompileFlags.OPTIMIZE)
-    {
-      /* create a couple of regexes and try to help with matching
-       * match with these regular expressions (with descending score):
-       * 1) ^query$
-       * 2) ^query
-       * 3) \bquery
-       * 4) split to words and seach \bword1.+\bword2 (if there are 2+ words)
-       * 5) query
-       * 6) split to characters and search \bq.+\bu.+\be.+\br.+\by
-       * 7) split to characters and search \bq.*u.*e.*r.*y
-       *
-       * The set of returned regular expressions depends on MatcherFlags.
-       */
-
-      var results = new Gee.HashMap<Regex, int> ();
-      Regex re;
-
-      try
-      {
-        re = new Regex ("^(%s)$".printf (Regex.escape_string (query)), flags);
-        results[re] = Match.Score.HIGHEST;
-      }
-      catch (RegexError err)
-      {
-      }
-
-      try
-      {
-        re = new Regex ("^(%s)".printf (Regex.escape_string (query)), flags);
-        results[re] = Match.Score.EXCELLENT;
-      }
-      catch (RegexError err)
-      {
-      }
-
-      try
-      {
-        re = new Regex ("\\b(%s)".printf (Regex.escape_string (query)), flags);
-        results[re] = Match.Score.VERY_GOOD;
-      }
-      catch (RegexError err)
-      {
-      }
-
-      // split to individual chars
-      string[] individual_words = Regex.split_simple ("\\s+", query.strip ());
-      if (individual_words.length >= 2)
-      {
-        string[] escaped_words = {};
-        foreach (unowned string word in individual_words)
-        {
-          escaped_words += Regex.escape_string (word);
-        }
-        string pattern = "\\b(%s)".printf (string.joinv (").+\\b(",
-                                                         escaped_words));
-
-        try
-        {
-          re = new Regex (pattern, flags);
-          results[re] = Match.Score.GOOD;
-        }
-        catch (RegexError err)
-        {
-        }
-
-        // FIXME: do something generic here
-        if (!(MatcherFlags.NO_REVERSED in match_flags))
-        {
-          if (escaped_words.length == 2)
-          {
-            var reversed = "\\b(%s)".printf (string.join (").+\\b(",
-                                                        escaped_words[1],
-                                                        escaped_words[0],
-                                                        null));
-            try
-            {
-              re = new Regex (reversed, flags);
-              results[re] = Match.Score.GOOD - Match.Score.INCREMENT_MINOR;
-            }
-            catch (RegexError err)
-            {
-            }
-          }
-          else
-          {
-            // not too nice, but is quite fast to compute
-            var orred = "\\b((?:%s))".printf (string.joinv (")|(?:", escaped_words));
-            var any_order = "";
-            for (int i=0; i<escaped_words.length; i++)
-            {
-              bool is_last = i == escaped_words.length - 1;
-              any_order += orred;
-              if (!is_last) any_order += ".+";
-            }
-            try
-            {
-              re = new Regex (any_order, flags);
-              results[re] = Match.Score.AVERAGE + Match.Score.INCREMENT_MINOR;
-            }
-            catch (RegexError err)
-            {
-            }
-          }
-        }
-      }
-      
-      if (!(MatcherFlags.NO_SUBSTRING in match_flags))
-      {
-        try
-        {
-          re = new Regex ("(%s)".printf (Regex.escape_string (query)), flags);
-          results[re] = Match.Score.BELOW_AVERAGE;
-        }
-        catch (RegexError err)
-        {
-        }
-      }
-
-      // split to individual characters
-      string[] individual_chars = Regex.split_simple ("\\s*", query);
-      string[] escaped_chars = {};
-      foreach (unowned string word in individual_chars)
-      {
-        escaped_chars += Regex.escape_string (word);
-      }
-
-      // make  "aj" match "Activity Journal"
-      if (!(MatcherFlags.NO_PARTIAL in match_flags) &&
-          individual_words.length == 1 && individual_chars.length <= 5)
-      {
-        string pattern = "\\b(%s)".printf (string.joinv (").+\\b(",
-                                                         escaped_chars));
-        try
-        {
-          re = new Regex (pattern, flags);
-          results[re] = Match.Score.ABOVE_AVERAGE;
-        }
-        catch (RegexError err)
-        {
-        }
-      }
-
-      if (!(MatcherFlags.NO_FUZZY in match_flags) && escaped_chars.length > 0)
-      {
-        string pattern = "\\b(%s)".printf (string.joinv (").*(",
-                                                         escaped_chars));
-        try
-        {
-          re = new Regex (pattern, flags);
-          results[re] = Match.Score.POOR;
-        }
-        catch (RegexError err)
-        {
-        }
-      }
-
-      var sorted_results = new Gee.ArrayList<Gee.Map.Entry<Regex, int>> ();
-      var entries = results.entries;
-      // FIXME: why it doesn't work without this?
-      sorted_results.set_data ("entries-ref", entries);
-      sorted_results.add_all (entries);
-      sorted_results.sort ((a, b) =>
-      {
-        unowned Gee.Map.Entry<Regex, int> e1 = (Gee.Map.Entry<Regex, int>) a;
-        unowned Gee.Map.Entry<Regex, int> e2 = (Gee.Map.Entry<Regex, int>) b;
-        return e2.value - e1.value;
-      });
-
-      return sorted_results;
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+	[Flags]
+	public enum QueryFlags {
+		/* HowTo create categories (32bit).
+		* Authored by Alberto Aldegheri <[e-mail]>
+		* Categories are "stored" in 3 Levels:
+		*  Super-Category
+		*  -> Category
+		*  ----> Sub-Category
+		* ------------------------------------
+		* if (Super-Category does NOT have childs):
+		*    SUPER = 1 << FreeBitPosition
+		* else:
+		*    if (Category does NOT have childs)
+		*      CATEGORY = 1 << FreeBitPosition
+		*    else
+		*      SUB = 1 << FreeBitPosition
+		*      CATEGORY = OR ([subcategories, ...]);
+		*
+		*    SUPER = OR ([categories, ...]);
+		*
+		*
+		* Remember: 
+		*   if you add or remove a category, 
+		*   change labels in UIInterface.CategoryConfig.init_labels
+		*
+		*/
+		INCLUDE_REMOTE  = 1 << 0,
+		UNCATEGORIZED   = 1 << 1,
+
+		APPLICATIONS    = 1 << 2,
+
+		ACTIONS         = 1 << 3,
+
+		AUDIO           = 1 << 4,
+		VIDEO           = 1 << 5,
+		DOCUMENTS       = 1 << 6,
+		IMAGES          = 1 << 7,
+		FILES           = AUDIO | VIDEO | DOCUMENTS | IMAGES,
+
+		PLACES          = 1 << 8,
+
+		// FIXME: shouldn't this be FILES | INCLUDE_REMOTE?
+		INTERNET        = 1 << 9,
+
+		// FIXME: Text Query flag? kinda weird, why do we have this here?
+		TEXT            = 1 << 10,
+
+		CONTACTS        = 1 << 11,
+
+		ALL           = 0xFFFFFFFF,
+		LOCAL_CONTENT = ALL ^ QueryFlags.INCLUDE_REMOTE
+	}
+
+	[Flags]
+	public enum MatcherFlags {
+		NO_REVERSED   = 1 << 0,
+		NO_SUBSTRING  = 1 << 1,
+		NO_PARTIAL    = 1 << 2,
+		NO_FUZZY      = 1 << 3
+	}
+
+	public struct Query {
+		string query_string;
+		string query_string_folded;
+		Cancellable cancellable;
+		QueryFlags query_type;
+		uint max_results;
+		uint query_id;
+
+		public Query (uint query_id, string query, QueryFlags flags = QueryFlags.LOCAL_CONTENT, uint num_results = 96) {
+			this.query_id = query_id;
+			this.query_string = query;
+			this.query_string_folded = query.casefold ();
+			this.query_type = flags;
+			this.max_results = num_results;
+		}
+
+		public bool is_cancelled () {
+			return cancellable.is_cancelled ();
+		}
+
+		public void check_cancellable () throws SearchError {
+			if (cancellable.is_cancelled ()) {
+				throw new SearchError.SEARCH_CANCELLED ("Cancelled");
+			}
+		}
+
+		public static Gee.List<Gee.Map.Entry<Regex, int>> get_matchers_for_query (string query, MatcherFlags match_flags = 0, RegexCompileFlags flags = GLib.RegexCompileFlags.OPTIMIZE) {
+			/* create a couple of regexes and try to help with matching
+			* match with these regular expressions (with descending score):
+			* 1) ^query$
+			* 2) ^query
+			* 3) \bquery
+			* 4) split to words and seach \bword1.+\bword2 (if there are 2+ words)
+			* 5) query
+			* 6) split to characters and search \bq.+\bu.+\be.+\br.+\by
+			* 7) split to characters and search \bq.*u.*e.*r.*y
+			*
+			* The set of returned regular expressions depends on MatcherFlags.
+			*/
+
+			var results = new Gee.HashMap<Regex, int> ();
+			Regex re;
+
+			try {
+				re = new Regex ("^(%s)$".printf (Regex.escape_string (query)), flags);
+				results[re] = Match.Score.HIGHEST;
+			} catch (RegexError err) { }
+
+			try {
+				re = new Regex ("^(%s)".printf (Regex.escape_string (query)), flags);
+				results[re] = Match.Score.EXCELLENT;
+			} catch (RegexError err) { }
+
+			try {
+				re = new Regex ("\\b(%s)".printf (Regex.escape_string (query)), flags);
+				results[re] = Match.Score.VERY_GOOD;
+			} catch (RegexError err) { }
+
+			// split to individual chars
+			string[] individual_words = Regex.split_simple ("\\s+", query.strip ());
+			if (individual_words.length >= 2) {
+				string[] escaped_words = {};
+				foreach (unowned string word in individual_words) {
+					escaped_words += Regex.escape_string (word);
+				}
+				string pattern = "\\b(%s)".printf (string.joinv (").+\\b(", escaped_words));
+
+				try {
+					re = new Regex (pattern, flags);
+					results[re] = Match.Score.GOOD;
+				} catch (RegexError err) { }
+
+				// FIXME: do something generic here
+				if (!(MatcherFlags.NO_REVERSED in match_flags)) {
+					if (escaped_words.length == 2) {
+						var reversed = "\\b(%s)".printf (string.join (").+\\b(", escaped_words[1], escaped_words[0], null));
+						try {
+							re = new Regex (reversed, flags);
+							results[re] = Match.Score.GOOD - Match.Score.INCREMENT_MINOR;
+						} catch (RegexError err) { }
+					} else {
+						// not too nice, but is quite fast to compute
+						var orred = "\\b((?:%s))".printf (string.joinv (")|(?:", escaped_words));
+						var any_order = "";
+						for (int i=0; i<escaped_words.length; i++) {
+							bool is_last = i == escaped_words.length - 1;
+							any_order += orred;
+							if (!is_last) {
+								any_order += ".+";
+							}
+						}
+						try {
+							re = new Regex (any_order, flags);
+							results[re] = Match.Score.AVERAGE + Match.Score.INCREMENT_MINOR;
+						} catch (RegexError err) { }
+					}
+				}
+			}
+
+			if (!(MatcherFlags.NO_SUBSTRING in match_flags)) {
+				try {
+					re = new Regex ("(%s)".printf (Regex.escape_string (query)), flags);
+					results[re] = Match.Score.BELOW_AVERAGE;
+				} catch (RegexError err) { }
+			}
+
+			// split to individual characters
+			string[] individual_chars = Regex.split_simple ("\\s*", query);
+			string[] escaped_chars = {};
+			foreach (unowned string word in individual_chars) {
+				escaped_chars += Regex.escape_string (word);
+			}
+
+			// make  "aj" match "Activity Journal"
+			if (!(MatcherFlags.NO_PARTIAL in match_flags) && individual_words.length == 1 && individual_chars.length <= 5) {
+				string pattern = "\\b(%s)".printf (string.joinv (").+\\b(", escaped_chars));
+
+				try {
+					re = new Regex (pattern, flags);
+					results[re] = Match.Score.ABOVE_AVERAGE;
+				} catch (RegexError err) { }
+			}
+
+			if (!(MatcherFlags.NO_FUZZY in match_flags) && escaped_chars.length > 0) {
+				string pattern = "\\b(%s)".printf (string.joinv (").*(", escaped_chars));
+
+				try {
+					re = new Regex (pattern, flags);
+					results[re] = Match.Score.POOR;
+				} catch (RegexError err) { }
+			}
+
+			var sorted_results = new Gee.ArrayList<Gee.Map.Entry<Regex, int>> ();
+			var entries = results.entries;
+			// FIXME: why it doesn't work without this?
+			sorted_results.set_data ("entries-ref", entries);
+			sorted_results.add_all (entries);
+			sorted_results.sort ((a, b) => {
+				unowned Gee.Map.Entry<Regex, int> e1 = (Gee.Map.Entry<Regex, int>) a;
+				unowned Gee.Map.Entry<Regex, int> e2 = (Gee.Map.Entry<Regex, int>) b;
+				return e2.value - e1.value;
+			});
+
+			return sorted_results;
+		}
+	}
 }
-

=== modified file 'lib/synapse-core/relevancy-backend-zg.vala'
--- lib/synapse-core/relevancy-backend-zg.vala	2014-07-03 06:38:42 +0000
+++ lib/synapse-core/relevancy-backend-zg.vala	2017-01-26 19:54:51 +0000
@@ -1,313 +1,288 @@
 /*
- * Copyright (C) 2010 Michal Hruby <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Michal Hruby <[e-mail]>
- *
- */
-
-namespace Synapse
-{
-  private class ZeitgeistRelevancyBackend: Object, RelevancyBackend
-  {
-    private Zeitgeist.Log zg_log;
-    private Zeitgeist.DataSourceRegistry zg_dsr;
-    private Gee.Map<string, int> application_popularity;
-    private Gee.Map<string, int> uri_popularity;
-    private bool has_datahub_gio_module = false;
-
-    private const float MULTIPLIER = 65535.0f;
-
-    construct
-    {
-      zg_log = new Zeitgeist.Log ();
-      application_popularity = new Gee.HashMap<string, int> ();
-      uri_popularity = new Gee.HashMap<string, int> ();
-
-      refresh_popularity ();
-      check_data_sources.begin ();
-
-      Timeout.add_seconds (60*30, refresh_popularity);
-    }
-
-    private async void check_data_sources ()
-    {
-      zg_dsr = new Zeitgeist.DataSourceRegistry ();
-      try
-      {
-        var array = yield zg_dsr.get_data_sources (null);
-
-        array.foreach ((ds) => {
-          if (ds.unique_id == "com.zeitgeist-project,datahub,gio-launch-listener"
-              && ds.enabled)
-          {
-            has_datahub_gio_module = true;
-            return;
-          }
-        });
-      }
-      catch (Error err)
-      {
-        warning ("Unable to check Zeitgeist data sources: %s", err.message);
-      }
-    }
-
-    private bool refresh_popularity ()
-    {
-      load_application_relevancies.begin ();
-      load_uri_relevancies.begin ();
-      return true;
-    }
-
-    private async void load_application_relevancies ()
-    {
-      Idle.add (load_application_relevancies.callback, Priority.LOW);
-      yield;
-
-      int64 end = new DateTime.now_local ().to_unix () * 1000;
-      int64 start = end - Zeitgeist.Timestamp.WEEK * 4;
-      Zeitgeist.TimeRange tr = new Zeitgeist.TimeRange (start, end);
-
-      var event = new Zeitgeist.Event ();
-      event.interpretation = "!" + Zeitgeist.ZG.LEAVE_EVENT;
-      var subject = new Zeitgeist.Subject ();
-      subject.interpretation = Zeitgeist.NFO.SOFTWARE;
-      subject.uri = "application://*";
-      event.add_subject (subject);
-
-      var array = new GenericArray<Zeitgeist.Event> ();
-      array.add (event);
-
-      Zeitgeist.ResultSet rs;
-
-      try
-      {
-        rs = yield zg_log.find_events (tr, array,
-                                       Zeitgeist.StorageState.ANY,
-                                       256,
-                                       Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
-                                       null);
-
-        application_popularity.clear ();
-        uint size = rs.size ();
-        uint index = 0;
-
-        // Zeitgeist (0.6) doesn't have any stats API, so let's approximate
-
-        foreach (Zeitgeist.Event e in rs)
-        {
-          if (e.num_subjects () <= 0) continue;
-          Zeitgeist.Subject s = e.subjects[0];
-
-          float power = index / (size * 2) + 0.5f; // linearly <0.5, 1.0>
-          float relevancy = 1.0f / Math.powf (index + 1, power);
-          application_popularity[s.uri] = (int)(relevancy * MULTIPLIER);
-
-          index++;
-        }
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-        return;
-      }
-    }
-
-    private async void load_uri_relevancies ()
-    {
-      Idle.add (load_uri_relevancies.callback, Priority.LOW);
-      yield;
-
-      int64 end = new DateTime.now_local ().to_unix () * 1000;
-      int64 start = end - Zeitgeist.Timestamp.WEEK * 4;
-      Zeitgeist.TimeRange tr = new Zeitgeist.TimeRange (start, end);
-
-      var event = new Zeitgeist.Event ();
-      event.interpretation = "!" + Zeitgeist.ZG.LEAVE_EVENT;
-      var subject = new Zeitgeist.Subject ();
-      subject.interpretation = "!" + Zeitgeist.NFO.SOFTWARE;
-      subject.uri = "file://*";
-      event.add_subject (subject);
-
-      var array = new GenericArray<Zeitgeist.Event> ();
-      array.add (event);
-
-      Zeitgeist.ResultSet rs;
-      Gee.Map<string, int> popularity_map = new Gee.HashMap<string, int> ();
-
-      try
-      {
-        uint size, index;
-        float power, relevancy;
-        /* Get popularity for file uris */
-        rs = yield zg_log.find_events (tr, array,
-                                       Zeitgeist.StorageState.ANY,
-                                       256,
-                                       Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
-                                       null);
-
-        size = rs.size ();
-        index = 0;
-
-        // Zeitgeist (0.6) doesn't have any stats API, so let's approximate
-
-        foreach (Zeitgeist.Event e1 in rs)
-        {
-          if (e1.num_subjects () <= 0) continue;
-          Zeitgeist.Subject s1 = e1.subjects[0];
-
-          power = index / (size * 2) + 0.5f; // linearly <0.5, 1.0>
-          relevancy = 1.0f / Math.powf (index + 1, power);
-          popularity_map[s1.uri] = (int)(relevancy * MULTIPLIER);
-
-          index++;
-        }
-        
-        /* Get popularity for web uris */
-        subject.interpretation = Zeitgeist.NFO.WEBSITE;
-        subject.uri = "";
-        array = new GenericArray<Zeitgeist.Event> ();
-        array.add (event);
-
-        rs = yield zg_log.find_events (tr, array,
-                                       Zeitgeist.StorageState.ANY,
-                                       128,
-                                       Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
-                                       null);
-
-        size = rs.size ();
-        index = 0;
-
-        // Zeitgeist (0.6) doesn't have any stats API, so let's approximate
-
-        foreach (Zeitgeist.Event e2 in rs)
-        {
-          if (e2.num_subjects () <= 0) continue;
-          Zeitgeist.Subject s2 = e2.subjects[0];
-
-          power = index / (size * 2) + 0.5f; // linearly <0.5, 1.0>
-          relevancy = 1.0f / Math.powf (index + 1, power);
-          popularity_map[s2.uri] = (int)(relevancy * MULTIPLIER);
-
-          index++;
-        }
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-      }
-
-      uri_popularity = popularity_map;
-    }
-    
-    public float get_application_popularity (string desktop_id)
-    {
-      if (application_popularity.has_key (desktop_id))
-      {
-        return application_popularity[desktop_id] / MULTIPLIER;
-      }
-
-      return 0.0f;
-    }
-    
-    public float get_uri_popularity (string uri)
-    {
-      if (uri_popularity.has_key (uri))
-      {
-        return uri_popularity[uri] / MULTIPLIER;
-      }
-
-      return 0.0f;
-    }
-    
-    private void reload_relevancies ()
-    {
-      Idle.add_full (Priority.LOW, () =>
-      {
-        load_application_relevancies.begin ();
-        return false;
-      });
-    }
-    
-    public void application_launched (AppInfo app_info)
-    {
-      // FIXME: get rid of this maverick-specific workaround
-      // detect if the Zeitgeist GIO module is installed
-      Type zg_gio_module = Type.from_name ("GAppLaunchHandlerZeitgeist");
-      // FIXME: perhaps we should check app_info.should_show?
-      //   but user specifically asked to open this, so probably not
-      //   otoh the gio module won't pick it up if it's not should_show
-      if (zg_gio_module != 0)
-      {
-        Utils.Logger.debug (this, "libzg-gio-module detected, not pushing");
-        reload_relevancies ();
-        return;
-      }
-
-      if (has_datahub_gio_module)
-      {
-        reload_relevancies ();
-        return;
-      }
-
-      string app_uri = null;
-      if (app_info.get_id () != null)
-      {
-        app_uri = "application://" + app_info.get_id ();
-      }
-      else if (app_info is DesktopAppInfo)
-      {
-        string? filename = (app_info as DesktopAppInfo).get_filename ();
-        if (filename == null) return;
-        app_uri = "application://" + Path.get_basename (filename);
-      }
-
-      Utils.Logger.debug (this, "launched \"%s\", pushing to ZG", app_uri);
-      push_app_launch (app_uri, app_info.get_display_name ());
-
-      // and refresh
-      reload_relevancies ();
-    }
-
-    private void push_app_launch (string app_uri, string? display_name)
-    {
-      //debug ("pushing launch event: %s [%s]", app_uri, display_name);
-      var event = new Zeitgeist.Event ();
-      var subject = new Zeitgeist.Subject ();
-
-      event.actor = "application://synapse.desktop";
-      event.interpretation = Zeitgeist.ZG.ACCESS_EVENT;
-      event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
-      event.add_subject (subject);
-
-      subject.uri = app_uri;
-      subject.interpretation = Zeitgeist.NFO.SOFTWARE;
-      subject.manifestation = Zeitgeist.NFO.SOFTWARE_ITEM;
-      subject.mimetype ="application/x-desktop";
-      subject.text = display_name;
-
-      try
-      {
-        zg_log.insert_event_no_reply (event);
-      }
-      catch (Error err)
-      {
-        warning ("%s", err.message);
-        return;
-      }
-    }
-  }
+* Copyright (c) 2010 Michal Hruby <[e-mail]>
+*               2017 elementary LLC.
+*
+* 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; either
+* version 2 of the License, or (at your option) any later version.
+*
+* 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
+*
+* Authored by: Michal Hruby <[e-mail]>
+*/
+
+namespace Synapse {
+    private class ZeitgeistRelevancyBackend: Object, RelevancyBackend {
+        private Zeitgeist.Log zg_log;
+        private Zeitgeist.DataSourceRegistry zg_dsr;
+        private Gee.Map<string, int> application_popularity;
+        private Gee.Map<string, int> uri_popularity;
+        private bool has_datahub_gio_module = false;
+
+        private const float MULTIPLIER = 65535.0f;
+
+        construct {
+            zg_log = new Zeitgeist.Log ();
+            application_popularity = new Gee.HashMap<string, int> ();