Epiphany 1.2.9 and 1.4.0 with Mozilla 1.7.3

[Christian Persch <chpe gnome org>]

Hi,

Epiphany 1.2.9 and 1.4.0 will not compile against Mozilla 1.7.3
out-of-the box; you need the attached patch.
I couldn't find RPMs for 1.7.3 yet, so the patches are untested but
should work. Please let me know if there are any problems.

Regards,
	Christian

--- epiphany-1.2.9/configure	2004-09-11 16:32:47.000000000 +0200
+++ configure	2004-09-15 12:45:52.450829375 +0200
@@ -22061,7 +22061,7 @@
   1.7) MOZILLA_SNAPSHOT=17 ;;
 1.7.1) MOZILLA_SNAPSHOT=17 ;;
 1.7.2) MOZILLA_SNAPSHOT=17 ;;
-1.7.3) MOZILLA_SNAPSHOT=18 ;;
+1.7.3) MOZILLA_SNAPSHOT=17 ;;
 1.7.4) MOZILLA_SNAPSHOT=18 ;;
 1.7.5) MOZILLA_SNAPSHOT=18 ;;
 branch1.7) MOZILLA_SNAPSHOT=18 ;;
--- epiphany-1.2.9/configure.in	2004-09-05 01:02:32.000000000 +0200
+++ configure.in	2004-09-15 12:46:04.709946897 +0200
@@ -205,7 +205,7 @@
   1.7) MOZILLA_SNAPSHOT=17 ;;
 1.7.1) MOZILLA_SNAPSHOT=17 ;;
 1.7.2) MOZILLA_SNAPSHOT=17 ;;
-1.7.3) MOZILLA_SNAPSHOT=18 ;;
+1.7.3) MOZILLA_SNAPSHOT=17 ;;
 1.7.4) MOZILLA_SNAPSHOT=18 ;;
 1.7.5) MOZILLA_SNAPSHOT=18 ;;
 branch1.7) MOZILLA_SNAPSHOT=18 ;;

Index: EphyBrowser.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyBrowser.cpp,v
retrieving revision 1.53
diff -u -p -r1.53 EphyBrowser.cpp
--- EphyBrowser.cpp	8 Aug 2004 18:11:56 -0000	1.53
+++ EphyBrowser.cpp	15 Sep 2004 10:36:35 -0000
@@ -411,7 +411,7 @@ nsresult EphyBrowser::GoToHistoryIndex (
 	return ContentNav->GotoIndex (index);
 }
 
-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 /* Workaround for broken reload with frames, see mozilla bug
  * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
  */
Index: EphyBrowser.h
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyBrowser.h,v
retrieving revision 1.25
diff -u -p -r1.25 EphyBrowser.h
--- EphyBrowser.h	8 Aug 2004 18:11:56 -0000	1.25
+++ EphyBrowser.h	15 Sep 2004 10:36:35 -0000
@@ -112,7 +112,7 @@ public:
 	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
 	nsresult GoToHistoryIndex (PRInt16 index);
 
-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 	enum ReloadType { RELOAD_NORMAL		 = 0,
 			  RELOAD_FORCE		 = 1,
 			  RELOAD_ENCODING_CHANGE = 2 };
Index: GlobalHistory.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GlobalHistory.cpp,v
retrieving revision 1.26
diff -u -p -r1.26 GlobalHistory.cpp
--- GlobalHistory.cpp	27 Aug 2004 20:39:10 -0000	1.26
+++ GlobalHistory.cpp	15 Sep 2004 10:36:35 -0000
@@ -133,7 +133,7 @@ NS_IMETHODIMP MozGlobalHistory::HidePage
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 /* void removePage (in nsIURI aURI); */
 NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
 {
@@ -179,7 +179,7 @@ NS_IMETHODIMP MozGlobalHistory::GetCount
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 /* void markPageAsTyped (in AUTF8String aURI) */
 NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
 {