More work:

- Fixed some Camel API naming issues.
- Moved the message composer stuff to the `composer' directory.

svn path=/trunk/; revision=1395

50 files changed, 266 insertions, 96 deletions

diff --git a/ChangeLog b/ChangeLog
index e0ed428fdb..18cfd0b918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,51 @@
 1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
 
+	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
+	in the `Mime-Version' header.
+
+	* tests/ui-tests/msg-composer-test.c: Removed.
+
+	* Makefile.am (SUBDIRS): Added `composer'.
+
+	* configure.in: Create `composer/Makefile'.
+
+	* camel/camel-simple-data-wrapper-stream.c
+	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
+	(camel_simple_data_wrapper_stream_new): Updated accordingly.
+	* camel/camel-stream-data-wrapper.c
+	(camel_stream_data_wrapper_construct): Updated accordingly.
+
+	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
+	macro name with `CAMEL_IS...()'.
+	* camel/camel-folder-pt-proxy.h: Likewise.
+	* camel/camel-folder-summary.h: Likewise. 
+	* camel/camel-folder.h: Likewise. 
+	* camel/camel-medium.h: Likewise. 
+	* camel/camel-mime-body-part.h: Likewise.
+	* camel/camel-mime-message.h: Likewise. 
+	* camel/camel-mime-part.h: Likewise. 
+	* camel/camel-multipart.h: Likewise. 
+	* camel/camel-service.h: Likewise. 
+	* camel/camel-session.h: Likewise. 
+	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
+	* camel/camel-simple-data-wrapper.h: Likewise.
+	* camel/camel-store.h: Likewise.
+	* camel/camel-stream-buffered-fs.h: Likewise.
+	* camel/camel-stream-data-wrapper.h: Likewise. 
+	* camel/camel-stream-fs.h: Likewise. 
+	* camel/camel-stream-mem.h: Likewise. 
+	* camel/camel-stream.h: Likewise. 
+
+	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
+	changes.
+
+	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
+	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
+	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
+	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
+
+1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
+
 	* camel/camel-mime-message.c (_write_to_stream): Write
 	"Mime-Version: 1.0" to the stream.
 
diff --git a/Makefile.am b/Makefile.am
index bba70a23da..280f2610c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,9 @@
-SUBDIRS = po macros camel tests
-
-
+SUBDIRS =					\
+	po					\
+	macros					\
+	camel					\
+	composer				\
+	tests
 
 dist-hook:
 	for subdir in intl ; do \
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index e5a97f0f78..7e8fb8c72c 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -44,7 +44,7 @@ extern "C" {
 #define CAMEL_DATA_WRAPPER_TYPE     (camel_data_wrapper_get_type ())
 #define CAMEL_DATA_WRAPPER(obj)     (GTK_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))
 #define CAMEL_DATA_WRAPPER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))
-#define IS_CAMEL_DATA_WRAPPER(o)    (GTK_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
+#define CAMEL_IS_DATA_WRAPPER(o)    (GTK_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
 
 
 typedef struct 
diff --git a/camel/camel-folder-pt-proxy.h b/camel/camel-folder-pt-proxy.h
index 0c8098490b..dd0d87c7d5 100644
--- a/camel/camel-folder-pt-proxy.h
+++ b/camel/camel-folder-pt-proxy.h
@@ -45,7 +45,7 @@ extern "C" {
 #define CAMEL_FOLDER_PT_PROXY_TYPE     (camel_folder_pt_proxy_get_type ())
 #define CAMEL_FOLDER_PT_PROXY(obj)     (GTK_CHECK_CAST((obj), CAMEL_FOLDER_PT_PROXY_TYPE, CamelFolderPtProxy))
 #define CAMEL_FOLDER_PT_PROXY_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_PT_PROXY_TYPE, CamelFolderPtProxyClass))
-#define IS_CAMEL_FOLDER_PT_PROXY(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_PT_PROXY_TYPE))
+#define CAMEL_IS_FOLDER_PT_PROXY(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_PT_PROXY_TYPE))
 
 typedef struct _CamelFolderPtProxy CamelFolderPtProxy;
 
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 0b4e500c2b..bc8ea0be28 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -41,7 +41,7 @@ extern "C" {
 #define CAMEL_FOLDER_SUMMARY_TYPE     (camel_folder_summary_get_type ())
 #define CAMEL_FOLDER_SUMMARY(obj)     (GTK_CHECK_CAST((obj), CAMEL_FOLDER_SUMMARY_TYPE, CamelFolderSummary))
 #define CAMEL_FOLDER_SUMMARY_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_SUMMARY_TYPE, CamelFolderSummaryClass))
-#define IS_CAMEL_FOLDER_SUMMARY(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_SUMMARY_TYPE))
+#define CAMEL_IS_FOLDER_SUMMARY(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_SUMMARY_TYPE))
 
 typedef struct {
 	gchar *name;
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 0f2d210418..fcc84aaa04 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -46,7 +46,7 @@ typedef struct _CamelFolder CamelFolder;
 #define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())
 #define CAMEL_FOLDER(obj)     (GTK_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))
 #define CAMEL_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))
-#define IS_CAMEL_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))
+#define CAMEL_IS_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))
 
 typedef enum {
 	FOLDER_OPEN,
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 33deb52a96..a75efed3c2 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -42,7 +42,7 @@ extern "C" {
 #define CAMEL_MEDIUM_TYPE     (camel_medium_get_type ())
 #define CAMEL_MEDIUM(obj)     (GTK_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))
 #define CAMEL_MEDIUM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))
-#define IS_CAMEL_MEDIUM(o)    (GTK_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))
+#define CAMEL_IS_MEDIUM(o)    (GTK_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))
 
 
 typedef struct 
diff --git a/camel/camel-mime-body-part.h b/camel/camel-mime-body-part.h
index 59537af35a..5835dd2ec1 100644
--- a/camel/camel-mime-body-part.h
+++ b/camel/camel-mime-body-part.h
@@ -45,7 +45,7 @@ typedef struct _CamelMimeBodyPart CamelMimeBodyPart;
 #define CAMEL_MIME_BODY_PART_TYPE     (camel_mime_body_part_get_type ())
 #define CAMEL_MIME_BODY_PART(obj)     (GTK_CHECK_CAST((obj), CAMEL_MIME_BODY_PART_TYPE, CamelMimeBodyPart))
 #define CAMEL_MIME_BODY_PART_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MIME_BODY_PART_TYPE, CamelMimeBodyPartClass))
-#define IS_CAMEL_MIME_BODY_PART(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_BODY_PART_TYPE))
+#define CAMEL_IS_MIME_BODY_PART(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_BODY_PART_TYPE))
 
 
 struct _CamelMimeBodyPart
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 4742dea638..8a5928c542 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -602,7 +602,7 @@ _write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 
 	/* FIXME correct to do it here?  */
 	CAMEL_LOG_FULL_DEBUG ( "CamelMimeMessage:: Writing \"Mime-Version\"\n");
-	WHPT (stream, "Mime-Version:", "1.0");
+	WHPT (stream, "Mime-Version", "1.0");
 
 	CAMEL_DATA_WRAPPER_CLASS (parent_class)->write_to_stream (data_wrapper, stream);
 	
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 4b5bf39b25..e233f99899 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -43,15 +43,15 @@ typedef struct _CamelMimeMessage CamelMimeMessage;
 #include "camel-recipient.h"
 
 
-#define RECIPIENT_TYPE_TO "To"
-#define RECIPIENT_TYPE_CC "Cc"
-#define RECIPIENT_TYPE_BCC "Bcc"
+#define CAMEL_RECIPIENT_TYPE_TO "To"
+#define CAMEL_RECIPIENT_TYPE_CC "Cc"
+#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"
 
 
 #define CAMEL_MIME_MESSAGE_TYPE     (camel_mime_message_get_type ())
 #define CAMEL_MIME_MESSAGE(obj)     (GTK_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))
 #define CAMEL_MIME_MESSAGE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))
-#define IS_CAMEL_MIME_MESSAGE(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))
+#define CAMEL_IS_MIME_MESSAGE(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))
 
 
 
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 375d4aa0e3..b7da6f109b 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -42,7 +42,7 @@ extern "C" {
 #define CAMEL_MIME_PART_TYPE     (camel_mime_part_get_type ())
 #define CAMEL_MIME_PART(obj)     (GTK_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))
 #define CAMEL_MIME_PART_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))
-#define IS_CAMEL_MIME_PART(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))
+#define CAMEL_IS_MIME_PART(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))
 
 
 enum _CamelMimePartEncodingType {
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index a207db60cd..b53d8af4f2 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -44,7 +44,7 @@ typedef struct _CamelMultipart CamelMultipart;
 #define CAMEL_MULTIPART_TYPE     (camel_multipart_get_type ())
 #define CAMEL_MULTIPART(obj)     (GTK_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))
 #define CAMEL_MULTIPART_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))
-#define IS_CAMEL_MULTIPART(o)    (GTK_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))
+#define CAMEL_IS_MULTIPART(o)    (GTK_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))
 
 
 struct _CamelMultipart
diff --git a/camel/camel-service.h b/camel/camel-service.h
index 043c7b7203..4849273226 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -39,7 +39,7 @@ extern "C" {
 #define CAMEL_SERVICE_TYPE     (camel_service_get_type ())
 #define CAMEL_SERVICE(obj)     (GTK_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))
 #define CAMEL_SERVICE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))
-#define IS_CAMEL_SERVICE(o)    (GTK_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))
+#define CAMEL_IS_SERVICE(o)    (GTK_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))
 
 
 
diff --git a/camel/camel-session.h b/camel/camel-session.h
index 3e7b09877b..0b40e71dd7 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -44,7 +44,7 @@ typedef struct _CamelSession CamelSession;
 #define CAMEL_SESSION_TYPE     (camel_session_get_type ())
 #define CAMEL_SESSION(obj)     (GTK_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))
 #define CAMEL_SESSION_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))
-#define IS_CAMEL_SESSION(o)    (GTK_CHECK_TYPE((o), CAMEL_SESSION_TYPE))
+#define CAMEL_IS_SESSION(o)    (GTK_CHECK_TYPE((o), CAMEL_SESSION_TYPE))
 
 
 
diff --git a/camel/camel-simple-data-wrapper-stream.c b/camel/camel-simple-data-wrapper-stream.c
index 8c45c7530d..e9d4ebe8ad 100644
--- a/camel/camel-simple-data-wrapper-stream.c
+++ b/camel/camel-simple-data-wrapper-stream.c
@@ -249,9 +249,9 @@ camel_simple_data_wrapper_stream_construct (CamelSimpleDataWrapperStream *stream
 					    CamelSimpleDataWrapper *wrapper)
 {
 	g_return_if_fail (stream != NULL);
-	g_return_if_fail (IS_CAMEL_SIMPLE_DATA_WRAPPER_STREAM (stream));
+	g_return_if_fail (CAMEL_IS_SIMPLE_DATA_WRAPPER_STREAM (stream));
 	g_return_if_fail (wrapper != NULL);
-	g_return_if_fail (IS_CAMEL_SIMPLE_DATA_WRAPPER (wrapper));
+	g_return_if_fail (CAMEL_IS_SIMPLE_DATA_WRAPPER (wrapper));
 
 	gtk_object_ref (GTK_OBJECT (wrapper));
 	stream->wrapper = wrapper;
@@ -265,7 +265,7 @@ camel_simple_data_wrapper_stream_new (CamelSimpleDataWrapper *wrapper)
 	CamelStream *stream;
 
 	g_return_val_if_fail (wrapper != NULL, NULL);
-	g_return_val_if_fail (IS_CAMEL_SIMPLE_DATA_WRAPPER (wrapper), NULL);
+	g_return_val_if_fail (CAMEL_IS_SIMPLE_DATA_WRAPPER (wrapper), NULL);
 
 	stream = gtk_type_new (camel_simple_data_wrapper_stream_get_type ());
 
diff --git a/camel/camel-simple-data-wrapper-stream.h b/camel/camel-simple-data-wrapper-stream.h
index ee24fd71d3..bdb6741693 100644
--- a/camel/camel-simple-data-wrapper-stream.h
+++ b/camel/camel-simple-data-wrapper-stream.h
@@ -43,9 +43,9 @@ extern "C" {
 	(GTK_CHECK_CAST ((obj), CAMEL_TYPE_SIMPLE_DATA_WRAPPER_STREAM, CamelSimpleDataWrapperStream))
 #define CAMEL_SIMPLE_DATA_WRAPPER_STREAM_CLASS(klass) \
 	(GTK_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_SIMPLE_DATA_WRAPPER_STREAM, CamelSimpleDataWrapperStreamClass))
-#define IS_CAMEL_SIMPLE_DATA_WRAPPER_STREAM(obj) \
+#define CAMEL_IS_SIMPLE_DATA_WRAPPER_STREAM(obj) \
 	(GTK_CHECK_TYPE ((obj), CAMEL_TYPE_SIMPLE_DATA_WRAPPER_STREAM))
-#define IS_CAMEL_SIMPLE_DATA_WRAPPER_STREAM_CLASS(klass) \
+#define CAMEL_IS_SIMPLE_DATA_WRAPPER_STREAM_CLASS(klass) \
 	(GTK_CHECK_CLASS_TYPE ((obj), CAMEL_TYPE_SIMPLE_DATA_WRAPPER_STREAM))
 
 
diff --git a/camel/camel-simple-data-wrapper.h b/camel/camel-simple-data-wrapper.h
index b3be850f9d..335f512213 100644
--- a/camel/camel-simple-data-wrapper.h
+++ b/camel/camel-simple-data-wrapper.h
@@ -45,7 +45,7 @@ extern "C" {
 #define CAMEL_SIMPLE_DATA_WRAPPER_TYPE     (camel_simple_data_wrapper_get_type ())
 #define CAMEL_SIMPLE_DATA_WRAPPER(obj)     (GTK_CHECK_CAST((obj), CAMEL_SIMPLE_DATA_WRAPPER_TYPE, CamelSimpleDataWrapper))
 #define CAMEL_SIMPLE_DATA_WRAPPER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SIMPLE_DATA_WRAPPER_TYPE, CamelSimpleDataWrapperClass))
-#define IS_CAMEL_SIMPLE_DATA_WRAPPER(o)    (GTK_CHECK_TYPE((o), CAMEL_SIMPLE_DATA_WRAPPER_TYPE))
+#define CAMEL_IS_SIMPLE_DATA_WRAPPER(o)    (GTK_CHECK_TYPE((o), CAMEL_SIMPLE_DATA_WRAPPER_TYPE))
 
 
 typedef struct 
diff --git a/camel/camel-store.h b/camel/camel-store.h
index da6c085139..05a5909501 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -45,7 +45,7 @@ typedef struct _CamelStore CamelStore;
 #define CAMEL_STORE_TYPE     (camel_store_get_type ())
 #define CAMEL_STORE(obj)     (GTK_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))
 #define CAMEL_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))
-#define IS_CAMEL_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_STORE_TYPE))
+#define CAMEL_IS_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_STORE_TYPE))
 
 
 struct _CamelStore
diff --git a/camel/camel-stream-buffered-fs.h b/camel/camel-stream-buffered-fs.h
index c11edabf19..65a64b4340 100644
--- a/camel/camel-stream-buffered-fs.h
+++ b/camel/camel-stream-buffered-fs.h
@@ -41,7 +41,7 @@ extern "C" {
 #define CAMEL_STREAM_BUFFERED_FS_TYPE     (camel_stream_buffered_fs_get_type ())
 #define CAMEL_STREAM_BUFFERED_FS(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_BUFFERED_FS_TYPE, CamelStreamBufferedFs))
 #define CAMEL_STREAM_BUFFERED_FS_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFERED_FS_TYPE, CamelStreamBufferedFsClass))
-#define IS_CAMEL_STREAM_BUFFERED_FS(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_BUFFERED_FS_TYPE))
+#define CAMEL_IS_STREAM_BUFFERED_FS(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_BUFFERED_FS_TYPE))
 
 typedef enum 
 {
diff --git a/camel/camel-stream-data-wrapper.c b/camel/camel-stream-data-wrapper.c
index 564571cf09..38ac8d92c1 100644
--- a/camel/camel-stream-data-wrapper.c
+++ b/camel/camel-stream-data-wrapper.c
@@ -177,9 +177,9 @@ camel_stream_data_wrapper_construct (CamelStreamDataWrapper *wrapper,
 				     CamelStream *stream)
 {
 	g_return_if_fail (wrapper != NULL);
-	g_return_if_fail (IS_CAMEL_STREAM_DATA_WRAPPER (wrapper));
+	g_return_if_fail (CAMEL_IS_STREAM_DATA_WRAPPER (wrapper));
 	g_return_if_fail (stream != NULL);
-	g_return_if_fail (IS_CAMEL_STREAM (stream));
+	g_return_if_fail (CAMEL_IS_STREAM (stream));
 
 	wrapper->stream = stream;
 	gtk_signal_connect (GTK_OBJECT (stream), "destroy",
diff --git a/camel/camel-stream-data-wrapper.h b/camel/camel-stream-data-wrapper.h
index 3f972a99f9..b804f748d7 100644
--- a/camel/camel-stream-data-wrapper.h
+++ b/camel/camel-stream-data-wrapper.h
@@ -43,9 +43,9 @@ extern "C" {
 	(GTK_CHECK_CAST ((obj), CAMEL_TYPE_STREAM_DATA_WRAPPER, CamelStreamDataWrapper))
 #define CAMEL_STREAM_DATA_WRAPPER_CLASS(klass) \
 	(GTK_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_STREAM_DATA_WRAPPER, CamelStreamDataWrapperClass))
-#define IS_CAMEL_STREAM_DATA_WRAPPER(obj) \
+#define CAMEL_IS_STREAM_DATA_WRAPPER(obj) \
 	(GTK_CHECK_TYPE ((obj), CAMEL_TYPE_STREAM_DATA_WRAPPER))
-#define IS_CAMEL_STREAM_DATA_WRAPPER_CLASS(klass) \
+#define CAMEL_IS_STREAM_DATA_WRAPPER_CLASS(klass) \
 	(GTK_CHECK_CLASS_TYPE ((obj), CAMEL_TYPE_STREAM_DATA_WRAPPER))
 
 
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 2f33d046b3..3f27cc5bc0 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -41,7 +41,7 @@ extern "C" {
 #define CAMEL_STREAM_FS_TYPE     (camel_stream_fs_get_type ())
 #define CAMEL_STREAM_FS(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))
 #define CAMEL_STREAM_FS_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))
-#define IS_CAMEL_STREAM_FS(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))
+#define CAMEL_IS_STREAM_FS(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))
 
 typedef enum 
 {
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 1f1d2f5d25..d5d314d42d 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -41,7 +41,7 @@ extern "C" {
 #define CAMEL_STREAM_MEM_TYPE     (camel_stream_mem_get_type ())
 #define CAMEL_STREAM_MEM(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))
 #define CAMEL_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))
-#define IS_CAMEL_STREAM_MEM(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))
+#define CAMEL_IS_STREAM_MEM(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))
 
 typedef enum 
 {
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index bf63ada5d4..be2c0d2988 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -39,7 +39,7 @@ extern "C" {
 #define CAMEL_STREAM_TYPE     (camel_stream_get_type ())
 #define CAMEL_STREAM(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))
 #define CAMEL_STREAM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))
-#define IS_CAMEL_STREAM(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_TYPE))
+#define CAMEL_IS_STREAM(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_TYPE))
 
 typedef enum
 {
diff --git a/composer/.cvsignore b/composer/.cvsignore
new file mode 100644
index 0000000000..09980ae6ba
--- /dev/null
+++ b/composer/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+*.la
diff --git a/composer/ChangeLog b/composer/ChangeLog
new file mode 100644
index 0000000000..744d633eae
--- /dev/null
+++ b/composer/ChangeLog
@@ -0,0 +1,20 @@
+1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
+
+	* Makefile.am: New Makefile to compile the message composer
+	executable.
+
+	* main.c: New file.
+
+	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use
+	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones
+	that do not exist anymore.
+
+	* e-msg-composer-address-dialog.c
+	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'
+	instead of `E_GUIDIR'.
+	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
+	Likewise.
+	* e-msg-composer.c (e_msg_composer_construct): Likewise.
+
+(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the
+message composer.)
diff --git a/composer/Makefile.am b/composer/Makefile.am
new file mode 100644
index 0000000000..fe924bc9e3
--- /dev/null
+++ b/composer/Makefile.am
@@ -0,0 +1,44 @@
+gladedir = $(datadir)/evolution/glade
+
+glade_DATA =					\
+	e-msg-composer-address-dialog.glade	\
+	e-msg-composer-attachment.glade		\
+	e-msg-composer.glade
+
+INCLUDES =					\
+	-I$(top_srcdir)/camel			\
+	-I$(top_builddir)/camel			\
+	$(GNOME_INCLUDEDIR)
+
+CPPFLAGS =					\
+	-DE_GLADEDIR=\"$(gladedir)\"
+
+bin_PROGRAMS =					\
+	evolution-msg-composer
+
+evolution_msg_composer_SOURCES =		\
+	e-msg-composer-address-dialog.c		\
+	e-msg-composer-address-dialog.h		\
+	e-msg-composer-address-entry.c		\
+	e-msg-composer-address-entry.h		\
+	e-msg-composer-attachment-bar.c		\
+	e-msg-composer-attachment-bar.h		\
+	e-msg-composer-attachment.c		\
+	e-msg-composer-attachment.h		\
+	e-msg-composer-hdrs.c			\
+	e-msg-composer-hdrs.h			\
+	e-msg-composer.c			\
+	e-msg-composer.h			\
+	main.c
+
+evolution_msg_composer_LDADD = 			\
+	$(top_builddir)/camel/libcamel.la	\
+	$(GNOME_LIBDIR)				\
+	$(GNOMEUI_LIBS)				\
+	$(INTLLIBS)				\
+	$(PTHREAD_LIB)				\
+	$(EXTRA_GNOME_LIBS)
+
+
+EXTRA_DIST =					\
+	ChangeLog
diff --git a/widgets/e-msg-composer-address-dialog.c b/composer/e-msg-composer-address-dialog.c
index 412ab987df..42a594756d 100644
--- a/widgets/e-msg-composer-address-dialog.c
+++ b/composer/e-msg-composer-address-dialog.c
@@ -529,7 +529,8 @@ e_msg_composer_address_dialog_construct (EMsgComposerAddressDialog *dialog)
 				 buttons);
 
 	dialog->gui = glade_xml_new
