Updating branch refs/heads/master to ea0b61ae58fe484ebd1a5a5751998eadde92c12d (commit) from fad7e1e6ec57cc9a2b5719e4ef4f09514505b894 (commit)
commit ea0b61ae58fe484ebd1a5a5751998eadde92c12d Author: Nick Schermer <n...@xfce.org> Date: Sun Oct 23 18:23:27 2011 +0200 Directorymenu: Properly fix previous commit. The second argument was specifically for file managers, so make this optional. plugins/directorymenu/directorymenu.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c index b41043e..88341a5 100644 --- a/plugins/directorymenu/directorymenu.c +++ b/plugins/directorymenu/directorymenu.c @@ -620,7 +620,8 @@ err: static void directory_menu_plugin_menu_open (GtkWidget *mi, GFile *dir, - const gchar *category) + const gchar *category, + gboolean path_as_arg) { GError *error = NULL; gchar *working_dir; @@ -630,7 +631,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 +674,8 @@ directory_menu_plugin_menu_open (GtkWidget *mi, continue; argv[0] = filename; - argv[1] = NULL; + argv[1] = path_as_arg ? working_dir : NULL; + argv[2] = NULL; /* try to spawn the program, if this fails we try exo for * a decent error message */ @@ -709,7 +711,7 @@ directory_menu_plugin_menu_open_terminal (GtkWidget *mi, panel_return_if_fail (GTK_IS_WIDGET (mi)); panel_return_if_fail (G_IS_FILE (dir)); - directory_menu_plugin_menu_open (mi, dir, "TerminalEmulator"); + directory_menu_plugin_menu_open (mi, dir, "TerminalEmulator", FALSE); } @@ -721,7 +723,7 @@ directory_menu_plugin_menu_open_folder (GtkWidget *mi, panel_return_if_fail (GTK_IS_WIDGET (mi)); panel_return_if_fail (G_IS_FILE (dir)); - directory_menu_plugin_menu_open (mi, dir, "FileManager"); + directory_menu_plugin_menu_open (mi, dir, "FileManager", TRUE); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits