Merge lp:~jeremy-munsch/synapse-project/goldendict-support into lp:synapse-project

[Jeremy Munsch]

Add support for goldendict and use it as default if available as it is more complete feature and support lot of info sources.

It should be harmless whether to use gnome-dictionary of goldendict as if the use has goldendict he is likely wanting synapse to use it.

[lp:~jeremy-munsch/synapse-project/goldendict-support]

616. By Jeremy Munsch on 2015-11-14

core: Handle UriMatches pointing to executable files

617. By Rico Tzschichholz on 2015-11-14

build: Drop optional dependency on gnome-common

618. By Rico Tzschichholz on 2015-11-14

build: Bump requirements glib-2.0 >= 2.40, valac >= 0.24.0

619. By Jeremy Munsch on 2015-11-14

Add support for "Additional applications actions"

Source and evaluate "Desktop Action" groups in desktop-files.

620. By Jeremy Munsch on 2015-11-14

dictionary: Add support for goldendict and use it in priority as it is more recent and complete feature

[Jeremy Munsch (jeremy-munsch)]

Just updated the branch and the commit message following recommendations

Unmerged revisions

620. By Jeremy Munsch on 2015-11-14

dictionary: Add support for goldendict and use it in priority as it is more recent and complete feature

=== modified file 'src/plugins/dictionary.vala'
--- src/plugins/dictionary.vala	2015-09-29 18:25:24 +0000
+++ src/plugins/dictionary.vala	2015-11-14 23:13:38 +0000
@@ -45,8 +45,9 @@
       {
         try
         {
+          var search_command = dictionary_exec == "goldendict" ? "%s \"%s\"" : "%s --look-up=\"%s\"";
           AppInfo ai = AppInfo.create_from_commandline (
-            "%s --look-up=\"%s\"".printf (dictionary_exec, match.title),
+            search_command.printf (dictionary_exec, match.title),
             dictionary_exec, 0);
           ai.launch (null, null);
         }
@@ -74,7 +75,8 @@
         "accessories-dictionary",
         register_plugin,
         Environment.find_program_in_path ("gnome-dictionary") != null
-          || Environment.find_program_in_path ("mate-dictionary") != null,
+          || Environment.find_program_in_path ("mate-dictionary") != null
+          || Environment.find_program_in_path ("goldendict") != null,
         _("No compatible Dictionary installed")
       );
     }
@@ -90,7 +92,9 @@
     construct
     {
       unowned string dictionary_exec;
-      if (Environment.find_program_in_path ("gnome-dictionary") != null)
+      if (Environment.find_program_in_path ("goldendict") != null)
+        dictionary_exec = "goldendict";
+      else if (Environment.find_program_in_path ("gnome-dictionary") != null)
         dictionary_exec = "gnome-dictionary";
       else if (Environment.find_program_in_path ("mate-dictionary") != null)
         dictionary_exec = "mate-dictionary";