From f7d57e21e46565864b78fc0377e368ba02787d6b Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 15 Oct 2005 10:36:10 +0000 Subject: Allow favicons for https: sites on gecko 1.9. 2005-10-15 Christian Persch * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download), (ephy_favicon_cache_get): * embed/mozilla/EphyBrowser.cpp: Allow favicons for https: sites on gecko 1.9. --- embed/ephy-favicon-cache.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'embed/ephy-favicon-cache.c') diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c index f06cfa41a..53207d65b 100644 --- a/embed/ephy-favicon-cache.c +++ b/embed/ephy-favicon-cache.c @@ -544,6 +544,7 @@ ephy_favicon_cache_download (EphyFaviconCache *cache, ephy_embed_persist_set_dest (persist, dest); ephy_embed_persist_set_flags (persist, EPHY_EMBED_PERSIST_NO_VIEW | + EPHY_EMBED_PERSIST_NO_CERTDIALOGS | EPHY_EMBED_PERSIST_DO_CONVERSION); ephy_embed_persist_set_max_size (persist, EPHY_FAVICON_MAX_SIZE); ephy_embed_persist_set_source (persist, favicon_url); @@ -587,7 +588,12 @@ ephy_favicon_cache_get (EphyFaviconCache *cache, if (url == NULL) return NULL; +#ifdef HAVE_GECKO_1_9 + if (!g_str_has_prefix (url, "http://") && + !g_str_has_prefix (url, "https://")) return NULL; +#else if (!g_str_has_prefix (url, "http://")) return NULL; +#endif priv->requests += 1; -- cgit v1.2.3