From 455e2d1a2cc0a32276999dcd9396ceb310346755 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Sun, 23 May 2004 01:06:34 +0000
Subject: Fix some headers fallouts with mozilla head

2004-05-23  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/EphyBrowser.cpp:
        * embed/mozilla/EphyBrowser.h:
        * embed/mozilla/MozillaPrivate.cpp:

        Fix some headers fallouts with mozilla head
---
 ChangeLog                        | 8 ++++++++
 embed/mozilla/EphyBrowser.cpp    | 1 -
 embed/mozilla/EphyBrowser.h      | 4 ++++
 embed/mozilla/MozillaPrivate.cpp | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d98224cba..84d6bb584 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-23  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EphyBrowser.h:
+	* embed/mozilla/MozillaPrivate.cpp:
+
+	Fix some headers fallouts with mozilla head
+
 2004-05-22  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/ContentHandler.h:
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 6c08d7b3f..7500058c0 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -69,7 +69,6 @@
 #endif
 
 #ifdef ALLOW_PRIVATE_STRINGS
-#include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsIDocument.h"
 #include "nsIDeviceContext.h"
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 4fef54986..f244fc60b 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -34,6 +34,10 @@
 #include <nsIDOMWindow.h>
 #include <nsIPrintSettings.h>
 
+#ifdef ALLOW_PRIVATE_STRINGS
+#include "nsString.h"
+#endif
+
 #ifdef ALLOW_PRIVATE_API
 #include <nsIDocShell.h>
 #include <nsIDOMEventReceiver.h>
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index daa3e284d..cfd69173e 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -33,6 +33,11 @@
 #include <nsIWebBrowserChrome.h>
 #include <gtkmozembed.h>
 
+#ifdef ALLOW_PRIVATE_STRINGS
+#include "nsString.h"
+#include "nsReadableUtils.h"
+#endif
+
 GtkWidget *MozillaFindEmbed (nsIDOMWindow *aDOMWindow)
 {
 	if (!aDOMWindow) return nsnull;
-- 
cgit v1.2.3