diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-03-10 17:51:37 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-03-10 17:51:37 +0000 |
| commit | 628ac884b608de3539ada6ae4c1c627a7688bafd (patch) | |
| tree | 064ed38d3b11f39dff6475dabf86994255026375 /embed/mozilla/EphyHeaderSniffer.cpp | |
| parent | cf20c417c843be351ba5ec8f6c41f0a4d4323c8c (diff) | |
| download | epiphany-pre-gnome-2-8.tar.gz | |
Use CopyUTF8toUTF16 where appropriate.pre-gnome-2-8
2004-03-10 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
Use CopyUTF8toUTF16 where appropriate.
Diffstat (limited to 'embed/mozilla/EphyHeaderSniffer.cpp')
| -rw-r--r-- | embed/mozilla/EphyHeaderSniffer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp index 2d3755a20..28bbf7e22 100644 --- a/embed/mozilla/EphyHeaderSniffer.cpp +++ b/embed/mozilla/EphyHeaderSniffer.cpp @@ -282,10 +282,7 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI) { nsCAutoString fileNameCString; url->GetFileName(fileNameCString); - /* FIXME: when we can depend on moz >= 1.5, use - * CopyUTF8toUTF16 instead - */ - defaultFileName = NS_ConvertUTF8toUTF16(fileNameCString); + CopyUTF8toUTF16 (fileNameCString, defaultFileName); } } @@ -305,16 +302,13 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI) /* 4 Use the host. */ nsCAutoString hostName; mURL->GetHost(hostName); - /* FIXME: when we can depend on moz >= 1.5, use - * CopyUTF8toUTF16 instead - */ - defaultFileName = NS_ConvertUTF8toUTF16(hostName); + CopyUTF8toUTF16 (hostName, defaultFileName); } /* 5 One last case to handle about:blank and other untitled pages. */ if (defaultFileName.IsEmpty()) { - defaultFileName = NS_ConvertUTF8toUTF16 (_("Untitled")); + CopyUTF8toUTF16 (_("Untitled"), defaultFileName); } /* Validate the file name to ensure legality. */ @@ -324,6 +318,9 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI) const char *key; key = ephy_embed_persist_get_persist_key (EPHY_EMBED_PERSIST (mEmbedPersist)); + /* FIXME: do better here by using nsITextToSubURI service, like in + * http://lxr.mozilla.org/seamonkey/source/xpfe/communicator/resources/content/contentAreaUtils.js#763 + */ char *filename; filename = gnome_vfs_unescape_string (default_name, NULL); |