-		(E_GUIDIR "/e-msg-composer-address-dialog.glade", "main_table");
+		(E_GLADEDIR "/e-msg-composer-address-dialog.glade",
+		 "main_table");
 	if (dialog->gui == NULL) {
 		g_warning ("Cannot load `e-msg-composer-address-dialog.glade");
 		return;
diff --git a/widgets/e-msg-composer-address-dialog.glade b/composer/e-msg-composer-address-dialog.glade
index 2249c27daf..2249c27daf 100644
--- a/widgets/e-msg-composer-address-dialog.glade
+++ b/composer/e-msg-composer-address-dialog.glade
diff --git a/widgets/e-msg-composer-address-dialog.h b/composer/e-msg-composer-address-dialog.h
index 19ffeda703..19ffeda703 100644
--- a/widgets/e-msg-composer-address-dialog.h
+++ b/composer/e-msg-composer-address-dialog.h
diff --git a/widgets/e-msg-composer-address-entry.c b/composer/e-msg-composer-address-entry.c
index be63c815f5..be63c815f5 100644
--- a/widgets/e-msg-composer-address-entry.c
+++ b/composer/e-msg-composer-address-entry.c
diff --git a/widgets/e-msg-composer-address-entry.h b/composer/e-msg-composer-address-entry.h
index 8e926272e4..8e926272e4 100644
--- a/widgets/e-msg-composer-address-entry.h
+++ b/composer/e-msg-composer-address-entry.h
diff --git a/widgets/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index f30b953d2b..b55a4cbad4 100644
--- a/widgets/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -628,7 +628,7 @@ e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar,
 	g_return_if_fail (bar != NULL);
 	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
 	g_return_if_fail (multipart != NULL);
-	g_return_if_fail (IS_CAMEL_MULTIPART (multipart));
+	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
 
 	priv = bar->priv;
 
diff --git a/widgets/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h
index 803b51a954..803b51a954 100644
--- a/widgets/e-msg-composer-attachment-bar.h
+++ b/composer/e-msg-composer-attachment-bar.h
diff --git a/widgets/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 4ab8de42c4..f4741d987f 100644
--- a/widgets/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -431,7 +431,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
 		return;
 	}
 
