diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 6 |
3 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2004-07-02 Christian Persch <chpe@cvs.gnome.org> + + * configure.in: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + + Depend on mozilla >= 1.7 final. Simplify some mozilla + version checks. + 2004-07-02 Marco Pesenti Gritti <marco@gnome.org> * src/bookmarks/ephy-bookmark-action.c: (show_context_menu), diff --git a/configure.in b/configure.in index dfc886bf5..683a8dc31 100644 --- a/configure.in +++ b/configure.in @@ -218,7 +218,7 @@ fi AC_DEFINE_UNQUOTED(MOZILLA_TYPE, $type, [Define to the Mozilla release type.]) AC_DEFINE_UNQUOTED(MOZILLA_MICRO, $micro, [Define to the Mozilla micro version.]) -if test "$1" -lt 1 -o \( "$1" -eq 1 -a "$2" -lt 7 \) ; then +if test "$1" -lt 1 -o \( "$1" -eq 1 -a "$2" -lt 7 \) -o \( "$1" -eq 1 -a "$2" -eq 7 -a "$type" -lt 4 \); then AC_ERROR([ ***************************************************************************** Epiphany can be built using Mozilla 1.7, 1.8a1, 1.8a2 or trunk diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 95af550d3..433f5a714 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -93,7 +93,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIDOMWINDOWINTERNAL NS_DECL_NSIDOMWINDOW -#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RC, 3) && !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) +#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) NS_DECL_NSIDOMWINDOW2 #endif @@ -103,7 +103,7 @@ public: gboolean close_called; }; -#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RC, 3) && !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) +#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2) #else NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow) @@ -714,7 +714,7 @@ NS_IMETHODIMP KeyPairHelperWindow::SizeToContent() MOZ_NOT_IMPLEMENTED } -#if MOZILLA_CHECK_VERSION4 (1, 7, MOZILLA_RC, 3) && !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) +#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1) NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aWindowRoot) { |