Fix numerous places where we weren't properly converting between UTF-8 and

2004-02-12  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-embed-popup-control.c: (save_url),
	(embed_popup_set_image_as_background_cmd):
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get_type),
	(ephy_favicon_cache_class_init), (favicon_name_build),
	(favicon_download_completed_cb), (ephy_favicon_cache_get):
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/MozDownload.cpp:
	* lib/ephy-file-chooser.c: (ephy_file_chooser_set_persist_key):
	* lib/ephy-file-helpers.c: (ephy_file_downloads_dir):
	* src/popup-commands.c: (popup_cmd_set_image_as_background):
	* src/prefs-dialog.c: (get_download_button_label),
	(download_path_response_cb):

	Fix numerous places where we weren't properly converting between UTF-8
	and filename encoding.

	* embed/ephy-favicon-cache.c:

	Bump favicon cache xml version.

	* embed/mozilla/EphyHeaderSniffer.cpp:

	Fix mem leak, and use CONF_STATE_SAVE_DIR instead of the download dir
	key for directory persistence.

1 files changed, 10 insertions, 12 deletions

diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 762b29b46..9b0a228a4 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1086,18 +1086,20 @@ create_language_section (EphyDialog *dialog)
 static char*
 get_download_button_label ()
 {
-	char *key, *label, *downloads_path;
+	char *key, *label, *downloads_path, *converted_dp;
 
 	key = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR);
+
 	downloads_path = ephy_file_downloads_dir ();
+	converted_dp = g_filename_to_utf8 (downloads_path, -1, NULL, NULL, NULL);
 
-	/* fallback to default downloads directory */
-	if (key == NULL)
+	if (key == NULL ||
+	    g_utf8_collate (key, converted_dp) == 0 ||
+	    g_utf8_collate (key, "Downloads") == 0)
 	{
-		key = ephy_file_downloads_dir ();
+		label = g_strdup (_("Downloads"));
 	}
-
-	if (g_utf8_collate (key, "~/Desktop") == 0)
+	else if (g_utf8_collate (key, "~/Desktop") == 0)
 	{
 		label = g_strdup (_("Desktop")); 
 	}
@@ -1109,17 +1111,13 @@ get_download_button_label ()
 		 * filechooser */
 		label = g_strdup (_("Home"));
 	}
-	else if (g_utf8_collate (key, downloads_path) == 0 ||
-		 g_utf8_collate (key, "Downloads") == 0)
-	{
-		label = g_strdup (_("Downloads"));
-	}
 	else
 	{
 		label = g_strdup (key);
 	}
 
 	g_free (downloads_path);
+	g_free (converted_dp);
 	g_free (key);
 
 	return label;
@@ -1296,7 +1294,7 @@ download_path_response_cb (GtkDialog *fc, gint response, EphyDialog *dialog)
 			char *label;
 
 			eel_gconf_set_path (CONF_STATE_DOWNLOAD_DIR, dir);
-			
+
 			button = ephy_dialog_get_control (dialog, properties[DOWNLOAD_PATH_BUTTON_PROP].id);
 			label = get_download_button_label ();
 			ephy_ellipsizing_label_set_text ((EphyEllipsizingLabel*) GTK_BIN (button)->child,