diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/ephy-favicon-cache.c | 2 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -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; |