aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-09-18 15:50:10 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-09-18 15:50:10 +0800
commit1d7901ce605fa19fbd558e70541b2afe83df5f94 (patch)
tree7726d33f13c13e25d0948bacc4a69dc47c1d730e /embed
parent1c684e17cea6d34cd967c2c902251792ae53fc30 (diff)
downloadgsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar.gz
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar.bz2
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar.lz
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar.xz
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.tar.zst
gsoc2013-epiphany-1d7901ce605fa19fbd558e70541b2afe83df5f94.zip
reviewed by: Christian Persch <chpe@cvs.gnome.org>
2004-09-18 Marco Pesenti Gritti <marco@gnome.org> reviewed by: Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-persist.h: * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download): * embed/mozilla/MozDownload.cpp: Enable conversion for favicon downloads. Fix #152866.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-persist.h3
-rw-r--r--embed/ephy-favicon-cache.c3
-rw-r--r--embed/mozilla/MozDownload.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index 2d785bfaa..0c0c45fde 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -47,7 +47,8 @@ typedef enum
EMBED_PERSIST_COPY_PAGE = 1 << 0,
EMBED_PERSIST_MAINDOC = 1 << 1,
EMBED_PERSIST_NO_VIEW = 1 << 2,
- EMBED_PERSIST_ASK_DESTINATION = 1 << 3
+ EMBED_PERSIST_ASK_DESTINATION = 1 << 3,
+ EMBED_PERSIST_DO_CONVERSION = 1 << 4
} EmbedPersistFlags;
struct _EphyEmbedPersist
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 6d012d322..29d41d2fb 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -379,7 +379,8 @@ ephy_favicon_cache_download (EphyFaviconCache *cache,
(ephy_embed_factory_new_object (EPHY_TYPE_EMBED_PERSIST));
ephy_embed_persist_set_dest (persist, dest);
- ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW);
+ ephy_embed_persist_set_flags (persist, EMBED_PERSIST_NO_VIEW |
+ EMBED_PERSIST_DO_CONVERSION);
ephy_embed_persist_set_max_size (persist, 100 * 1024);
ephy_embed_persist_set_source (persist, favicon_url);
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 7e25a1faa..eec039641 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -530,7 +530,8 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI
PRInt32 flags = nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES;
- if (!domDocument && !isHTML && !(ephy_flags & EMBED_PERSIST_COPY_PAGE))
+ if (!domDocument && !isHTML && !(ephy_flags & EMBED_PERSIST_COPY_PAGE) &&
+ !(ephy_flags & EMBED_PERSIST_DO_CONVERSION))
{
flags |= nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION;
}