aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-02-13 03:13:54 +0800
committerChristian Persch <chpe@src.gnome.org>2004-02-13 03:13:54 +0800
commit4c401b884b4e4529e470346dd9d0e834661b3823 (patch)
treeb2d9cf9be755c67c29d2fed9e4d4d40d6c3a3975 /lib
parent11559ecfcb6420b24b537d9c7b61f60ec20a8cfb (diff)
downloadgsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar.gz
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar.bz2
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar.lz
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar.xz
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.tar.zst
gsoc2013-epiphany-4c401b884b4e4529e470346dd9d0e834661b3823.zip
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-file-chooser.c13
-rw-r--r--lib/ephy-file-helpers.c10
2 files changed, 15 insertions, 8 deletions
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 6a59bff5a..15e57b7b9 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -24,6 +24,7 @@
#endif
#include "ephy-file-chooser.h"
+#include "ephy-file-helpers.h"
#include "eel-gconf-extensions.h"
#include "ephy-state.h"
#include "ephy-debug.h"
@@ -132,22 +133,22 @@ ephy_file_chooser_set_persist_key (EphyFileChooser *dialog, const char *key)
converted = g_filename_from_utf8
(dir, -1, NULL, NULL, NULL);
- expanded = gnome_vfs_expand_initial_tilde (converted);
-
- if (expanded != NULL)
+ if (converted != NULL)
{
+ expanded = gnome_vfs_expand_initial_tilde (converted);
+
gtk_file_chooser_set_current_folder
(GTK_FILE_CHOOSER (dialog), expanded);
+
+ g_free (expanded);
+ g_free (converted);
}
- g_free (expanded);
- g_free (converted);
g_free (dir);
}
g_signal_connect (dialog, "current-folder-changed",
G_CALLBACK (current_folder_changed_cb), dialog);
-
}
const char *
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 1c316f8f4..dd69fdb60 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -66,12 +66,18 @@ char *
ephy_file_downloads_dir (void)
{
const char *translated_folder;
+ char *converted, *downloads_dir;
/* The name of the default downloads folder */
translated_folder = _("Downloads");
- return g_build_filename (g_get_home_dir (), "Desktop",
- translated_folder, NULL);
+ converted = g_filename_from_utf8 (translated_folder, -1, NULL,
+ NULL, NULL);
+ downloads_dir = g_build_filename (g_get_home_dir (), "Desktop",
+ converted, NULL);
+ g_free (converted);
+
+ return downloads_dir;
}
char *