gedit r6480 - in trunk: . plugins/filebrowser

[pborelli svn gnome org]

Author: pborelli
Date: Wed Sep  3 21:05:54 2008
New Revision: 6480
URL: http://svn.gnome.org/viewvc/gedit?rev=6480&view=rev

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

	* plugins/gedit-file-browser-store.c:
	* plugins/gedit-file-browser-utils.c:
	* plugins/gedit-file-browser-utils.h:
	Remove useless roundtrip from uri to gfile to parse_name.



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

Modified: trunk/plugins/filebrowser/gedit-file-browser-store.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-store.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-store.c	Wed Sep  3 21:05:54 2008
@@ -2704,12 +2704,12 @@
 GeditFileBrowserStoreResult
 gedit_file_browser_store_set_virtual_root_from_string
     (GeditFileBrowserStore * model, gchar const *root) {
-	GFile * file = g_file_new_for_uri (root);
-	gchar *str, *str1;
+	GFile *file;
 
 	g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
 			      GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
 
+	file = g_file_new_for_uri (root);
 	if (file == NULL) {
 		g_warning ("Invalid uri (%s)", root);
 		return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
@@ -2733,8 +2733,10 @@
 	}
 
 	if (!g_file_has_prefix (file, model->priv->root->file)) {
-		str = gedit_file_browser_utils_file_display (model->priv->root->file);
-		str1 = gedit_file_browser_utils_file_display (file);
+		gchar *str, *str1;
+
+		str = g_file_get_parse_name (model->priv->root->file);
+		str1 = g_file_get_parse_name (file);
 
 		g_warning
 		    ("Virtual root (%s) is not below actual root (%s)",