aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp16
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 029e6cd40..18c793058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-05-29 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+
+ Fix for mozilla API change (ported from galeon).
+
+2004-05-29 Christian Persch <chpe@cvs.gnome.org>
+
* configure.in:
Increase mozilla snapshot level for 1.8a2/trunk.
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 67b546b6b..b32f8bd0d 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -91,6 +91,9 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIDOMWINDOWINTERNAL
NS_DECL_NSIDOMWINDOW
+#if MOZILLA_SNAPSHOT >= 19
+ NS_DECL_NSIDOMWINDOW2
+#endif
KeyPairHelperWindow();
virtual ~KeyPairHelperWindow();
@@ -98,7 +101,11 @@ public:
gboolean close_called;
};
+#if MOZILLA_SNAPSHOT >= 19
+NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
+#else
NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow)
+#endif
KeyPairHelperWindow::KeyPairHelperWindow()
{
@@ -229,7 +236,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx,
* that arn't needed for our purposes
*************************************************************/
-#define MOZ_NOT_IMPLEMENTED { g_warning ("not implemented: " G_STRLOC); \
+#define MOZ_NOT_IMPLEMENTED { g_warning ("not implemented: %s", G_STRLOC); \
return NS_ERROR_NOT_IMPLEMENTED; }
KeyPairHelperWindow::~KeyPairHelperWindow()
@@ -242,6 +249,13 @@ NS_IMETHODIMP KeyPairHelperWindow::GetWindow(nsIDOMWindowInternal * *aWindow)
MOZ_NOT_IMPLEMENTED
}
+#if MOZILLA_SNAPSHOT >= 19
+NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent)
+{
+ MOZ_NOT_IMPLEMENTED
+}
+#endif
+
/* readonly attribute nsIDOMWindowInternal self; */
NS_IMETHODIMP KeyPairHelperWindow::GetSelf(nsIDOMWindowInternal * *aSelf)
{