aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-17 02:52:27 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-17 02:52:27 +0800
commit803df66ce8311b4630402a5c6efad3922af8dd6b (patch)
tree176ff6fb68738619fb9e38365c2c83110de9fafd
parent48f9bbfc1a7c8f489ccdf949dcf61b151cadd22a (diff)
downloadgsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar.gz
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar.bz2
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar.lz
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar.xz
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.tar.zst
gsoc2013-epiphany-803df66ce8311b4630402a5c6efad3922af8dd6b.zip
Enable favicons for https: sites on gecko 1.8.
2005-10-16 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get): * embed/mozilla/EphyBrowser.cpp: Enable favicons for https: sites on gecko 1.8.
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-favicon-cache.c2
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 190042e68..f46c5c0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-16 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
+ * embed/mozilla/EphyBrowser.cpp:
+
+ Enable favicons for https: sites on gecko 1.8.
+
2005-10-15 Christian Persch <chpe@cvs.gnome.org>
* data/glade/prefs-dialog.glade:
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 53207d65b..f38ddc3a6 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -588,7 +588,7 @@ ephy_favicon_cache_get (EphyFaviconCache *cache,
if (url == NULL) return NULL;
-#ifdef HAVE_GECKO_1_9
+#ifdef HAVE_GECKO_1_8
if (!g_str_has_prefix (url, "http://") &&
!g_str_has_prefix (url, "https://")) return NULL;
#else
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 688ee482b..06f84bd94 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -181,7 +181,7 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
/* Only proceed for http favicons. Bug #312291 */
PRBool isHttp = PR_FALSE;
favUri->SchemeIs ("http", &isHttp);
-#ifdef HAVE_GECKO_1_9
+#ifdef HAVE_GECKO_1_8
PRBool isHttps = PR_FALSE;
favUri->SchemeIs ("https", &isHttps);
if (!isHttp && !isHttps) return NS_OK;