aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-15 19:03:00 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-15 19:03:00 +0800
commit99584ec082cd8f426a63281cb044711b49802835 (patch)
treefef15a327ba08a0464aaecbcfcbc466f2c5bebc9
parent2fd89b247f424a4aa7197397808ab83aa0caf33d (diff)
downloadgsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar.gz
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar.bz2
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar.lz
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar.xz
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.tar.zst
gsoc2013-epiphany-99584ec082cd8f426a63281cb044711b49802835.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.
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.h2
-rw-r--r--embed/mozilla/GlobalHistory.cpp4
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5849d9720..33f5ebb9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
* doc/reference/tmpl/ephy-embed.sgml:
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)
{