From 4ebb2a25c1e2ec41e1f951dfb64312f9aec204dd Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 23 Dec 2007 22:00:12 +0000
Subject: Add ifdefs for xr 1.9. Part of bug #503657.

svn path=/trunk/; revision=7803
---
 embed/mozilla/GtkNSSDialogs.cpp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'embed/mozilla/GtkNSSDialogs.cpp')

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)
 {
-- 
cgit v1.2.3