[gthumb] Make uricmp use gfile-provided utf8 parse names for consistency

[Michael J. Chudobiak <mjc src gnome org>]

commit 278cd68400657b972fda363b15aa6860d3b24c4c
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed Jun 3 15:23:21 2009 -0400

    Make uricmp use gfile-provided utf8 parse names for consistency
---
 libgthumb/file-utils.c |   20 ++++++++++----------
 src/gth-browser.c      |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libgthumb/file-utils.c b/libgthumb/file-utils.c
index 007d13a..4a40352 100644
--- a/libgthumb/file-utils.c
+++ b/libgthumb/file-utils.c
@@ -1265,24 +1265,24 @@ uricmp (const char *path1,
 	const char *path2)
 {
 	char *uri1, *uri2;
+	char *key1, *key2;
+
 	int   result;
 
-	if (path1 == NULL) {
-		if (path2 == NULL) 
-			return 0;
-		else
-			return -1;
-	}
-	
-	uri1 = add_scheme_if_absent (path1);
-	uri2 = add_scheme_if_absent (path2);
+	uri1 = get_utf8_display_name_from_uri (path1);
+	uri2 = get_utf8_display_name_from_uri (path2);
+	key1 = g_utf8_collate_key_for_filename (uri1, -1);
+	key2 = g_utf8_collate_key_for_filename (uri2, -1);
 
-	result = strcmp_null_tolerant (uri1, uri2);
+	result = strcmp_null_tolerant (key1, key2);
 
 	g_free (uri1);
 	g_free (uri2);
+	g_free (key1);
+	g_free (key2);
 
 	return result;
+
 }
 
 
diff --git a/src/gth-browser.c b/src/gth-browser.c
index 3d06d7d..d2c8f54 100644
--- a/src/gth-browser.c
+++ b/src/gth-browser.c
@@ -6233,7 +6233,7 @@ dir_list_done_cb (GthDirList     *dir_list,
 		char *image_dir;
 		
 		image_dir = remove_level_from_path (browser->priv->image->utf8_path);
-		if (uricmp (image_dir, browser->priv->dir_list->path) == 0)
+		if (same_uri (image_dir, browser->priv->dir_list->path))
 			file_list = g_list_append (NULL, file_data_dup (browser->priv->image));
 		g_free (image_dir);
 	}