diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-02-18 02:23:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-02-18 02:23:56 +0800 |
| commit | 9a49d09baacec3da332b6473590f26ab459c9bd8 (patch) | |
| tree | 5d7d0109d714ca483744016339b814644ff304b4 | |
| parent | 861720c0698e978b8278ab17f003c297f44beff4 (diff) | |
| download | gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar.gz gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar.bz2 gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar.lz gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar.xz gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.tar.zst gsoc2013-epiphany-9a49d09baacec3da332b6473590f26ab459c9bd8.zip | |
No need to implement nsIBadCertListener2 here
svn path=/trunk/; revision=7960
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 17 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.h | 8 |
2 files changed, 4 insertions, 21 deletions
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index b28c8b669..3af7aec22 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -111,9 +111,8 @@ GtkNSSDialogs::~GtkNSSDialogs () } #ifdef HAVE_GECKO_1_9 -NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, +NS_IMPL_THREADSAFE_ISUPPORTS4 (GtkNSSDialogs, nsITokenPasswordDialogs, - nsIBadCertListener2, nsICertificateDialogs, nsITokenDialogs, nsIDOMCryptoDialogs) @@ -392,19 +391,7 @@ GtkNSSDialogs::GetTokenAndSlotFromName (const PRUnichar *aName, return NS_OK; } -#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 */ +#ifndef HAVE_GECKO_1_9 NS_IMETHODIMP GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx, diff --git a/embed/mozilla/GtkNSSDialogs.h b/embed/mozilla/GtkNSSDialogs.h index 66a1f913c..467cb3ff4 100644 --- a/embed/mozilla/GtkNSSDialogs.h +++ b/embed/mozilla/GtkNSSDialogs.h @@ -42,9 +42,7 @@ class nsIPKCS11Slot; #define GTK_NSSDIALOGS_CLASSNAME "Gtk NSS Dialogs" class GtkNSSDialogs : public nsICertificateDialogs, -#ifdef HAVE_GECKO_1_9 - public nsIBadCertListener2, -#else +#ifndef HAVE_GECKO_1_9 public nsIBadCertListener, #endif public nsITokenPasswordDialogs, @@ -54,9 +52,7 @@ class GtkNSSDialogs : public nsICertificateDialogs, public: NS_DECL_ISUPPORTS NS_DECL_NSICERTIFICATEDIALOGS -#ifdef HAVE_GECKO_1_9 - NS_DECL_NSIBADCERTLISTENER2 -#else +#ifndef HAVE_GECKO_1_9 NS_DECL_NSIBADCERTLISTENER #endif NS_DECL_NSITOKENPASSWORDDIALOGS |