Merge lp:~jeremy-munsch/synapse-project/fix-ssh-terminal into lp:synapse-project

[Jeremy Munsch]

Use
  x-terminal-emulator -e 'ssh %s' if x-terminal-emulator is available or default to GLib NEEDS_TERMINAL if a terminal is needed

to respect user default terminal instead of unefficient Glib default terminal
https://mail.gnome.org/archives/vala-list/2012-June/msg00061.html

It is only launching gnome-terminal or xterm, this is not the wanted behaviour.

The -e should work with any terminal emulator, this is i think a reliable and simple solution since synapse is targeting Debian based distros.
The fallback still supports other DE though.

[Jeremy Munsch (jeremy-munsch)]

I just saw in common actions that the problem is also to fix there.
I will also test if x-terminal-emulator is present and fall back to GLib solution if not.

I think of refactoring this into an Utils method.

[Jeremy Munsch (jeremy-munsch)]

I just did the just above.

If this is merged modifications would have to be done in PR https://code.launchpad.net/~jeremy-munsch/synapse-project/add-script-execute/+merge/277502 to make usage of the introduced "Utils.open_command_line"

[Rico Tzschichholz (ricotz)]

Was about to say that "x-terminal-emulator" might not be available/set.

[Jeremy Munsch (jeremy-munsch)]

Oops i made a mistake correcting now
"if (null != Environment.find_program_in_path ("zeal"))"

[Jeremy Munsch (jeremy-munsch)]

I just saw that redhat based distros use /usr/sbin/alternatives
and that synapse is distributed in redhat (fedora it seems at least).
http://rpmfind.net/linux/rpm2html/search.php?query=synapse

Should i update testing /usr/sbin/alternatives so it could be packaged more easily ?

[Jeremy Munsch (jeremy-munsch)]

Just updated the branch and corrected the commit message.

[Jeremy Munsch (jeremy-munsch)]

I have updated this. It now uses gconf to get default terminal, then fallbacks on x-terminal and then fallback on native and not reliable at all vala way.

[Jeremy Munsch (jeremy-munsch)]

So it is now using GLib.Settings

[Jeremy Munsch (jeremy-munsch)]

This should be ok now.

[Jeremy Munsch (jeremy-munsch)]

I have faith it should be ok.

[lp:~jeremy-munsch/synapse-project/fix-ssh-terminal]

637. By Rico Tzschichholz on 2016-02-26

plugins: Add suport for MATE Screensaver

638. By Rico Tzschichholz on 2016-02-26

po: Update translations

639. By Rico Tzschichholz on 2016-02-27

desktop-file-plugin: correct ApplicationsMatch to DesktopFileMatch

640. By Rico Tzschichholz on 2016-02-27

src: Drop "using Gee;"

641. By Rico Tzschichholz on 2016-02-27

src: Drop "using Json;"

642. By Rico Tzschichholz on 2016-02-27

src: Drop "using Zeitgeist;"

643. By Rico Tzschichholz on 2016-02-27

src: Drop "using Gtk;"

644. By Rico Tzschichholz on 2016-02-27

src: Drop "using Cairo;"

645. By Rico Tzschichholz on 2016-02-27

src: Drop last usages of "using *;"

646. By Rico Tzschichholz on 2016-02-27

ui: Show release-name in about-dialog only

647. By Rico Tzschichholz on 2016-02-27

ui: Bump to 2016

648. By Rico Tzschichholz on 2016-02-28

Release 0.2.99.2

649. By Rico Tzschichholz on 2016-03-02

ui: Set and update client-window of Gtk.IMMulticontext

650. By Rico Tzschichholz on 2016-03-08

main: Properly construct OptionEntry

Stop using an empty string where is getting treated as translateable.

651. By Michael Aquilina on 2016-04-01

Add pass plugin

652. By Rico Tzschichholz on 2016-09-29

Fix non-matching generic types

653. By Rico Tzschichholz on 2016-10-06

Fix non-matching generic types of interface implementations

