diff options
| author | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:35:34 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:35:34 +0800 |
| commit | a29474a22ebb70a760712605ad738c6117661d22 (patch) | |
| tree | f0ea415c8014efff9678c5ff7f68778b6bf4b146 | |
| parent | 8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015 (diff) | |
| download | gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar.gz gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar.bz2 gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar.lz gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar.xz gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.tar.zst gsoc2013-epiphany-a29474a22ebb70a760712605ad738c6117661d22.zip | |
Xr 1.9 fixes. Bug #503657.
svn path=/trunk/; revision=7807
| -rw-r--r-- | embed/mozilla/EphyHeaderSniffer.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/MozDownload.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp index 722ea8672..3ba938254 100644 --- a/embed/mozilla/EphyHeaderSniffer.cpp +++ b/embed/mozilla/EphyHeaderSniffer.cpp @@ -73,7 +73,9 @@ #include "ephy-gui.h" #include "ephy-prefs.h" +#ifndef HAVE_GECKO_1_9 #include "EphyBadCertRejector.h" +#endif #include "MozDownload.h" #include "EphyHeaderSniffer.h" @@ -223,6 +225,7 @@ EphyHeaderSniffer::OnSecurityChange (nsIWebProgress *aWebProgress, nsIRequest *a NS_IMETHODIMP EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result) { +#ifndef HAVE_GECKO_1_9 if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) && mEmbedPersist) { @@ -241,6 +244,7 @@ EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result) return NS_OK; } } +#endif return NS_ERROR_NO_INTERFACE; } diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index b5efe085a..254738f18 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -69,7 +69,10 @@ #include <nsNetError.h> #include <nsServiceManagerUtils.h> +#ifndef HAVE_GECKO_1_9 #include "EphyBadCertRejector.h" +#endif + #include "EphyUtils.h" #include "eel-gconf-extensions.h" @@ -505,6 +508,7 @@ MozDownload::OnSecurityChange (nsIWebProgress *aWebProgress, nsIRequest *aReques NS_IMETHODIMP MozDownload::GetInterface(const nsIID & uuid, void * *result) { +#ifndef HAVE_GECKO_1_9 if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) && mEmbedPersist) { @@ -523,7 +527,7 @@ MozDownload::GetInterface(const nsIID & uuid, void * *result) return NS_OK; } } - +#endif return NS_ERROR_NO_INTERFACE; } |