gedit r6479 - in trunk: . gedit plugins/filebrowser

[pborelli svn gnome org]

Author: pborelli
Date: Wed Sep  3 20:56:24 2008
New Revision: 6479
URL: http://svn.gnome.org/viewvc/gedit?rev=6479&view=rev

Log:
2008-09-03  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-utils.c (gedit_utils_uri_for_display):
	parse_name should not be further unescaped, it's already ready
	to be used in the UI.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-utils.c
   trunk/plugins/filebrowser/gedit-file-browser-utils.c
   trunk/plugins/filebrowser/gedit-file-browser-utils.h

Modified: trunk/gedit/gedit-utils.c
==============================================================================
--- trunk/gedit/gedit-utils.c	(original)
+++ trunk/gedit/gedit-utils.c	Wed Sep  3 20:56:24 2008
@@ -1264,13 +1264,6 @@
  * Filter, modify, unescape and change @uri to make it appropriate
  * for display to users.
  * 
- * Rules:
- * <ul>
- * <li>file: uri without fragments should appear as local paths.</li>
- * <li>file: uri with fragments should appear as file:uri.</li>
- * <li>All other uri appear as expected.</li>
- * </ul>
- *
  * This function is a convenient wrapper for g_file_get_parse_name
  *
  * Return value: a string which represents @uri and can be displayed.
@@ -1280,16 +1273,12 @@
 {
 	GFile *gfile;
 	gchar *parse_name;
-	gchar *unescape;
-	
+
 	gfile = g_file_new_for_uri (uri);
-	
 	parse_name = g_file_get_parse_name (gfile);
-	unescape = g_uri_unescape_string (parse_name, NULL);
-	g_free (parse_name);
-	
 	g_object_unref (gfile);
-	return unescape;
+
+	return parse_name;
 }
 
 /**

Modified: trunk/plugins/filebrowser/gedit-file-browser-utils.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-utils.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-utils.c	Wed Sep  3 20:56:24 2008
@@ -97,19 +97,6 @@
 }
 
 gchar *
-gedit_file_browser_utils_file_display (GFile * file)
-{
-	gchar *uri;
-	gchar *ret;
-	
-	uri = g_file_get_uri (file);
-	ret = gedit_utils_uri_for_display (uri);
-	g_free (uri);
-	
-	return ret;
-}
-
-gchar *
 gedit_file_browser_utils_file_basename (GFile * file)
 {
 	gchar *uri;

Modified: trunk/plugins/filebrowser/gedit-file-browser-utils.h
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-utils.h	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-utils.h	Wed Sep  3 20:56:24 2008
@@ -12,7 +12,6 @@
 GdkPixbuf *gedit_file_browser_utils_pixbuf_from_file	  (GFile * file,
                                                            GtkIconSize size);
 
-gchar * gedit_file_browser_utils_file_display		  (GFile * file);
 gchar * gedit_file_browser_utils_file_basename		  (GFile * file);
 gchar * gedit_file_browser_utils_uri_basename             (gchar const * uri);