diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-10-28 19:33:19 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-10-28 19:33:19 +0800 |
| commit | 025c7959e438aad9770f9aa801b6ead6e19e79dd (patch) | |
| tree | 7a3595c5b012722d6e6dcea81b97773c15c9450c /embed/mozilla/MozDownload.cpp | |
| parent | 4ff6bbed9a23f05f1ee9158d2607c2e811c5de6f (diff) | |
| download | gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar.gz gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar.bz2 gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar.lz gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar.xz gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.tar.zst gsoc2013-epiphany-025c7959e438aad9770f9aa801b6ead6e19e79dd.zip | |
Open source in the default editor and remove the unused copy api. Add a
2003-10-28 Marco Pesenti Gritti <marco@gnome.org>
* embed/ephy-embed-persist.h:
* embed/ephy-embed.c:
* embed/ephy-embed.h:
* embed/ephy-favicon-cache.c: (ephy_favicon_cache_download):
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphyHeaderSniffer.h:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed.cpp:
* src/ephy-shell.c: (delete_files), (ephy_shell_finalize),
(ephy_shell_new_tab), (ephy_shell_delete_on_exit):
* src/ephy-shell.h:
* src/window-commands.c: (get_editor_application),
(editor_open_uri), (save_source_completed_cb),
(editor_can_open_uri), (save_temp_source),
(window_cmd_view_page_source):
Open source in the default editor and
remove the unused copy api.
Add a missing include while at it.
Diffstat (limited to 'embed/mozilla/MozDownload.cpp')
| -rw-r--r-- | embed/mozilla/MozDownload.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 63901ee35..875d11e3b 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -385,10 +385,13 @@ MozDownload::Resume() nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI, nsILocalFile* inDestFile, const char *contentType, nsIURI* inOriginalURI, MozillaEmbedPersist *embedPersist, - PRBool bypassCache, nsIInputStream *postData) + nsIInputStream *postData, nsISupports *aCacheKey) { nsresult rv = NS_OK; + EmbedPersistFlags ephy_flags; + ephy_flags = ephy_embed_persist_get_flags (EPHY_EMBED_PERSIST (embedPersist)); + PRBool isHTML = (domDocument && contentType && (strcmp (contentType, "text/html") == 0 || strcmp (contentType, "text/xml") == 0 || @@ -410,20 +413,15 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI PRInt32 flags = nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION | nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES; - if (bypassCache) - { - flags |= nsIWebBrowserPersist::PERSIST_FLAGS_BYPASS_CACHE; - } - else + if (ephy_flags & EMBED_PERSIST_COPY_PAGE) { flags |= nsIWebBrowserPersist::PERSIST_FLAGS_FROM_CACHE; } - webPersist->SetPersistFlags(flags); - - if (!isHTML) + + if (!isHTML || ephy_flags & EMBED_PERSIST_COPY_PAGE) { - rv = webPersist->SaveURI (sourceURI, nsnull, nsnull, + rv = webPersist->SaveURI (sourceURI, aCacheKey, nsnull, postData, nsnull, inDestFile); } else |