654. By Jeremy Munsch on 2016-12-18

utils: Add generic method open_command_line
common-actions/ssh-plugin: usage of open_command_line

=== modified file 'src/core/common-actions.vala'
--- src/core/common-actions.vala	2015-11-18 12:08:18 +0000
+++ src/core/common-actions.vala	2016-12-18 20:17:23 +0000
@@ -153,17 +153,7 @@
           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);
-            app.launch (null, Gdk.Display.get_default ().get_app_launch_context ());
-          }
-          catch (Error err)
-          {
-            warning ("%s", err.message);
-          }
+          Utils.open_command_line (original.get_commandline (), original.get_name (), true);
         }
         else if (match is UriMatch)
         {
 
=== modified file 'src/core/utils.vala'
--- src/core/utils.vala	2015-11-19 09:11:34 +0000
+++ src/core/utils.vala	2016-12-18 20:17:23 +0000
@@ -112,6 +112,68 @@
       }
     }
 
+    public static void open_command_line (string command, string? app_name = null, bool needs_terminal = false)
+    {
+      AppInfoCreateFlags using_terminal = AppInfoCreateFlags.NONE;
+      string commandline = command;
+      string? application_name = app_name;
+
+      if (needs_terminal)
+      {
+        if (GLib.SettingsSchemaSource.get_default ().lookup ("org.gnome.desktop.default-applications.terminal", true) != null)
+        {
+          application_name = (new GLib.Settings("org.gnome.desktop.default-applications.terminal")).get_string ("exec");
+        }
+
+        if (Environment.find_program_in_path ("x-terminal-emulator") != null)
+        {
+          // try to determine default terminal application and make exceptions
+          try {
+            Regex regex = new Regex ("[a-zA-Z0-9-_]*");
+
+            Process.spawn_command_line_sync ("sh -c \"cat \\\"$(which x-terminal-emulator)\\\" | grep @ | cut -d$ -f1\"",
+                          out application_name);
+
+            if (!regex.match (application_name))
+              application_name = "x-terminal-emulator";
+
+          } catch (Error e) {
+            warning ("Error: %s\n", e.message);
+            application_name = "x-terminal-emulator";
+          }
+        }
+
+        if (application_name == null)
+          using_terminal = AppInfoCreateFlags.NEEDS_TERMINAL;
+      }
+
+      if (application_name != null)
+        switch (application_name) {
+          case "terminator":
+            commandline = "%s -x \"%s\"".printf (application_name, commandline);
+            break;
+          case "aterm":
+            commandline = "%s -e %s".printf (application_name, commandline);
+            break;
+          // case "gnome-terminal":
+          // case "x-terminal-emulator":
+          default:
+            commandline = "%s -e '%s'".printf (application_name, commandline);
+            break;
+        }
+
+      try
+      {
+        debug (commandline);
+        AppInfo app = AppInfo.create_from_commandline (commandline, application_name, using_terminal);
+        app.launch (null, Gdk.Display.get_default ().get_app_launch_context ());
+      }
+      catch (Error err)
+      {
+        warning ("%s", err.message);
+      }
+    }
+
     public static string extract_type_name (Type obj_type)
     {
       string obj_class = obj_type.name ();
 
=== modified file 'src/plugins/ssh-plugin.vala'
--- src/plugins/ssh-plugin.vala	2016-02-27 14:12:03 +0000
+++ src/plugins/ssh-plugin.vala	2016-12-18 20:17:23 +0000
@@ -168,17 +168,7 @@
 
       public override void do_action ()
       {
-        try
-        {
-          AppInfo ai = AppInfo.create_from_commandline (
-            "ssh %s".printf (this.title),
-            "ssh", AppInfoCreateFlags.NEEDS_TERMINAL);
-          ai.launch (null, null);
-        }
-        catch (Error err)
-        {
-          warning ("%s", err.message);
-        }
+        Utils.open_command_line ("ssh %s".printf (title), null, true);
       }
 
       public SshHost (string host_name)