[Xfce4-commits] <xfce-utils:master> Expand command to handle ~ (Bug #4041).

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 314df806bdf64ea9f322c4643b2ccfc45e519c04 (commit)
       from 08afce85c910f284bef15ff5588f2f1b62fb770a (commit)

commit 314df806bdf64ea9f322c4643b2ccfc45e519c04
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Mon Oct 25 13:26:33 2010 +0200

    Expand command to handle ~ (Bug #4041).

 xfrun/xfrun-dialog.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/xfrun/xfrun-dialog.c b/xfrun/xfrun-dialog.c
index 15d6d9a..d34489a 100644
--- a/xfrun/xfrun-dialog.c
+++ b/xfrun/xfrun-dialog.c
@@ -496,20 +496,26 @@ static void
 xfrun_run_clicked(GtkWidget *widget,
                   gpointer user_data)
 {
-    XfrunDialog *dialog = XFRUN_DIALOG(user_data);
-    gchar *cmdline, **argv = NULL;
-    gboolean in_terminal;
-    GdkScreen *gscreen;
-    GError *error = NULL;
-    gint argc;
+    XfrunDialog  *dialog = XFRUN_DIALOG(user_data);
+    GdkScreen    *gscreen;
+    gboolean      in_terminal;
+    GError       *error = NULL;
+    gchar       **argv = NULL;
+    gchar        *cmdline;
+    gchar        *new_cmdline;
+    gint          argc;
 
     cmdline = gtk_editable_get_chars(GTK_EDITABLE(dialog->priv->entry), 0, -1);
     in_terminal = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->priv->terminal_chk));
 
+    new_cmdline = xfce_expand_variables (cmdline, NULL);
+    g_free (cmdline);
+    cmdline = new_cmdline;
+
     gscreen = gtk_widget_get_screen(widget);
 
     if(dialog->priv->run_argument) {
-        gchar *new_cmdline, *run_arg_quoted;
+        gchar *run_arg_quoted;
 
         run_arg_quoted = g_shell_quote(dialog->priv->run_argument);
         new_cmdline = g_strconcat(cmdline, " ", run_arg_quoted, NULL);