From 7bb807425a00d571949c378e8bdf2edcf6ecb40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= <jframeau@cvs.gnome.org>
Date: Fri, 3 Mar 2006 13:57:27 +0000
Subject: Sync Epiphany with new nsIGlobalHistory3 stuff.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2006-03-03  Jean-François Rameau  <jframeau@cvs.gnome.org>

	* configure.ac:
	* embed/mozilla/GlobalHistory.h:
	* embed/mozilla/GlobalHistory.cpp:

	Sync Epiphany with new nsIGlobalHistory3 stuff.

	* embed/mozilla/EphyContentPolicy.cpp: (GetEmbedFromContext):

	Fix a missing return.
---
 embed/mozilla/GlobalHistory.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'embed/mozilla/GlobalHistory.h')

diff --git a/embed/mozilla/GlobalHistory.h b/embed/mozilla/GlobalHistory.h
index 992819a1e..edb01db5e 100644
--- a/embed/mozilla/GlobalHistory.h
+++ b/embed/mozilla/GlobalHistory.h
@@ -24,7 +24,11 @@
 
 #include "ephy-history.h"
 
+#ifdef HAVE_NSIGLOBALHISTORY3_H
+#include <nsIGlobalHistory3.h>
+#else
 #include <nsIGlobalHistory2.h>
+#endif /* HAVE_NSIGLOBALHISTORY3_H */
 
 #include <nsCOMPtr.h>
 #include <nsAutoPtr.h>
@@ -40,7 +44,11 @@
 	{ 0xb7, 0x9e, 0xf7, 0xaa, 0x49, 0xeb, 0x6a, 0x15}	\
 }
 
+#ifdef HAVE_NSIGLOBALHISTORY3_H
+class MozGlobalHistory: public nsIGlobalHistory3
+#else
 class MozGlobalHistory: public nsIGlobalHistory2
+#endif /* HAVE_NSIGLOBALHISTORY3_H */
 {
 	public:
 		MozGlobalHistory ();
@@ -48,6 +56,9 @@ class MozGlobalHistory: public nsIGlobalHistory2
 
 		NS_DECL_ISUPPORTS
 		NS_DECL_NSIGLOBALHISTORY2
+#ifdef HAVE_NSIGLOBALHISTORY3_H
+		NS_DECL_NSIGLOBALHISTORY3
+#endif /* HAVE_NSIGLOBALHISTORY3_H */
 
 	private:
 		EphyHistory *mGlobalHistory;
-- 
cgit v1.2.3