[Xfce4-commits] r30051 - in thunar/branches/migration-to-gio: . thunar

[Jannis Pohlmann]

Author: jannis
Date: 2009-06-19 15:34:25 +0000 (Fri, 19 Jun 2009)
New Revision: 30051

Modified:
   thunar/branches/migration-to-gio/ChangeLog
   thunar/branches/migration-to-gio/thunar/thunar-path-entry.c
Log:
	* thunar/thunar-path-entry.c: Unescape URIs before displaying them.
	  This is to make sure we don't see things like "%20" in the location
	  bar/dialog.

Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog	2009-06-19 15:34:20 UTC (rev 30050)
+++ thunar/branches/migration-to-gio/ChangeLog	2009-06-19 15:34:25 UTC (rev 30051)
@@ -1,5 +1,11 @@
 2009-06-19	Jannis Pohlmann <jannis at xfce.org>
 
+	* thunar/thunar-path-entry.c: Unescape URIs before displaying them.
+	  This is to make sure we don't see things like "%20" in the location
+	  bar/dialog.
+
+2009-06-19	Jannis Pohlmann <jannis at xfce.org>
+
 	* thunar/thunar-location-entry.c: Simplify the activate code by
 	  deriving from ThunarBrowser and using the poke functions to mount
 	  volumes or resolve files asynchronously and on demand.

Modified: thunar/branches/migration-to-gio/thunar/thunar-path-entry.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-path-entry.c	2009-06-19 15:34:20 UTC (rev 30050)
+++ thunar/branches/migration-to-gio/thunar/thunar-path-entry.c	2009-06-19 15:34:25 UTC (rev 30051)
@@ -1401,6 +1401,7 @@
 {
   GFile *file;
   gchar *text;
+  gchar *unescaped;
 
   _thunar_return_if_fail (THUNAR_IS_PATH_ENTRY (path_entry));
   _thunar_return_if_fail (current_file == NULL || THUNAR_IS_FILE (current_file));
@@ -1430,10 +1431,13 @@
         }
     }
 
-  /* setup the entry text */
-  gtk_entry_set_text (GTK_ENTRY (path_entry), text);
+  unescaped = g_uri_unescape_string (text, NULL);
   g_free (text);
 
+  /* setup the entry text */
+  gtk_entry_set_text (GTK_ENTRY (path_entry), unescaped);
+  g_free (unescaped);
+
   gtk_editable_set_position (GTK_EDITABLE (path_entry), -1);
 
   gtk_widget_queue_draw (GTK_WIDGET (path_entry));