diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | embed/ephy-embed-persist.h | 3 | ||||
-rw-r--r-- | embed/ephy-favicon-cache.c | 3 | ||||
-rw-r--r-- | embed/mozilla/MozDownload.cpp | 3 |
4 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,13 @@ +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. + 2004-09-15 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed.cpp: 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 1854c6813..1fb16cbfa 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 ("EphyEmbedPersist")); 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 9070b6caa..365aeaa10 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; } |