diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-10-15 18:36:10 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-10-15 18:36:10 +0800 |
| commit | f7d57e21e46565864b78fc0377e368ba02787d6b (patch) | |
| tree | adeeb8a7c80806477da668200a8ea6737e73600d /embed | |
| parent | dd8feacdf3a79df410589087e09a2831521c8d9c (diff) | |
| download | gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar.gz gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar.bz2 gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar.lz gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar.xz gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.tar.zst gsoc2013-epiphany-f7d57e21e46565864b78fc0377e368ba02787d6b.zip | |
Allow favicons for https: sites on gecko 1.9.
2005-10-15 Christian Persch <chpe@cvs.gnome.org>
* 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.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/ephy-favicon-cache.c | 6 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
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; diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 1bc8fc440..688ee482b 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -181,7 +181,13 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent) /* Only proceed for http favicons. Bug #312291 */ PRBool isHttp = PR_FALSE; favUri->SchemeIs ("http", &isHttp); +#ifdef HAVE_GECKO_1_9 + PRBool isHttps = PR_FALSE; + favUri->SchemeIs ("https", &isHttps); + if (!isHttp && !isHttps) return NS_OK; +#else if (!isHttp) return NS_OK; +#endif /* check if load is allowed */ nsCOMPtr<nsIScriptSecurityManager> secMan |