-	editor_gui = glade_xml_new (E_GUIDIR "/e-msg-composer-attachment.glade",
+	editor_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer-attachment.glade",
 				    NULL);
 	if (editor_gui == NULL) {
 		g_warning ("Cannot load `e-msg-composer-attachment.glade'");
diff --git a/widgets/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade
index 72c0132639..72c0132639 100644
--- a/widgets/e-msg-composer-attachment.glade
+++ b/composer/e-msg-composer-attachment.glade
diff --git a/widgets/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
index 7e3c88238b..7e3c88238b 100644
--- a/widgets/e-msg-composer-attachment.h
+++ b/composer/e-msg-composer-attachment.h
diff --git a/widgets/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index f686580fc5..2c27531bb8 100644
--- a/widgets/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -272,14 +272,14 @@ e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs,
 	g_return_if_fail (hdrs != NULL);
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
 	g_return_if_fail (msg != NULL);
-	g_return_if_fail (IS_CAMEL_MIME_MESSAGE (msg));
+	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));
 
 	s = gtk_entry_get_text (GTK_ENTRY (hdrs->priv->subject_entry));
 	camel_mime_message_set_subject (msg, g_strdup (s));
 
-	set_recipients (msg, hdrs->priv->to_entry, RECIPIENT_TYPE_TO);
-	set_recipients (msg, hdrs->priv->cc_entry, RECIPIENT_TYPE_CC);
-	set_recipients (msg, hdrs->priv->bcc_entry, RECIPIENT_TYPE_BCC);
+	set_recipients (msg, hdrs->priv->to_entry, CAMEL_RECIPIENT_TYPE_TO);
+	set_recipients (msg, hdrs->priv->cc_entry, CAMEL_RECIPIENT_TYPE_CC);
+	set_recipients (msg, hdrs->priv->bcc_entry, CAMEL_RECIPIENT_TYPE_BCC);
 }
 
 
