diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 16 |
2 files changed, 21 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2004-05-29 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + + Fix for mozilla API change, backported from HEAD (ported from galeon). + +2004-05-29 Christian Persch <chpe@cvs.gnome.org> + * configure.in: Depend on glib >= 2.4.1 because of the fix for bug #112222. 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) { |