From 3b7f38cfce0dd9997623be790e37ed2b5f9c37e3 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@ximian.com>
Date: Mon, 29 Apr 2002 06:37:25 +0000
Subject: add const to silence warning.

2002-04-29  Larry Ewing  <lewing@ximian.com>

	* importers/evolution-mbox-importer.c (process_item_fn): add const
	to silence warning.

	* mail-display.c: add gtkhtml.h include so to pick up the
	object_relative prototype.

svn path=/trunk/; revision=16625
---
 mail/ChangeLog                           | 15 +++++++++++++++
 mail/importers/evolution-mbox-importer.c |  2 +-
 mail/mail-display.c                      |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6da47295b6..178ca7eb3f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-29  Larry Ewing  <lewing@ximian.com>
+
+	* importers/evolution-mbox-importer.c (process_item_fn): add const
+	to silence warning.
+
+	* mail-display.c: add gtkhtml.h include so to pick up the
+	object_relative prototype.
+
+2002-04-26  Larry Ewing  <lewing@ximian.com>
+
+	* mail-font-prefs.c: Add the font config dialog.
+
+	* mail-font-prefs.h: add font config dialog headers.
+
 2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* Makefile.am: Don't link with libibex anymore, it's been
@@ -14,6 +28,7 @@
 	* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf):
 	New function to auto-detect the extra config options for a source.
 
+>>>>>>> 1.2146
 2002-04-24  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-account-gui.c (mail_account_gui_build_extra_conf): Allow
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 1dfeb93b40..2980e06edc 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -140,7 +140,7 @@ process_item_fn (EvolutionImporter *eimporter,
 	MailImporter *importer = (MailImporter *) mbi;
 	gboolean done = FALSE;
 	CamelException *ex;
-	char *mozilla_status;
+	const char *mozilla_status;
 
 	if (importer->folder == NULL) {
 		GNOME_Evolution_ImporterListener_notifyResult (listener,
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 5c506ffbbe..a26ba35563 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -33,6 +33,7 @@
 #include <gal/widgets/e-popup-menu.h>
 #include <gal/widgets/e-unicode.h>
 #include <gtk/gtkinvisible.h>
+#include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/htmlengine.h>	/* XXX */
 #include <gtkhtml/htmlobject.h> /* XXX */
-- 
cgit v1.2.3