aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-15 19:02:06 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-15 19:02:06 +0800
commite7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6 (patch)
tree312820e3bb555000819d1e68c90dc1ced812ed2d /embed/mozilla
parent9d03728737c3ac793ac7a8d63398dad4053be7f9 (diff)
downloadgsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar.gz
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar.bz2
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar.lz
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar.xz
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.tar.zst
gsoc2013-epiphany-e7cd1f3559f0b0f8ad8d2ccdf3dbd4180b505ae6.zip
Fix for mozilla 1.7.3 API-non-change.
2004-09-15 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/GlobalHistory.cpp: Fix for mozilla 1.7.3 API-non-change.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.h2
-rw-r--r--embed/mozilla/GlobalHistory.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index a26005f21..40eb42a35 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -411,7 +411,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index)
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
*/
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 66e97c9e5..03fc9e750 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -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 };
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 7096daaf2..27932779d 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -133,7 +133,7 @@ NS_IMETHODIMP MozGlobalHistory::HidePage(nsIURI *aURI)
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(PRUint32 *aCount)
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)
{