aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-08-28 04:39:10 +0800
committerChristian Persch <chpe@src.gnome.org>2004-08-28 04:39:10 +0800
commitfc86ddf59abd40064eeb80748e67339a07f4f5e8 (patch)
tree6f36349b829cff020fe468ca3770ac5bc061a430
parent684585cc9d6630f541440f692b26d2385f597aba (diff)
downloadgsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar.gz
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar.bz2
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar.lz
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar.xz
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.tar.zst
gsoc2013-epiphany-fc86ddf59abd40064eeb80748e67339a07f4f5e8.zip
Mozilla API change on stable branch.
2004-08-27 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/GlobalHistory.cpp: Mozilla API change on stable branch.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/GlobalHistory.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dba0e5498..0ef04629b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-08-27 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/GlobalHistory.cpp:
+
+ Mozilla API change on stable branch.
+
+2004-08-27 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/MozDownload.cpp:
QI instead of cast.
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 8e4d3513f..7096daaf2 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_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || 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_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
/* void markPageAsTyped (in AUTF8String aURI) */
NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
{