From c943d0d12eabfe0a4b8d68dce51a27efd81bc89c Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 1 Jun 2004 23:04:17 +0000 Subject: Another API change on 1.7 branch. 2004-06-02 Christian Persch * configure.in: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: Another API change on 1.7 branch. --- ChangeLog | 11 +++++++++-- embed/mozilla/GtkNSSKeyPairDialogs.cpp | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b683692f9..aafe65fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ +2004-06-02 Christian Persch + + * configure.in: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + + Another API change on 1.7 branch. + 2004-06-01 Christian Persch * NEWS: * configure.in: - === Release 1.2.6 === - + Updated for 1.2.6. + 2004-05-29 Christian Persch * embed/mozilla/GlobalHistory.cpp: diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 8a0a970e1..d06a5b8d1 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -86,7 +86,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIDOMWINDOWINTERNAL NS_DECL_NSIDOMWINDOW -#if MOZILLA_SNAPSHOT >= 19 +#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19 NS_DECL_NSIDOMWINDOW2 #endif @@ -96,7 +96,7 @@ public: gboolean close_called; }; -#if MOZILLA_SNAPSHOT >= 19 +#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19 NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2) #else NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow) @@ -244,7 +244,7 @@ NS_IMETHODIMP KeyPairHelperWindow::GetWindow(nsIDOMWindowInternal * *aWindow) MOZ_NOT_IMPLEMENTED } -#if MOZILLA_SNAPSHOT >= 19 +#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19 NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent) { MOZ_NOT_IMPLEMENTED -- cgit v1.2.3