reviewed by: Pavel Cisler <pavel@eazel.com>

	An attempt to fix the Tinderbox.

	* user-guide/Makefile.am: Add C subdir.

	Other changes.

	* libnautilus-extensions/nautilus-file-utilities.c:
	(nautilus_format_uri_for_display): Simplify to take advantage of
	the new gnome_vfs_get_local_path_from_uri, which rejects paths
	that have "#" characters in them.
	(nautilus_self_check_file_utilities): Add more test cases for
	host names that are case sensitive.

	* omf-install/.cvsignore: Ignore generated files in this new
	directory.

5 files changed, 54 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 38f295f81..ef3d0ffc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2001-02-21  Darin Adler  <darin@eazel.com>
+
+	reviewed by: Pavel Cisler <pavel@eazel.com>
+
+	An attempt to fix the Tinderbox.
+
+	* user-guide/Makefile.am: Add C subdir.
+
+	Other changes.
+
+	* libnautilus-extensions/nautilus-file-utilities.c:
+	(nautilus_format_uri_for_display): Simplify to take advantage of
+	the new gnome_vfs_get_local_path_from_uri, which rejects paths
+	that have "#" characters in them.
+	(nautilus_self_check_file_utilities): Add more test cases for
+	host names that are case sensitive.
+
+	* omf-install/.cvsignore: Ignore generated files in this new
+	directory.
+
 2001-02-21  Laszlo Kovacs <laszlo.kovacs@sun.com>
 	* components/help/Makefile.am
 	enabling Scrollkeeper to be the default help system
diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c
index dc3588b10..5865a5942 100644
--- a/libnautilus-extensions/nautilus-file-utilities.c
+++ b/libnautilus-extensions/nautilus-file-utilities.c
@@ -91,20 +91,21 @@ static void read_file_read_chunk (NautilusReadFileHandle *handle);
 char *
 nautilus_format_uri_for_display (const char *uri) 
 {
-	char *path;
-	char *ret;
+	char *canonical_uri, *path;
 
 	g_return_val_if_fail (uri != NULL, g_strdup (""));
 
-	/* If there's no fragment and its a local path */
-	if (strchr(uri, '#') == NULL 
-	    && (path = gnome_vfs_get_local_path_from_uri (uri)) != NULL) {
-		ret = path;
-	} else {
-		ret = nautilus_make_uri_canonical (uri);
+	canonical_uri = nautilus_make_uri_canonical (uri);
+
+	/* If there's no fragment and it's a local path. */
+	path = gnome_vfs_get_local_path_from_uri (canonical_uri);
+	if (path != NULL) {
+		g_free (canonical_uri);
+		return path;
 	}
 
-	return ret;
+	g_free (path);
+	return canonical_uri;
 }
 
 static gboolean
@@ -1897,7 +1898,11 @@ nautilus_self_check_file_utilities (void)
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), FALSE);
 
-	/* FIXME 6798 DNS names should compare case-insensitive */
+	/* FIXME bugzilla.eazel.com 6798: Host names should compare case-insensitive. */
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.Eazel.Com");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80"), "http://www.Eazel.Com:80");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.Eazel.Com:80/xXx");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.Eazel.Com:80/xXx");
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), FALSE);
 
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index dc3588b10..5865a5942 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -91,20 +91,21 @@ static void read_file_read_chunk (NautilusReadFileHandle *handle);
 char *
 nautilus_format_uri_for_display (const char *uri) 
 {
-	char *path;
-	char *ret;
+	char *canonical_uri, *path;
 
 	g_return_val_if_fail (uri != NULL, g_strdup (""));
 
-	/* If there's no fragment and its a local path */
-	if (strchr(uri, '#') == NULL 
-	    && (path = gnome_vfs_get_local_path_from_uri (uri)) != NULL) {
-		ret = path;
-	} else {
-		ret = nautilus_make_uri_canonical (uri);
+	canonical_uri = nautilus_make_uri_canonical (uri);
+
+	/* If there's no fragment and it's a local path. */
+	path = gnome_vfs_get_local_path_from_uri (canonical_uri);
+	if (path != NULL) {
+		g_free (canonical_uri);
+		return path;
 	}
 
-	return ret;
+	g_free (path);
+	return canonical_uri;
 }
 
 static gboolean
@@ -1897,7 +1898,11 @@ nautilus_self_check_file_utilities (void)
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), FALSE);
 
-	/* FIXME 6798 DNS names should compare case-insensitive */
+	/* FIXME bugzilla.eazel.com 6798: Host names should compare case-insensitive. */
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.Eazel.Com");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80"), "http://www.Eazel.Com:80");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.Eazel.Com:80/xXx");
+	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.Eazel.Com:80/xXx");
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), FALSE);
 
 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
diff --git a/omf-install/.cvsignore b/omf-install/.cvsignore
new file mode 100644
index 000000000..55df22f7d
--- /dev/null
+++ b/omf-install/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+nautilus-C.omf
diff --git a/user-guide/Makefile.am b/user-guide/Makefile.am
index 59f98969e..0bb067812 100644
--- a/user-guide/Makefile.am
+++ b/user-guide/Makefile.am
@@ -1,6 +1,7 @@
 NULL=
 
 SUBDIRS=	\
+	C	\
 	gnufdl	\
 	gnugpl	\
 	$(NULL)