epiphany r7960 - trunk/embed/mozilla

[chpe svn gnome org]

Author: chpe
Date: Sun Feb 17 18:23:56 2008
New Revision: 7960
URL: http://svn.gnome.org/viewvc/epiphany?rev=7960&view=rev

Log:
No need to implement nsIBadCertListener2 here

Modified:
   trunk/embed/mozilla/GtkNSSDialogs.cpp
   trunk/embed/mozilla/GtkNSSDialogs.h

Modified: trunk/embed/mozilla/GtkNSSDialogs.cpp
==============================================================================
--- trunk/embed/mozilla/GtkNSSDialogs.cpp	(original)
+++ trunk/embed/mozilla/GtkNSSDialogs.cpp	Sun Feb 17 18:23:56 2008
@@ -111,9 +111,8 @@
 }
 
 #ifdef HAVE_GECKO_1_9
-NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs,
+NS_IMPL_THREADSAFE_ISUPPORTS4 (GtkNSSDialogs,
 			       nsITokenPasswordDialogs,
-			       nsIBadCertListener2,
 			       nsICertificateDialogs,
 			       nsITokenDialogs,
 			       nsIDOMCryptoDialogs)
@@ -392,19 +391,7 @@
 	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,

Modified: trunk/embed/mozilla/GtkNSSDialogs.h
==============================================================================
--- trunk/embed/mozilla/GtkNSSDialogs.h	(original)
+++ trunk/embed/mozilla/GtkNSSDialogs.h	Sun Feb 17 18:23:56 2008
@@ -42,9 +42,7 @@
 #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 @@
   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