aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/GlobalHistory.cpp5
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 12ed68208..63b53c357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-07 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/GlobalHistory.cpp:
+
+ Build fix to build with 1.8 branch. No code changes, only
+ #ifdef code that must not be built on 1.8 branch.
+
2006-03-06 Christian Persch <chpe@cvs.gnome.org>
=== Release 1.9.99 ===
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 7a5fce6f6..1cd19c513 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -161,6 +161,9 @@ NS_IMETHODIMP MozGlobalHistory::SetPageTitle(nsIURI *aURI,
}
#ifdef HAVE_NSIGLOBALHISTORY3_H
+
+#ifdef HAVE_GECKO_1_9
+
/* unsigned long getURIGeckoFlags(in nsIURI aURI); */
NS_IMETHODIMP
MozGlobalHistory::GetURIGeckoFlags(nsIURI *aURI,
@@ -214,6 +217,8 @@ MozGlobalHistory::SetURIGeckoFlags(nsIURI *aURI,
return NS_ERROR_FAILURE;
}
+#endif /* HAVE_GECKO_1_9 */
+
/* void addDocumentRedirect (in nsIChannel
aOldChannel,
in nsIChannel aNewChannel,