aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-15 18:36:10 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-15 18:36:10 +0800
commitf7d57e21e46565864b78fc0377e368ba02787d6b (patch)
treeadeeb8a7c80806477da668200a8ea6737e73600d /embed/mozilla
parentdd8feacdf3a79df410589087e09a2831521c8d9c (diff)
downloadgsoc2013-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/mozilla')
-rw-r--r--embed/mozilla/EphyBrowser.cpp6
1 files changed, 6 insertions, 0 deletions
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