diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 8 |
3 files changed, 23 insertions, 5 deletions
@@ -1,5 +1,15 @@ 2004-03-05 Christian Persch <chpe@cvs.gnome.org> + * configure.in: + + Increase MOZILLA_SNAPSHOT for 1.7b, and depend on gtk+ >= 2.3.5. + + * embed/mozilla/GlobalHistory.cpp: + + Adapt to changed mozilla API. + +2004-03-05 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EphyBrowser.cpp: Don't return an error when a DOM document isn't a HTML document, it's ok diff --git a/configure.in b/configure.in index e6a31310e..0951e449d 100644 --- a/configure.in +++ b/configure.in @@ -18,8 +18,8 @@ AC_PROG_INTLTOOL([0.29]) dnl put the ACLOCAL flags in the Makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -GLIB_REQUIRED=2.3.3 -GTK_REQUIRED=2.3.4 +GLIB_REQUIRED=2.3.5 +GTK_REQUIRED=2.3.5 LIBBONOBOUI_REQUIRED=2.1.1 LIBXML_REQUIRED=2.6.6 LIBGNOMEVFS_REQUIRED=2.3.1 @@ -197,9 +197,9 @@ case "$MOZILLA_VERSION" in 1.6b) MOZILLA_SNAPSHOT=13 ;; 1.6) MOZILLA_SNAPSHOT=13 ;; 1.7a) MOZILLA_SNAPSHOT=14 ;; - 1.7b) MOZILLA_SNAPSHOT=14 ;; - 1.7) MOZILLA_SNAPSHOT=14 ;; -trunk) MOZILLA_SNAPSHOT=14 ;; + 1.7b) MOZILLA_SNAPSHOT=15 ;; + 1.7) MOZILLA_SNAPSHOT=15 ;; +trunk) MOZILLA_SNAPSHOT=15 ;; *) AC_ERROR([ ***************************************************************************** Epiphany can be built using Mozilla 1.4, 1.4.1, 1.5, 1.6a, 1.6b, 1.6, 1.7a or diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index dc836dc97..a612fb3b6 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -145,11 +145,19 @@ NS_IMETHODIMP MozGlobalHistory::RemoveAllPages() return NS_ERROR_NOT_IMPLEMENTED; } +#if MOZILLA_SNAPSHOT > 14 +/* readonly attribute AUTF8String lastPageVisited; */ +NS_IMETHODIMP MozGlobalHistory::GetLastPageVisited(nsACString & aLastPageVisited) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} +#else /* readonly attribute string lastPageVisited; */ NS_IMETHODIMP MozGlobalHistory::GetLastPageVisited(char **aLastPageVisited) { return NS_ERROR_NOT_IMPLEMENTED; } +#endif #if MOZILLA_SNAPSHOT > 8 && MOZILLA_SNAPSHOT < 14 NS_IMETHODIMP MozGlobalHistory::SetLastPageVisited(const char *aLastPageVisited) |