More work:

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

svn path=/trunk/; revision=1395

22 files changed, 30 insertions, 30 deletions

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
 {