Merge with camel-async.

svn path=/trunk/; revision=4687

1 files changed, 5 insertions, 5 deletions

diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index 8df09fa848..4a3074ae20 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -38,9 +38,9 @@ extern "C" {
 #include <camel/gmime-content-field.h>
 
 #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 CAMEL_IS_DATA_WRAPPER(o)    (GTK_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
+#define CAMEL_DATA_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))
+#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))
+#define CAMEL_IS_DATA_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
 
 struct _CamelDataWrapper
 {
@@ -72,8 +72,8 @@ typedef struct {
 						       CamelStream *);
 } CamelDataWrapperClass;
 
-/* Standard Gtk function */
-GtkType camel_data_wrapper_get_type (void);
+/* Standard Camel function */
+CamelType camel_data_wrapper_get_type (void);
 
 /* public methods */
 CamelDataWrapper *  camel_data_wrapper_new(void);