2004-08-10 Christian Persch <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/GlobalHistory.cpp:

3 files changed, 40 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 971851bda..4235235e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-10  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* embed/mozilla/GlobalHistory.cpp:
+
+	Yet another mozilla API change.
+
 2004-08-09  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/EphyBrowser.cpp:
diff --git a/configure.in b/configure.in
index b0df7b31e..dc3cb66d0 100644
--- a/configure.in
+++ b/configure.in
@@ -184,8 +184,8 @@ MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`"
 dnl allow user to override the autodetected mozilla version
 dnl     - without arguments for cvs head
 AC_ARG_WITH(mozilla-snapshot,
-  AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.6|1.7@:>@],
-		 [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.6|1.7
+  AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.8a2|trunk@:>@],
+		 [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.8a2|trunk
 		  @<:@guessed@:>@]),
   [autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"])
 
@@ -206,15 +206,17 @@ case "$MOZILLA_VERSION" in
 1.7.4) MOZILLA_SNAPSHOT=17 ;;
 1.7.5) MOZILLA_SNAPSHOT=17 ;;
 branch1.7) MOZILLA_SNAPSHOT=17 ;;
- 1.8a) MOZILLA_SNAPSHOT=18 ;;
-1.8a1) MOZILLA_SNAPSHOT=18 ;;
 1.8a2) MOZILLA_SNAPSHOT=19 ;;
 1.8a3) MOZILLA_SNAPSHOT=20 ;;
+ 1.8b) MOZILLA_SNAPSHOT=20 ;;
+1.8rc1) MOZILLA_SNAPSHOT=20 ;;
+  1.8) MOZILLA_SNAPSHOT=20 ;;
+branch1.8) MOZILLA_SNAPSHOT = 20 ;;
 trunk) MOZILLA_SNAPSHOT=20 ;;
     *) AC_ERROR([
 *****************************************************************************
-Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6 or 1.7,
-but the version available is $MOZILLA_VERSION.  
+Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.5.1, 1.6,  1.7,
+1.7.1, 1.7.2, 1.8a2 or trunk, but the version available is $MOZILLA_VERSION.  
 *****************************************************************************])
 esac
 
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index c6632dbc4..ee0747903 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -186,6 +186,22 @@ NS_IMETHODIMP MozGlobalHistory::HidePage(const char *aURL)
 }
 #endif /* MOZILLA_SNAPSHOT > 13 */
 
+#if MOZILLA_SNAPSHOT >= 20
+/* void removePage (in nsIURI aURL); */
+NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIRUI *aURI)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void removePagesFromHost (in AUTF8String aHost, in boolean aEntireDomain); */
+NS_IMETHODIMP MozGlobalHistory::RemovePagesFromHost(const nsACString &aHost, 
+						    PRBool aEntireDomain)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+#else
+
 /* void removePage (in string aURL); */
 NS_IMETHODIMP MozGlobalHistory::RemovePage(const char *aURL)
 {
@@ -198,7 +214,7 @@ NS_IMETHODIMP MozGlobalHistory::RemovePagesFromHost(const char *aHost,
 {
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
-
+#endif
 /* void removeAllPages (); */
 NS_IMETHODIMP MozGlobalHistory::RemoveAllPages()
 {
@@ -232,8 +248,16 @@ NS_IMETHODIMP MozGlobalHistory::GetCount(PRUint32 *aCount)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+#if MOZILLA_SNAPSHOT >= 20
+/* void markPageAsTyped (in nsIURI url); */
+NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+#else
 /* void markPageAsTyped (in string url); */
 NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(const char *url)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
+#endif