diff --git a/widgets/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
index d053573d85..d053573d85 100644
--- a/widgets/e-msg-composer-hdrs.h
+++ b/composer/e-msg-composer-hdrs.h
diff --git a/widgets/e-msg-composer.c b/composer/e-msg-composer.c
index 8e83c3e11c..f4271ea7e6 100644
--- a/widgets/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -441,19 +441,19 @@ e_msg_composer_construct (EMsgComposer *composer)
 	gnome_app_construct (GNOME_APP (composer), "e-msg-composer",
 			     "Compose a message");
 
-	composer->menubar_gui = glade_xml_new (E_GUIDIR "/e-msg-composer.glade",
+	composer->menubar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
 					       "menubar");
 	gnome_app_set_menus (GNOME_APP (composer),
 			     GTK_MENU_BAR (glade_xml_get_widget (composer->menubar_gui,
 								 "menubar")));
 
-	composer->toolbar_gui = glade_xml_new (E_GUIDIR "/e-msg-composer.glade",
+	composer->toolbar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
 					       "toolbar");
 	gnome_app_set_toolbar (GNOME_APP (composer),
 			       GTK_TOOLBAR (glade_xml_get_widget (composer->toolbar_gui,
 								  "toolbar")));
 
-	composer->appbar_gui = glade_xml_new (E_GUIDIR "/e-msg-composer.glade",
+	composer->appbar_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer.glade",
 					      "appbar");
 	gnome_app_set_statusbar (GNOME_APP (composer),
 				 glade_xml_get_widget (composer->appbar_gui,
diff --git a/widgets/e-msg-composer.glade b/composer/e-msg-composer.glade
index b747c6f979..b747c6f979 100644
--- a/widgets/e-msg-composer.glade
+++ b/composer/e-msg-composer.glade
diff --git a/widgets/e-msg-composer.h b/composer/e-msg-composer.h
index 3028dedca3..3028dedca3 100644
--- a/widgets/e-msg-composer.h
+++ b/composer/e-msg-composer.h
diff --git a/composer/main.c b/composer/main.c
new file mode 100644
index 0000000000..8fbf01b5e8
--- /dev/null
+++ b/composer/main.c
@@ -0,0 +1,52 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+#include <gnome.h>
+
+#include <camel/camel-data-wrapper.h>
+#include <camel/camel-stream-fs.h>
+#include <camel/camel-stream.h>
+
+#include "e-msg-composer.h"
+
+static void
+send_cb (EMsgComposer *composer,
+	 gpointer data)
+{
+	CamelMimeMessage *message;
+	CamelStream *stream;
+	gint stdout_dup;
+
+	message = e_msg_composer_get_message (composer);
+
+	stdout_dup = dup (1);
+	stream = camel_stream_fs_new_with_fd (stdout_dup);
+	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
+					    stream);
+	camel_stream_close (stream);
+
+	gtk_object_unref (GTK_OBJECT (message));
+
+#if 0
+	gtk_widget_destroy (GTK_WIDGET (composer));
+	gtk_main_quit ();
+#endif
+}
+
+int
+main (int argc, char **argv)
+{
+	GtkWidget *composer;
+
+	gnome_init ("test", "0.0", argc, argv);
+	glade_gnome_init ();
+
+	composer = e_msg_composer_new ();
+	gtk_widget_show (composer);
+
+	gtk_signal_connect (GTK_OBJECT (composer), "send",
+			    GTK_SIGNAL_FUNC (send_cb), NULL);
+
+	gtk_main ();
+
+	return 0;
+}
diff --git a/configure.in b/configure.in
index e59611e040..d81d21c411 100644
--- a/configure.in
+++ b/configure.in
@@ -102,6 +102,7 @@ camel/Makefile
 camel/providers/Makefile
 camel/providers/MH/Makefile
 camel/providers/maildir/Makefile
+composer/Makefile
 devel-docs/Makefile
 devel-docs/camel/Makefile
 tests/Makefile
diff --git a/tests/test1.c b/tests/test1.c
index 1adaf0b163..5caac29c74 100644
--- a/tests/test1.c
+++ b/tests/test1.c
@@ -57,12 +57,18 @@ main (int argc, char**argv)
 	camel_mime_message_set_reply_to (message, g_strdup ("toto@toto.com"));
 	camel_mime_message_set_from (message, g_strdup ("Bertrand.Guiheneuf@aful.org"));
 
-	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, g_strdup ("franck.dechamps@alseve.fr"));
-	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, g_strdup ("mc@alseve.fr"));
-	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_TO, g_strdup ("richard.lengagne@aful.org"));
-	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_CC, g_strdup ("Francois.fleuret@aful.org"));
-	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_CC, g_strdup ("maury@justmagic.com"));
- 	camel_mime_message_add_recipient (message, RECIPIENT_TYPE_BCC, g_strdup ("Bertrand.Guiheneuf@aful.org"));
+	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
+					  g_strdup ("franck.dechamps@alseve.fr"));
+	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
+					  g_strdup ("mc@alseve.fr"));
+	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_TO, 
+					  g_strdup ("richard.lengagne@aful.org"));
+	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
+					  g_strdup ("Francois.fleuret@aful.org"));
+	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_CC, 
+					  g_strdup ("maury@justmagic.com"));
+ 	camel_mime_message_add_recipient (message, CAMEL_RECIPIENT_TYPE_BCC, 
+					  g_strdup ("Bertrand.Guiheneuf@aful.org"));
 
 	multipart = camel_multipart_new ();
 	body_part = camel_mime_body_part_new ();
