From c630e8b595539f53cb272cf24a638421ce230a60 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 29 May 2004 14:06:32 +0000 Subject: Fix for mozilla API change, backported from HEAD (ported from galeon). 2004-05-29 Christian Persch * embed/mozilla/GtkNSSKeyPairDialogs.cpp: Fix for mozilla API change, backported from HEAD (ported from galeon). --- ChangeLog | 6 ++++++ embed/mozilla/GtkNSSKeyPairDialogs.cpp | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e99b7464..c4315e343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-29 Christian Persch + + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + + Fix for mozilla API change, backported from HEAD (ported from galeon). + 2004-05-29 Christian Persch * configure.in: diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 031f3b822..8a0a970e1 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -86,6 +86,9 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIDOMWINDOWINTERNAL NS_DECL_NSIDOMWINDOW +#if MOZILLA_SNAPSHOT >= 19 + NS_DECL_NSIDOMWINDOW2 +#endif KeyPairHelperWindow(); virtual ~KeyPairHelperWindow(); @@ -93,7 +96,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() { @@ -224,7 +231,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() @@ -237,6 +244,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) { -- cgit v1.2.3