[Xfce4-commits] <xfce4-panel:xfce-4.8> Directorymenu: Also send the target directory as arg (bug #7745).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to 4d7dd3935b90b4bde52df8064f302953d874bf4c (commit)
       from 5176964bd5632f2ae12372593d34de9e3f66bbbe (commit)

commit 4d7dd3935b90b4bde52df8064f302953d874bf4c
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jul 10 10:31:48 2011 +0200

    Directorymenu: Also send the target directory as arg (bug #7745).
    
    Not all filemanagers support the working directory as the
    new target, but open the home directory instead.
    To avoid this also send the target directory as first argument
    in the command, basically all file managers support this.
    
    (cherry picked from commit 5f823bd48b21a24a4516abac01084bd85d523cf2)

 plugins/directorymenu/directorymenu.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index b41043e..ace2a19 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -630,7 +630,7 @@ directory_menu_plugin_menu_open (GtkWidget   *mi,
   gchar       **binaries = NULL;
   guint         i;
   gboolean      result = FALSE;
-  gchar        *argv[2];
+  gchar        *argv[3];
 
   /* try to work around the exo code and get the direct command */
   rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/helpers.rc", TRUE);
@@ -673,7 +673,8 @@ directory_menu_plugin_menu_open (GtkWidget   *mi,
             continue;
 
           argv[0] = filename;
-          argv[1] = NULL;
+          argv[1] = working_dir;
+          argv[2] = NULL;
 
           /* try to spawn the program, if this fails we try exo for
            * a decent error message */