fix for bookmarks editor

[James Willcox <jwillcox cs indiana edu>]

Hi,

Here's a small patch that displays the URIs in the "location" entry for the bookmarks editor the same way it is displayed in the location bar (converts file:/// to /, etc.).  Fixes #41457.

Thanks,
James


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5615
diff -u -r1.5615 ChangeLog
--- ChangeLog	8 Dec 2002 01:06:36 -0000	1.5615
+++ ChangeLog	8 Dec 2002 22:59:56 -0000
@@ -1,3 +1,13 @@
+2002-12-08  James Willcox  <jwillcox gnome org>
+
+	* libnautilus-private/nautilus-bookmark.c:
+	(nautilus_bookmark_get_uri_for_display):
+	* libnautilus-private/nautilus-bookmark.h:
+	* src/nautilus-bookmarks-window.c: (on_selection_changed):
+
+	Display the text in the "location" entry the same way we do
+	in the location bar.  Fixes #41457.
+
 2002-12-07  Dave Camp  <dave ximian com>
 
 	* libnautilus-private/nautilus-icon-container.c 
Index: libnautilus-private/nautilus-bookmark.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-bookmark.c,v
retrieving revision 1.58
diff -u -r1.58 nautilus-bookmark.c
--- libnautilus-private/nautilus-bookmark.c	4 Oct 2002 10:42:02 -0000	1.58
+++ libnautilus-private/nautilus-bookmark.c	8 Dec 2002 22:59:58 -0000
@@ -251,6 +251,11 @@
 	return g_strdup (bookmark->details->uri);
 }
 
+char *
+nautilus_bookmark_get_uri_for_display (NautilusBookmark *bookmark)
+{
+	return eel_format_uri_for_display (bookmark->details->uri);
+}
 
 /**
  * nautilus_bookmark_set_name:
Index: libnautilus-private/nautilus-bookmark.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-bookmark.h,v
retrieving revision 1.20
diff -u -r1.20 nautilus-bookmark.h
--- libnautilus-private/nautilus-bookmark.h	18 Sep 2002 18:26:09 -0000	1.20
+++ libnautilus-private/nautilus-bookmark.h	8 Dec 2002 22:59:58 -0000
@@ -75,6 +75,7 @@
 NautilusBookmark *    nautilus_bookmark_copy                   (NautilusBookmark      *bookmark);
 char *                nautilus_bookmark_get_name               (NautilusBookmark      *bookmark);
 char *                nautilus_bookmark_get_uri                (NautilusBookmark      *bookmark);
+char *                nautilus_bookmark_get_uri_for_display    (NautilusBookmark      *bookmark);
 char *                nautilus_bookmark_get_icon               (NautilusBookmark      *bookmark);
 gboolean              nautilus_bookmark_set_name               (NautilusBookmark      *bookmark,
 								const char            *new_name);
Index: src/nautilus-bookmarks-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmarks-window.c,v
retrieving revision 1.73
diff -u -r1.73 nautilus-bookmarks-window.c
--- src/nautilus-bookmarks-window.c	6 Nov 2002 10:39:08 -0000	1.73
+++ src/nautilus-bookmarks-window.c	8 Dec 2002 23:00:00 -0000
@@ -582,7 +582,7 @@
 
 	if (selected) {
 		name = nautilus_bookmark_get_name (selected);
-		uri = nautilus_bookmark_get_uri (selected);
+		uri = nautilus_bookmark_get_uri_for_display (selected);
 	}
 	
 	/* Set the sensitivity of widgets that require a selection */