aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/EphyHeaderSniffer.cpp
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 /embed/mozilla/EphyHeaderSniffer.cpp
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 'embed/mozilla/EphyHeaderSniffer.cpp')
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index abf0ba931..a37c9164c 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -216,6 +216,8 @@ filechooser_response_cb (EphyFileChooser *dialog, gint response, EphyHeaderSniff
sniffer->InitiateDownload (destFile);
}
}
+
+ g_free (filename);
}
// FIXME how to inform user of failed save ?
@@ -314,7 +316,7 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
dialog = ephy_file_chooser_new (title ? title: _("Save"),
GTK_WIDGET (window),
GTK_FILE_CHOOSER_ACTION_SAVE,
- key ? key : CONF_STATE_DOWNLOAD_DIR);
+ key ? key : CONF_STATE_SAVE_DIR);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
NS_ConvertUCS2toUTF8 (defaultFileName).get());