[Xfce4-commits] <libxfcegui4:master> Use exo-open in xfce_exec (bug #4048).

[Nick Schermer]

Updating branch refs/heads/master
         to ad30dd62d2e964a2ff964af385b0667c9e8dbac6 (commit)
       from 90122708fdfab88fc1811eba56154dca9a2485a5 (commit)

commit ad30dd62d2e964a2ff964af385b0667c9e8dbac6
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 14 17:04:47 2012 +0200

    Use exo-open in xfce_exec (bug #4048).

 libxfcegui4/xfce-exec.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libxfcegui4/xfce-exec.c b/libxfcegui4/xfce-exec.c
index c2c0338..d758e8e 100644
--- a/libxfcegui4/xfce-exec.c
+++ b/libxfcegui4/xfce-exec.c
@@ -221,24 +221,23 @@ xfce_exec_create_argv (const char *cmd, gboolean in_terminal, GError **error)
     if (g_path_is_absolute (realcmd) && 
             g_file_test (realcmd, G_FILE_TEST_IS_DIR))
     {
-        argv = g_new (char *, 3);
-
-        if (in_terminal)
-            argv[0] = g_strdup ("xfterm4");
-	else
-	    argv[0] = g_strdup ("xftree4");
+        argv = g_new (char *, 5);
         
-        argv[1] = realcmd;
-        argv[2] = NULL;
+        argv[0] = g_strdup ("exo-open");
+        argv[1] = g_strdup ("--launch");
+        argv[2] = g_strdup (in_terminal ? "TerminalEmulator" : "FileManager");
+        argv[3] = realcmd;
+        argv[4] = NULL;
     }
     else if (in_terminal)
     {
-        argv = g_new (char *, 4);
+        argv = g_new (char *, 5);
         
-        argv[0] = g_strdup ("xfterm4");
-        argv[1] = g_strdup ("-e");
-	argv[2] = realcmd;
-        argv[3] = NULL;
+        argv[0] = g_strdup ("exo-open");
+        argv[1] = g_strdup ("--launch");
+        argv[2] = g_strdup ("TerminalEmulator");
+        argv[3] = realcmd;
+        argv[4] = NULL;
     }
     else
     {