[Xfce4-commits] r30447 - in libexo/branches/xfce_4_6: . exo

[Nick Schermer]

Author: nick
Date: 2009-08-07 14:39:08 +0000 (Fri, 07 Aug 2009)
New Revision: 30447

Modified:
   libexo/branches/xfce_4_6/NEWS
   libexo/branches/xfce_4_6/exo/exo-url.c
Log:
Do not escape commas in urls (bug #5654).


Modified: libexo/branches/xfce_4_6/NEWS
===================================================================
--- libexo/branches/xfce_4_6/NEWS	2009-08-07 14:37:14 UTC (rev 30446)
+++ libexo/branches/xfce_4_6/NEWS	2009-08-07 14:39:08 UTC (rev 30447)
@@ -5,6 +5,7 @@
 - Properly handle NULL pixbufs in the toolbars code.
 - Make sure the ui-manager is up2date when creating the exo toolbar.
 - Fix possible segfault in exo_icon_view_get_item_at_pos (bug #5633).
+- Do not escape commas in urls (bug #5654).
 
 0.3.101
 =======

Modified: libexo/branches/xfce_4_6/exo/exo-url.c
===================================================================
--- libexo/branches/xfce_4_6/exo/exo-url.c	2009-08-07 14:37:14 UTC (rev 30446)
+++ libexo/branches/xfce_4_6/exo/exo-url.c	2009-08-07 14:39:08 UTC (rev 30447)
@@ -202,7 +202,6 @@
 {
   const gchar *category = NULL;
   gboolean     result = FALSE;
-  GString     *escaped_url;
   gchar       *display_name;
   gchar       *local_path;
   gchar       *command;
@@ -332,22 +331,8 @@
       return result;
     }
 
-  /* need to escape commata, otherwise firefox and several other helpers cannot handle the URL,
-   * see http://bugzilla.xfce.org/show_bug.cgi?id=2454 for a description of the problem.
-   */
-  escaped_url = g_string_sized_new (128);
-  for (; *url != '\0'; ++url)
-    {
-      if (*url == ',')
-        g_string_append (escaped_url, "%2C");
-      else
-        g_string_append_c (escaped_url, *url);
-    }
-
   /* oki doki then, let's open it */
-  result = exo_execute_preferred_application_on_screen (category, escaped_url->str, NULL, envp, screen, error);
-  g_string_free (escaped_url, TRUE);
-  return result;
+  return exo_execute_preferred_application_on_screen (category, url, NULL, envp, screen, error);
 }