diff options
| author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-03-03 21:57:27 +0800 |
|---|---|---|
| committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-03-03 21:57:27 +0800 |
| commit | 7bb807425a00d571949c378e8bdf2edcf6ecb40a (patch) | |
| tree | 9e2b7686dc572e6d96fe2648c76057da609217af /embed/mozilla/GlobalHistory.h | |
| parent | 846c58ecb9f38d453a898749a0eb8e82b27c51bd (diff) | |
| download | gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar.gz gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar.bz2 gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar.lz gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar.xz gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.tar.zst gsoc2013-epiphany-7bb807425a00d571949c378e8bdf2edcf6ecb40a.zip | |
Sync Epiphany with new nsIGlobalHistory3 stuff.
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.
Diffstat (limited to 'embed/mozilla/GlobalHistory.h')
| -rw-r--r-- | embed/mozilla/GlobalHistory.h | 11 |
1 files changed, 11 insertions, 0 deletions
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; |