diff --git a/tests/ui-tests/Makefile.am b/tests/ui-tests/Makefile.am
index 24d62047db..7c26399bbb 100644
--- a/tests/ui-tests/Makefile.am
+++ b/tests/ui-tests/Makefile.am
@@ -14,6 +14,3 @@ LDADD =							\
 	$(INTLLIBS)					\
 	$(EXTRA_GNOME_LIBS)				\
 	$(PTHREAD_LIB)
-
-noinst_PROGRAMS =				\
-	msg-composer-test
\ No newline at end of file
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index a2fa977553..01244d9674 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,22 @@
+1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
+
+	* e-msg-composer-address-dialog.c: Moved to `$(srcdir)/composer'.
+	* e-msg-composer-address-dialog.h: Likewise.
+	* e-msg-composer-address-entry.c: Likewise.
+	* e-msg-composer-address-entry.h: Likewise.
+	* e-msg-composer-attachment-bar.c: Likewise.
+	* e-msg-composer-attachment-bar.h: Likewise.
+	* e-msg-composer-attachment.c: Likewise.
+	* e-msg-composer-attachment.h: Likewise.
+	* e-msg-composer-hdrs.c: Likewise.
+	* e-msg-composer-hdrs.h: Likewise.
+	* e-msg-composer.c: Likewise.
+	* e-msg-composer.h: Likewise.
+	* e-msg-composer-address-dialog.glade: Likewise.
+	* e-msg-composer-attachment.glade: Likewise.
+	* e-msg-composer.glade: Likewise.
+	* Makefile.am: Updated accordingly.
+
 Nov 14 1999 Elliot Lee
 	* Makefile.am: It's libevolutionwidgets.la, not .a
 
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index d7c28475d1..f4b3c111cd 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,36 +1,14 @@
-guidir = $(datadir)/evolution/gui
-
-gui_DATA =					\
-	e-msg-composer-address-dialog.glade	\
-	e-msg-composer-attachment.glade		\
-	e-msg-composer.glade
-
 INCLUDES =					\
 	-I$(top_srcdir)/camel			\
 	-I$(top_builddir)/camel			\
 	$(GNOME_INCLUDEDIR)
 
-CPPFLAGS = 					\
-	-DE_GUIDIR=\"$(guidir)\"
-
 noinst_LIBRARIES =				\
 	libevolutionwidgets.a
 
 libevolutionwidgets_a_SOURCES = 		\
 	e-cursors.c				\
 	e-cursors.h				\
-	e-msg-composer-address-dialog.c		\
-	e-msg-composer-address-dialog.h		\
-	e-msg-composer-address-entry.c		\
-	e-msg-composer-address-entry.h		\
-	e-msg-composer-attachment-bar.c		\
-	e-msg-composer-attachment-bar.h		\
-	e-msg-composer-attachment.c		\
-	e-msg-composer-attachment.h		\
-	e-msg-composer-hdrs.c			\
-	e-msg-composer-hdrs.h			\
-	e-msg-composer.c			\
-	e-msg-composer.h			\
 	e-table-col.c				\
 	e-table-col.h				\
 	e-table-group.c				\
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index a2fa977553..01244d9674 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,22 @@
+1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
+
+	* e-msg-composer-address-dialog.c: Moved to `$(srcdir)/composer'.
+	* e-msg-composer-address-dialog.h: Likewise.
+	* e-msg-composer-address-entry.c: Likewise.
+	* e-msg-composer-address-entry.h: Likewise.
+	* e-msg-composer-attachment-bar.c: Likewise.
+	* e-msg-composer-attachment-bar.h: Likewise.
+	* e-msg-composer-attachment.c: Likewise.
+	* e-msg-composer-attachment.h: Likewise.
+	* e-msg-composer-hdrs.c: Likewise.
+	* e-msg-composer-hdrs.h: Likewise.
+	* e-msg-composer.c: Likewise.
+	* e-msg-composer.h: Likewise.
+	* e-msg-composer-address-dialog.glade: Likewise.
+	* e-msg-composer-attachment.glade: Likewise.
+	* e-msg-composer.glade: Likewise.
+	* Makefile.am: Updated accordingly.
+
 Nov 14 1999 Elliot Lee
 	* Makefile.am: It's libevolutionwidgets.la, not .a
 
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index d7c28475d1..f4b3c111cd 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -1,36 +1,14 @@
-guidir = $(datadir)/evolution/gui
-
-gui_DATA =					\
-	e-msg-composer-address-dialog.glade	\
-	e-msg-composer-attachment.glade		\
-	e-msg-composer.glade
-
 INCLUDES =					\
 	-I$(top_srcdir)/camel			\
 	-I$(top_builddir)/camel			\
 	$(GNOME_INCLUDEDIR)
 
-CPPFLAGS = 					\
-	-DE_GUIDIR=\"$(guidir)\"
-
 noinst_LIBRARIES =				\
 	libevolutionwidgets.a
 
 libevolutionwidgets_a_SOURCES = 		\
 	e-cursors.c				\
 	e-cursors.h				\
-	e-msg-composer-address-dialog.c		\
-	e-msg-composer-address-dialog.h		\
-	e-msg-composer-address-entry.c		\
-	e-msg-composer-address-entry.h		\
-	e-msg-composer-attachment-bar.c		\
-	e-msg-composer-attachment-bar.h		\
-	e-msg-composer-attachment.c		\
-	e-msg-composer-attachment.h		\
-	e-msg-composer-hdrs.c			\
-	e-msg-composer-hdrs.h			\
-	e-msg-composer.c			\
-	e-msg-composer.h			\
 	e-table-col.c				\
 	e-table-col.h				\
 	e-table-group.c				\