Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3661
diff -u -p -r1.3661 ChangeLog
--- ChangeLog	26 Jul 2005 16:35:43 -0000	1.3661
+++ ChangeLog	27 Jul 2005 07:57:56 -0000
@@ -1,3 +1,12 @@
+2005-07-27  Shakti Sen <shprasad@novell.com>
+
+	* em-composer-prefs.c: Included 'gtkentry.h' to resolve the
+	symbol 'GTK_ENTRY'.
+	* mail-ops.c: Included 'camel-multipart.h' to resolve the 
+	symbol 'CAMEL_IS_MULTIPART'
+
+	Partly fixes bug #231968.
+
 2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
 
 	* Makefile.am: fix make distcheck issues.
Index: em-composer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-prefs.c,v
retrieving revision 1.28
diff -u -p -r1.28 em-composer-prefs.c
--- em-composer-prefs.c	23 Jun 2005 09:11:06 -0000	1.28
+++ em-composer-prefs.c	27 Jul 2005 07:57:57 -0000
@@ -41,6 +41,7 @@
 #include <libedataserver/e-iconv.h>
 #include <misc/e-gui-utils.h>
 
+#include <gtk/gtkentry.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeselection.h>
Index: mail-ops.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-ops.c,v
retrieving revision 1.448
diff -u -p -r1.448 mail-ops.c
--- mail-ops.c	21 Jul 2005 04:15:21 -0000	1.448
+++ mail-ops.c	27 Jul 2005 07:57:59 -0000
@@ -50,6 +50,7 @@
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-vee-store.h>
 #include <camel/camel-transport.h>
+#include <camel/camel-multipart.h>
 
 #include "mail-component.h"
 #include "mail-config.h"
