[Pkg-xfce-commits] r3435 - in desktop/trunk/exo/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-08-20 13:07:18 +0000 (Thu, 20 Aug 2009)
New Revision: 3435

Added:
   desktop/trunk/exo/debian/README.source
   desktop/trunk/exo/debian/patches/02_exo-open-fix-quotes-in-url.patch
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
Log:
* debian/patches
  - 02_exo-open-fix-quotes-in-url added, fix opening url with quotes in
    them. (Xfce [f578ac2], #5461)
* debian/control:
  - update standards version to 3.8.3.
* add a debian/README.source.

Added: desktop/trunk/exo/debian/README.source
===================================================================
--- desktop/trunk/exo/debian/README.source	                        (rev 0)
+++ desktop/trunk/exo/debian/README.source	2009-08-20 13:07:18 UTC (rev 3435)
@@ -0,0 +1,2 @@
+exo uses quilt patch system to apply patch at build-time. More information
+can be found in /usr/share/doc/quilt/README.source.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2009-08-20 11:19:11 UTC (rev 3434)
+++ desktop/trunk/exo/debian/changelog	2009-08-20 13:07:18 UTC (rev 3435)
@@ -1,3 +1,14 @@
+exo (0.3.101-3) UNRELEASED; urgency=low
+
+  * debian/patches
+    - 02_exo-open-fix-quotes-in-url added, fix opening url with quotes in
+      them. (Xfce [f578ac2], #5461)
+  * debian/control:
+    - update standards version to 3.8.3.
+  * add a debian/README.source.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 20 Aug 2009 14:56:32 +0200
+
 exo (0.3.101-2) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2009-08-20 11:19:11 UTC (rev 3434)
+++ desktop/trunk/exo/debian/control	2009-08-20 13:07:18 UTC (rev 3435)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
  intltool, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://libexo.os-cillation.com/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/

Added: desktop/trunk/exo/debian/patches/02_exo-open-fix-quotes-in-url.patch
===================================================================
--- desktop/trunk/exo/debian/patches/02_exo-open-fix-quotes-in-url.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/02_exo-open-fix-quotes-in-url.patch	2009-08-20 13:07:18 UTC (rev 3435)
@@ -0,0 +1,74 @@
+commit f578ac2d91d63241af2db9987e6b94514f5d183e
+Author: Nick Schermer <nick at xfce.org>
+Date:   Fri Jul 10 18:24:36 2009 +0000
+
+    Fix quotes in urls, only quote when the arg contains spaces (bug #5461).
+    
+    
+    (Old svn revision: 30251)
+
+diff --git a/exo-open/main.c b/exo-open/main.c
+index cbf5074..96bd1ba 100644
+--- a/exo-open/main.c
++++ b/exo-open/main.c
+@@ -36,6 +36,16 @@
+ #include <exo/exo.h>
+ 
+ 
++/**
++ * For testing this code the following commands should work:
++ * 
++ * exo-open --launch WebBrowser http://xfce.org (bug #5461).
++ * exo-open http://xfce.org
++ * exo-open --launch TerminalEmulator ./script.sh 'something with a space' 'nospace' (bug #5132).
++ * exo-open --launch TerminalEmulator ssh -l username some.host.com
++ **/
++
++
+ 
+ static gboolean opt_help = FALSE;
+ static gboolean opt_version = FALSE;
+@@ -143,6 +153,8 @@ main (int argc, char **argv)
+     {
+       if (argc > 1)
+         {
++          /* NOTE: see the comment at the top of this document! */
++
+           /* combine all specified parameters to one parameter string */
+           join = g_string_new (NULL);
+           for (i = 1; argv[i] != NULL; i++)
+@@ -150,11 +162,18 @@ main (int argc, char **argv)
+               /* separate the arguments */
+               if (i > 1)
+                 join = g_string_append_c (join, ' ');
+-
+-              /* append the quoted argument */
+-              quoted = g_shell_quote (argv[i]);
+-              join = g_string_append (join, quoted);
+-              g_free (quoted);
++              
++              /* only quote arguments with spaces */
++              if (strchr (argv[i], ' ') != NULL)
++                {
++                  quoted = g_shell_quote (argv[i]);
++                  join = g_string_append (join, quoted);
++                  g_free (quoted);
++                }
++              else
++                {
++                  join = g_string_append (join, argv[i]);
++                }
+             }
+           parameter = g_string_free (join, FALSE);
+         }
+@@ -163,6 +182,10 @@ main (int argc, char **argv)
+           parameter = NULL;
+         }
+ 
++#ifndef NDEBUG
++      g_message ("launch=%s, wd=%s, parameters (%d)=%s", opt_launch, opt_working_directory, argc, parameter);
++#endif
++
+       /* run the preferred application */
+       if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err))
+         {