[Xfce4-commits] [apps/xfce4-terminal] 01/01: Quote all file names/URIs

[noreply at xfce.org]

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

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 16307a518080bef632592275c6696f47c1c18b89
Author: Igor <f2404 at yandex.ru>
Date:   Mon Sep 12 12:41:12 2016 +0300

    Quote all file names/URIs
    
    Otherwise, file names containing brackets were not quoted.
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12836
---
 terminal/terminal-widget.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index afab87c..044b3db 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -448,7 +448,6 @@ terminal_widget_drag_data_received (GtkWidget        *widget,
   gchar        **uris;
   gchar         *filename;
   gchar         *text;
-  gint           argc;
   gint           n;
   GtkWidget     *screen;
 
@@ -532,18 +531,9 @@ terminal_widget_drag_data_received (GtkWidget        *widget,
                   /* release the file:-URI */
                   g_free (uris[n]);
 
-                  /* check if we need to quote the file name (for the shell) */
-                  if (!g_shell_parse_argv (filename, &argc, NULL, NULL) || argc != 1)
-                    {
-                      /* we need to quote the filename */
-                      uris[n] = g_shell_quote (filename);
-                      g_free (filename);
-                    }
-                  else
-                    {
-                      /* no need to quote, shell will handle properly */
-                      uris[n] = filename;
-                    }
+                  /* quote the file name (for the shell) */
+                  uris[n] = g_shell_quote (filename);
+                  g_free (filename);
                 }
             }
 

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