1 diff -urN aa/epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp
2 --- aa/epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp 2004-08-08 20:11:56.000000000 +0200
3 +++ epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp 2004-09-16 21:05:00.854210904 +0200
5 return ContentNav->GotoIndex (index);
8 -#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
9 +#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
10 /* Workaround for broken reload with frames, see mozilla bug
11 * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
13 diff -urN aa/epiphany-1.4.0/embed/mozilla/EphyBrowser.h epiphany-1.4.0/embed/mozilla/EphyBrowser.h
14 --- aa/epiphany-1.4.0/embed/mozilla/EphyBrowser.h 2004-08-08 20:11:56.000000000 +0200
15 +++ epiphany-1.4.0/embed/mozilla/EphyBrowser.h 2004-09-16 21:05:30.466709120 +0200
17 nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
18 nsresult GoToHistoryIndex (PRInt16 index);
20 -#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
21 +#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
22 enum ReloadType { RELOAD_NORMAL = 0,
24 RELOAD_ENCODING_CHANGE = 2 };
25 diff -urN aa/epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp
26 --- aa/epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp 2004-08-27 22:39:10.000000000 +0200
27 +++ epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp 2004-09-16 21:06:08.193973704 +0200
29 return NS_ERROR_NOT_IMPLEMENTED;
32 -#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
33 +#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
34 /* void removePage (in nsIURI aURI); */
35 NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
38 return NS_ERROR_NOT_IMPLEMENTED;
41 -#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
42 +#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
43 /* void markPageAsTyped (in AUTF8String aURI) */
44 NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)