From 8b2b5e3d6b0b00bf6d125e8cc6e2d2a6f528d4b3 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Wed, 19 May 2004 15:11:32 +0000
Subject: Fix compilation with Mozilla 1.7 branch, patch by Carlos Romero.

2004-05-19  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/MozillaPrivate.cpp:

	Fix compilation with Mozilla 1.7 branch, patch by Carlos Romero.
---
 ChangeLog                                 | 10 ++++++++++
 embed/mozilla/GtkNSSClientAuthDialogs.cpp |  2 ++
 embed/mozilla/GtkNSSDialogs.cpp           |  2 ++
 embed/mozilla/MozDownload.cpp             |  2 +-
 embed/mozilla/MozillaPrivate.cpp          |  2 ++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8b4b47144..a1dcb6b09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-19  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+	* embed/mozilla/MozDownload.cpp:
+	* embed/mozilla/MozillaPrivate.cpp:
+
+	Fix compilation with Mozilla 1.7 branch, patch by Carlos Romero.
+
 2004-05-17  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/EphySingle.cpp:
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 141a7ca18..7fb174e7a 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -29,6 +29,8 @@
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsString.h"
+#include "nsReadableUtils.h"
 
 #include <gtk/gtkversion.h>
 #include <gtk/gtkdialog.h>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index f443abef2..d25f0d883 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -44,6 +44,8 @@
 #include "nsICRLInfo.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIArray.h"
+#include "nsString.h"
+#include "nsReadableUtils.h"
 
 #include <gconf/gconf-client.h>
 #include <gtk/gtkdialog.h>
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index f4dd9687d..a477e8932 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -350,7 +350,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
 		else if (NS_SUCCEEDED (aStatus))
 		{
 			GnomeVFSMimeApplication *helperApp;
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 			char *mimeType;
 			rv = mMIMEInfo->GetMIMEType (&mimeType);
 			NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index aacb2c629..41b144969 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -29,6 +29,8 @@
 #include <nsIEmbeddingSiteWindow.h>
 #include <nsIWebBrowserChrome.h>
 #include <gtkmozembed.h>
+#include <nsReadableUtils.h>
+#include <nsString.h>
 
 #include "ephy-embed.h"
 #include "mozilla-embed.h"
-- 
cgit v1.2.3