aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-06-02 07:04:17 +0800
committerChristian Persch <chpe@src.gnome.org>2004-06-02 07:04:17 +0800
commitc943d0d12eabfe0a4b8d68dce51a27efd81bc89c (patch)
treee1dd7b73c0cf42bf6a24843291fa85d4d1a996ef
parent6426bf06e59d88ddb6e275aee751051d480eac1b (diff)
downloadgsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar.gz
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar.bz2
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar.lz
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar.xz
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.tar.zst
gsoc2013-epiphany-c943d0d12eabfe0a4b8d68dce51a27efd81bc89c.zip
Another API change on 1.7 branch.
2004-06-02 Christian Persch <chpe@cvs.gnome.org> * configure.in: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: Another API change on 1.7 branch.
-rw-r--r--ChangeLog11
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp6
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 <chpe@cvs.gnome.org>
+
+ * configure.in:
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+
+ Another API change on 1.7 branch.
+
2004-06-01 Christian Persch <chpe@cvs.gnome.org>
* NEWS:
* configure.in:
- === Release 1.2.6 ===
-
+ Updated for 1.2.6.
+
2004-05-29 Christian Persch <chpe@cvs.gnome.org>
* 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