[Xfce4-commits] [xfce/xfce4-panel] 42/73: DirectoryMenu, Open in terminal doesn't work with terminator. Bug #11742

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andrzejr pushed a commit to branch master
in repository xfce/xfce4-panel.

commit ed91fd6fd3cd6ba142e07298387237484fd3851b
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Thu May 14 23:56:11 2015 +0100

    DirectoryMenu, Open in terminal doesn't work with terminator. Bug #11742
    
    Related bug: #10270
    
    Pass working-directory as an argument only when requested.
    That is, only when starting FileManager, not TerminalEmulator.
---
 plugins/directorymenu/directorymenu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index efb39bd..524bd20 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -717,8 +717,11 @@ directory_menu_plugin_menu_open (GtkWidget   *mi,
 
   if (!result
 #ifdef EXO_CHECK_VERSION
-      && !exo_execute_preferred_application_on_screen (category, working_dir, working_dir, NULL,
-                                                       gtk_widget_get_screen (mi), &error)
+      && !exo_execute_preferred_application_on_screen (category,
+                                                       path_as_arg ? working_dir : NULL,
+                                                       working_dir,
+                                                       NULL,
+                                                       gtk_widget_get_screen (mi), &error))
 #endif
      )
     {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.