diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2004-02-13 03:13:54 +0800 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2004-02-13 03:13:54 +0800 |
commit | 4c401b884b4e4529e470346dd9d0e834661b3823 (patch) | |
tree | b2d9cf9be755c67c29d2fed9e4d4d40d6c3a3975 /src/popup-commands.c | |
parent | 11559ecfcb6420b24b537d9c7b61f60ec20a8cfb (diff) | |
download | gsoc2013-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 'src/popup-commands.c')
-rw-r--r-- | src/popup-commands.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/popup-commands.c b/src/popup-commands.c index 8839e1935..6a2280b82 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -374,7 +374,7 @@ popup_cmd_set_image_as_background (GtkAction *action, { EphyEmbedEvent *info; const char *location; - char *dest, *base; + char *dest, *base, *base_converted; const GValue *value; EphyEmbedPersist *persist; EphyEmbed *embed; @@ -390,7 +390,8 @@ popup_cmd_set_image_as_background (GtkAction *action, (ephy_embed_factory_new_object ("EphyEmbedPersist")); base = g_path_get_basename (location); - dest = g_build_filename (ephy_dot_dir (), base, NULL); + base_converted = g_filename_from_utf8 (base, -1, NULL, NULL, NULL); + dest = g_build_filename (ephy_dot_dir (), base_converted, NULL); ephy_embed_persist_set_embed (persist, embed); ephy_embed_persist_set_dest (persist, dest); @@ -405,6 +406,7 @@ popup_cmd_set_image_as_background (GtkAction *action, g_free (dest); g_free (base); + g_free (base_converted); } void |