galeon r8938 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 21:01:25 2008
New Revision: 8938
URL: http://svn.gnome.org/viewvc/galeon?rev=8938&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* configure.in
	* mozilla/GtkNSSDialogs.cpp
	* mozilla/GtkNSSDialogs.h: nsIBadCertListener was
	removed from gecko 1.9 and replaced by the non
	overridable nsIBadCertListener2 - which incidentally
	seems to make connecting to servers with self-signed
	certs incredibly awkward. The load fails, then you
	have to go to the certificate manager and click
	"Add Exception...', type in your URL *again* and
	then click Ok. The workflow is terrible but 
	apparently that's the point. They want to make it
	really really hard to do. *sigh*



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

Modified: trunk/mozilla/GtkNSSDialogs.cpp
==============================================================================
--- trunk/mozilla/GtkNSSDialogs.cpp	(original)
+++ trunk/mozilla/GtkNSSDialogs.cpp	Sat Feb  2 21:01:25 2008
@@ -100,9 +100,14 @@
 {
 }
 
+#ifdef HAVE_NSIBADCERTLISTENER_H
 NS_IMPL_ISUPPORTS2 (GtkNSSDialogs, 
 		    nsICertificateDialogs,
 		    nsIBadCertListener)
+#else
+NS_IMPL_ISUPPORTS1 (GtkNSSDialogs, 
+		    nsICertificateDialogs)
+#endif
 
 /**
  *  Call the mozilla service to display a certificate
@@ -286,6 +291,7 @@
 }
 
 
+#ifdef HAVE_NSIBADCERTLISTENER_H
 NS_IMETHODIMP
 GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
                                       const nsACString &targetURL,
@@ -537,6 +543,7 @@
 	gtk_widget_show_all (dialog);
 	return NS_OK;
 }
+#endif
 
 NS_IMETHODIMP 
 GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 

Modified: trunk/mozilla/GtkNSSDialogs.h
==============================================================================
--- trunk/mozilla/GtkNSSDialogs.h	(original)
+++ trunk/mozilla/GtkNSSDialogs.h	Sat Feb  2 21:01:25 2008
@@ -9,7 +9,9 @@
 #define GTKNSSDIALOGS_H 1
 
 #include <nsError.h>
+#ifdef HAVE_NSIBADCERTLISTENER_H
 #include "nsIBadCertListener.h"
+#endif
 #include "nsICertificateDialogs.h"
 
 // 7a50a10d-9425-4e12-84b1-5822edacd8ce
@@ -18,13 +20,17 @@
 
 #define GTK_NSSDIALOGS_CLASSNAME  "Gtk NSS Dialogs"
 
-class GtkNSSDialogs
-: public nsIBadCertListener,
+class GtkNSSDialogs :
+#ifdef HAVE_NSIBADCERTLISTENER_H
+  public nsIBadCertListener,
+#endif
   public nsICertificateDialogs
 {
 public:
   NS_DECL_ISUPPORTS
+#ifdef HAVE_NSIBADCERTLISTENER_H
   NS_DECL_NSIBADCERTLISTENER
+#endif
   NS_DECL_NSICERTIFICATEDIALOGS
 
   GtkNSSDialogs();