diff options
| author | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:00:12 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:00:12 +0800 |
| commit | 4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd (patch) | |
| tree | 7c68758443c777eb07b82b02037b33147564df2a /embed/mozilla | |
| parent | f21ba0f6e9ec1d4234484d278c57b5c8b69eea3e (diff) | |
| download | gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar.gz gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar.bz2 gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar.lz gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar.xz gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.tar.zst gsoc2013-epiphany-4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd.zip | |
Add ifdefs for xr 1.9. Part of bug #503657.
svn path=/trunk/; revision=7803
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 30 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.h | 18 |
2 files changed, 41 insertions, 7 deletions
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index ba36d817d..e9eec610f 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -110,12 +110,21 @@ GtkNSSDialogs::~GtkNSSDialogs () { } -NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, +#ifdef HAVE_GECKO_1_9 +NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, + nsITokenPasswordDialogs, + nsIBadCertListener2, nsICertificateDialogs, - nsIBadCertListener, + nsITokenDialogs, + nsIDOMCryptoDialogs) +#else +NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, nsITokenPasswordDialogs, + nsIBadCertListener, + nsICertificateDialogs, nsITokenDialogs, nsIDOMCryptoDialogs) +#endif /* There's also nsICertPickDialogs which is implemented in mozilla * but has no callers. So we don't implement it. @@ -383,7 +392,19 @@ GtkNSSDialogs::GetTokenAndSlotFromName (const PRUnichar *aName, return NS_OK; } -/* nsICertificateDialogs */ +#ifdef HAVE_GECKO_1_9 +NS_IMETHODIMP +GtkNSSDialogs::NotifyCertProblem (nsIInterfaceRequestor *socketInfo, + nsISSLStatus *status, + const nsACString &targetSite, + PRBool *_retval) +{ +#warning implement me! + *_retval = PR_FALSE; + return NS_OK; +} + +#else /* !HAVE_GECKO_1_9 */ NS_IMETHODIMP GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx, @@ -600,6 +621,8 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx, return NS_OK; } +#endif /* HAVE_GECKO_1_9 */ + NS_IMETHODIMP GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, nsIX509Cert *cert, @@ -692,7 +715,6 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, return NS_OK; } - NS_IMETHODIMP GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx) { diff --git a/embed/mozilla/GtkNSSDialogs.h b/embed/mozilla/GtkNSSDialogs.h index 2edd1ffbe..66a1f913c 100644 --- a/embed/mozilla/GtkNSSDialogs.h +++ b/embed/mozilla/GtkNSSDialogs.h @@ -22,7 +22,11 @@ #ifndef GTKNSSDIALOGS_H #define GTKNSSDIALOGS_H 1 +#ifdef HAVE_GECKO_1_9 +#include <nsIBadCertListener2.h> +#else #include <nsIBadCertListener.h> +#endif #include <nsICertificateDialogs.h> #include <nsITokenPasswordDialogs.h> #include <nsITokenDialogs.h> @@ -37,16 +41,24 @@ class nsIPKCS11Slot; #define GTK_NSSDIALOGS_CLASSNAME "Gtk NSS Dialogs" -class GtkNSSDialogs : public nsIBadCertListener, - public nsICertificateDialogs, +class GtkNSSDialogs : public nsICertificateDialogs, +#ifdef HAVE_GECKO_1_9 + public nsIBadCertListener2, +#else + public nsIBadCertListener, +#endif public nsITokenPasswordDialogs, public nsITokenDialogs, public nsIDOMCryptoDialogs { public: NS_DECL_ISUPPORTS - NS_DECL_NSIBADCERTLISTENER NS_DECL_NSICERTIFICATEDIALOGS +#ifdef HAVE_GECKO_1_9 + NS_DECL_NSIBADCERTLISTENER2 +#else + NS_DECL_NSIBADCERTLISTENER +#endif NS_DECL_NSITOKENPASSWORDDIALOGS NS_DECL_NSITOKENDIALOGS NS_DECL_NSIDOMCRYPTODIALOGS |