diff options
| author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-03-20 04:48:13 +0800 |
|---|---|---|
| committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-03-20 04:48:13 +0800 |
| commit | 28d9c881ac5b196c3e928fce0bf9b12cd6e5376b (patch) | |
| tree | e75aaa15a8a80b4e853f941f30b093dd1d683d12 | |
| parent | d3e04e67c2bb6b6f99a62ca7c8746c2768486ec7 (diff) | |
| download | gsoc2013-epiphany-28d9c881ac5b196c3e928fce0bf9b12cd6e5376b.tar.gz gsoc2013-epiphany-28d9c881ac5b196c3e928fce0bf9b12cd6e5376b.tar.zst gsoc2013-epiphany-28d9c881ac5b196c3e928fce0bf9b12cd6e5376b.zip | |
Sync Epiphany with Gecko trunk according to
2006-03-19 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/mozilla/EphySidebar.cpp:
* embed/mozilla/MozRegisterComponents.cpp:
Sync Epiphany with Gecko trunk according to
https://bugzilla.mozilla.org/show_bug.cgi?id=330420.
(Add nsIClassInfo.h).
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | embed/mozilla/EphySidebar.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/MozRegisterComponents.cpp | 4 |
3 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2006-03-19 Jean-François Rameau <jframeau@cvs.gnome.org> + + * embed/mozilla/EphySidebar.cpp: + * embed/mozilla/MozRegisterComponents.cpp: + + Sync Epiphany with Gecko trunk according to + https://bugzilla.mozilla.org/show_bug.cgi?id=330420. + (Add nsIClassInfo.h). + 2006-03-17 Wouter Bolsterlee <uws@xs4all.nl> * src/ephy-tab.c: (ephy_tab_file_monitor_cb), diff --git a/embed/mozilla/EphySidebar.cpp b/embed/mozilla/EphySidebar.cpp index fda1babd8..f1ac09516 100644 --- a/embed/mozilla/EphySidebar.cpp +++ b/embed/mozilla/EphySidebar.cpp @@ -27,6 +27,10 @@ #include <nsCRT.h> #include <nsIProgrammingLanguage.h> +#ifdef HAVE_GECKO_1_9 +#include <nsIClassInfoImpl.h> +#endif + #undef MOZILLA_INTERNAL_API #include <nsEmbedString.h> #define MOZILLA_INTERNAL_API 1 diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index 03867c699..77b52de91 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -54,6 +54,10 @@ #include <nsILocalFile.h> #include <nsNetCID.h> +#ifdef HAVE_GECKO_1_9 +#include <nsIClassInfoImpl.h> +#endif + #include <glib/gmessages.h> NS_GENERIC_FACTORY_CONSTRUCTOR(MozDownload) |