[evolution-data-server/camel-gobject] Adding GObject macros.

From: Matthew Barnes <mbarnes src gnome org>
To: svn-commits-list gnome org
Subject: [evolution-data-server/camel-gobject] Adding GObject macros.
Date: Sat, 25 Apr 2009 20:27:15 -0400 (EDT)
commit 5587c53385b5a42c13eccc0c43fe8eadeaf88d45
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Apr 22 11:07:23 2009 -0400

    Adding GObject macros.
---
 camel/camel-arg.h                                  |    2 +-
 camel/camel-data-cache.h                           |    2 +-
 camel/camel-data-wrapper.h                         |    2 +-
 camel/camel-debug.h                                |    2 +-
 camel/camel-digest-folder.c                        |    2 +-
 camel/camel-disco-diary.h                          |   13 +++---
 camel/camel-disco-folder.c                         |    2 +-
 camel/camel-disco-folder.h                         |   31 ++++++++++++---
 camel/camel-disco-store.c                          |    4 +-
 camel/camel-disco-store.h                          |   40 ++++++++++++++-----
 camel/camel-exception.h                            |    2 +-
 camel/camel-file-utils.h                           |    2 +-
 camel/camel-folder.h                               |   24 +++++++++--
 camel/camel-http-stream.h                          |    5 +-
 camel/camel-medium.h                               |   33 ++++++++++++----
 camel/camel-mime-message.h                         |    2 +-
 camel/camel-mime-part-utils.h                      |    2 +-
 camel/camel-mime-part.c                            |    2 +-
 camel/camel-mime-part.h                            |    2 +-
 camel/camel-mime-tables.c                          |   34 +++++++++++++++++
 camel/camel-movemail.h                             |    2 +-
 camel/camel-multipart-signed.h                     |    2 +-
 camel/camel-multipart.h                            |    2 +-
 camel/camel-net-utils.h                            |    2 +-
 camel/camel-object.h                               |    2 +-
 camel/camel-offline-folder.c                       |    4 +-
 camel/camel-operation.h                            |    2 +-
 camel/camel-private.h                              |    2 +-
 camel/camel-provider.h                             |    2 +-
 camel/camel-seekable-stream.h                      |    2 +-
 camel/camel-seekable-substream.h                   |    2 +-
 camel/camel-service.h                              |    2 +-
 camel/camel-session.h                              |    2 +-
 camel/camel-store.h                                |    2 +-
 camel/camel-stream-fs.h                            |    2 +-
 camel/camel-stream-vfs.h                           |    2 +-
 camel/camel-stream.h                               |    2 +-
 camel/camel-transport.h                            |    2 +-
 camel/camel-types.h                                |    7 +---
 camel/camel-uid-cache.h                            |    2 +-
 camel/camel-url.h                                  |    2 +-
 camel/camel.h                                      |    2 +-
 camel/providers/groupwise/camel-groupwise-folder.h |   32 ++++++++++++----
 .../providers/groupwise/camel-groupwise-private.h  |    2 +-
 .../groupwise/camel-groupwise-store-summary.c      |    2 +-
 .../groupwise/camel-groupwise-store-summary.h      |   23 +++++++++--
 camel/providers/groupwise/camel-groupwise-store.h  |    2 +-
 .../providers/groupwise/camel-groupwise-summary.c  |    2 +-
 .../providers/groupwise/camel-groupwise-summary.h  |   21 +++++++++-
 .../groupwise/camel-groupwise-transport.h          |    2 +-
 camel/providers/imap/camel-imap-command.h          |    2 +-
 camel/providers/imap/camel-imap-folder.h           |    2 +-
 camel/providers/imap/camel-imap-message-cache.h    |    2 +-
 camel/providers/imap/camel-imap-private.h          |    2 +-
 camel/providers/imap/camel-imap-store.h            |    2 +-
 camel/providers/imap/camel-imap-utils.h            |    2 +-
 camel/providers/imap/camel-imap-wrapper.h          |    2 +-
 camel/providers/imapp/camel-imapp-folder.h         |    2 +-
 camel/providers/imapp/camel-imapp-store.h          |    2 +-
 camel/providers/local/camel-local-folder.h         |    2 +-
 camel/providers/local/camel-local-private.h        |    2 +-
 camel/providers/local/camel-local-store.h          |    2 +-
 camel/providers/local/camel-maildir-store.h        |    2 +-
 camel/providers/local/camel-mbox-folder.h          |    2 +-
 camel/providers/local/camel-mbox-store.h           |    2 +-
 camel/providers/local/camel-mh-folder.h            |    2 +-
 camel/providers/local/camel-mh-store.h             |    2 +-
 camel/providers/local/camel-spool-folder.h         |    2 +-
 camel/providers/local/camel-spool-store.h          |    2 +-
 camel/providers/nntp/camel-nntp-auth.h             |    2 +-
 camel/providers/nntp/camel-nntp-folder.c           |    2 +-
 camel/providers/nntp/camel-nntp-grouplist.h        |    2 +-
 camel/providers/nntp/camel-nntp-private.h          |    2 +-
 camel/providers/nntp/camel-nntp-resp-codes.h       |    2 +-
 camel/providers/nntp/camel-nntp-store.c            |    2 +-
 camel/providers/nntp/camel-nntp-store.h            |    2 +-
 camel/providers/nntp/camel-nntp-types.h            |    2 +-
 camel/providers/nntp/camel-nntp-utils.h            |    2 +-
 camel/providers/pop3/camel-pop3-folder.c           |    2 +-
 camel/providers/pop3/camel-pop3-folder.h           |    2 +-
 camel/providers/pop3/camel-pop3-store.h            |    2 +-
 .../providers/sendmail/camel-sendmail-transport.h  |    2 +-
 camel/providers/smtp/camel-smtp-transport.h        |   36 +++++++++++++-----
 83 files changed, 300 insertions(+), 145 deletions(-)

diff --git a/camel/camel-arg.h b/camel/camel-arg.h
index 09a129f..3f5829d 100644
--- a/camel/camel-arg.h
+++ b/camel/camel-arg.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_ARG_H
-#define CAMEL_ARG_H 1
+#define CAMEL_ARG_H
 
 #include <glib.h>
 #include <stdarg.h>
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index 20ae5ed..90dd6fd 100644
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -22,7 +22,7 @@
 
 
 #ifndef CAMEL_DATA_CACHE_H
-#define CAMEL_DATA_CACHE_H 1
+#define CAMEL_DATA_CACHE_H
 
 #include <glib.h>
 
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index 8f3d3d4..601f300 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_DATA_WRAPPER_H
-#define CAMEL_DATA_WRAPPER_H 1
+#define CAMEL_DATA_WRAPPER_H
 
 #include <glib.h>
 #include <sys/types.h>
diff --git a/camel/camel-debug.h b/camel/camel-debug.h
index 12382fa..28d2590 100644
--- a/camel/camel-debug.h
+++ b/camel/camel-debug.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_DEBUG_H
-#define CAMEL_DEBUG_H 1
+#define CAMEL_DEBUG_H
 
 #include <glib.h>
 
diff --git a/camel/camel-digest-folder.c b/camel/camel-digest-folder.c
index b7c7146..8a41cde 100644
--- a/camel/camel-digest-folder.c
+++ b/camel/camel-digest-folder.c
@@ -136,7 +136,7 @@ camel_digest_folder_get_type (void)
 	static GType type = G_TYPE_INVALID;
 	
 	if (type == G_TYPE_INVALID) {
-		type = camel_type_register (CAMEL_FOLDER_TYPE,
+		type = camel_type_register (CAMEL_TYPE_FOLDER,
 					    "CamelDigestFolder",
 					    sizeof (CamelDigestFolder),
 					    sizeof (CamelDigestFolderClass),
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index bd85e0e..7156c4e 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -24,11 +24,11 @@
 #ifndef CAMEL_DISABLE_DEPRECATED
 
 #ifndef CAMEL_DISCO_DIARY_H
-#define CAMEL_DISCO_DIARY_H 1
+#define CAMEL_DISCO_DIARY_H
 
-#include "camel-object.h"
 #include <stdarg.h>
 #include <stdio.h>
+#include <camel/camel-disco-store.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_DISCO_DIARY \
@@ -51,6 +51,9 @@
 
 G_BEGIN_DECLS
 
+typedef struct _CamelDiscoDiary CamelDiscoDiary;
+typedef struct _CamelDiscoDiaryClass CamelDiscoDiaryClass;
+
 typedef enum {
 	CAMEL_DISCO_DIARY_END = 0,
 
@@ -75,11 +78,9 @@ struct _CamelDiscoDiary {
 	GHashTable *folders, *uidmap;
 };
 
-typedef struct {
+struct _CamelDiscoDiaryClass {
 	CamelObjectClass parent_class;
-
-} CamelDiscoDiaryClass;
-
+};
 
 /* public methods */
 CamelDiscoDiary *camel_disco_diary_new    (CamelDiscoStore *store,
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index 00b030f..344948a 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -169,7 +169,7 @@ camel_disco_folder_get_type (void)
 
 	if (camel_disco_folder_type == G_TYPE_INVALID) {
 		camel_disco_folder_type = camel_type_register (
-			CAMEL_FOLDER_TYPE, "CamelDiscoFolder",
+			CAMEL_TYPE_FOLDER, "CamelDiscoFolder",
 			sizeof (CamelDiscoFolder),
 			sizeof (CamelDiscoFolderClass),
 			(CamelObjectClassInitFunc)camel_disco_folder_class_init, NULL,
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index 858a6a2..26e077b 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -24,17 +24,34 @@
 #ifndef CAMEL_DISABLE_DEPRECATED
 
 #ifndef CAMEL_DISCO_FOLDER_H
-#define CAMEL_DISCO_FOLDER_H 1
+#define CAMEL_DISCO_FOLDER_H
 
 #include "camel-folder.h"
 
-#define CAMEL_DISCO_FOLDER_TYPE     (camel_disco_folder_get_type ())
-#define CAMEL_DISCO_FOLDER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolder))
-#define CAMEL_DISCO_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolderClass))
-#define CAMEL_IS_DISCO_FOLDER(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_DISCO_FOLDER_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_DISCO_FOLDER \
+	(camel_disco_folder_get_type ())
+#define CAMEL_DISCO_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_DISCO_FOLDER, CamelDiscoFolder))
+#define CAMEL_DISCO_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_DISCO_FOLDER, CamelDiscoFolderClass))
+#define CAMEL_IS_DISCO_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_DISCO_FOLDER))
+#define CAMEL_IS_DISCO_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_DISCO_FOLDER))
+#define CAMEL_DISCO_FOLDER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_DISCO_FOLDER, CamelDiscoFolderClass))
 
 G_BEGIN_DECLS
 
+typedef struct _CamelDiscoFolder CamelDiscoFolder;
+typedef struct _CamelDiscoFolderClass CamelDiscoFolderClass;
+
 enum {
 	CAMEL_DISCO_FOLDER_ARG_OFFLINE_SYNC = CAMEL_FOLDER_ARG_LAST,
 	CAMEL_DISCO_FOLDER_ARG_LAST = CAMEL_FOLDER_ARG_LAST + 0x100
@@ -50,7 +67,7 @@ struct _CamelDiscoFolder {
 	unsigned int offline_sync:1;
 };
 
-typedef struct {
+struct _CamelDiscoFolderClass {
 	CamelFolderClass parent_class;
 
 	void (*refresh_info_online) (CamelFolder *folder, CamelException *ex);
@@ -106,7 +123,7 @@ typedef struct {
 
 	void (*update_uid) (CamelFolder *folder, const char *old_uid,
 			    const char *new_uid);
-} CamelDiscoFolderClass;
+};
 
 
 /* public methods */
diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
index dbad86b..6ea8c0f 100644
--- a/camel/camel-disco-store.c
+++ b/camel/camel-disco-store.c
@@ -321,7 +321,7 @@ set_status(CamelDiscoStore *disco_store, CamelDiscoStoreStatus status, CamelExce
 				folders = camel_object_bag_list(((CamelStore *)disco_store)->folders);
 				for (i=0;i<folders->len;i++) {
 					folder = folders->pdata[i];
-					if (G_TYPE_CHECK_INSTANCE_TYPE(folder, CAMEL_DISCO_FOLDER_TYPE)
+					if (G_TYPE_CHECK_INSTANCE_TYPE(folder, CAMEL_TYPE_DISCO_FOLDER)
 					    && (sync || ((CamelDiscoFolder *)folder)->offline_sync)) {
 						camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, "", &x);
 						camel_exception_clear(&x);
@@ -430,7 +430,7 @@ camel_disco_store_prepare_for_offline(CamelDiscoStore *disco_store, CamelExcepti
 				folders = camel_object_bag_list(((CamelStore *)disco_store)->folders);
 				for (i=0;i<folders->len;i++) {
 					folder = folders->pdata[i];
-					if (G_TYPE_CHECK_INSTANCE_TYPE(folder, CAMEL_DISCO_FOLDER_TYPE)
+					if (G_TYPE_CHECK_INSTANCE_TYPE(folder, CAMEL_TYPE_DISCO_FOLDER)
 					    && (sync || ((CamelDiscoFolder *)folder)->offline_sync)) {
 						camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, "(match-all)", &x);
 						camel_exception_clear(&x);
diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
index dfaed0e..19f716f 100644
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.h
@@ -24,17 +24,37 @@
 #ifndef CAMEL_DISABLE_DEPRECATED
 
 #ifndef CAMEL_DISCO_STORE_H
-#define CAMEL_DISCO_STORE_H 1
+#define CAMEL_DISCO_STORE_H
 
 #include <camel/camel-store.h>
 
-#define CAMEL_DISCO_STORE_TYPE     (camel_disco_store_get_type ())
-#define CAMEL_DISCO_STORE(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_DISCO_STORE_TYPE, CamelDiscoStore))
-#define CAMEL_DISCO_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_DISCO_STORE_TYPE, CamelDiscoStoreClass))
-#define CAMEL_IS_DISCO_STORE(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_DISCO_STORE_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_DISCO_STORE \
+	(camel_disco_store_get_type ())
+#define CAMEL_DISCO_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_DISCO_STORE, CamelDiscoStore))
+#define CAMEL_DISCO_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_DISCO_STORE, CamelDiscoStoreClass))
+#define CAMEL_IS_DISCO_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_DISCO_STORE))
+#define CAMEL_IS_DISCO_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_DISCO_STORE))
+#define CAMEL_DISCO_STORE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_DISCO_STORE, CamelDiscoStoreClass))
 
 G_BEGIN_DECLS
 
+/* Avoid a circular dependency. */
+struct _CamelDiscoDiary;
+
+typedef struct _CamelDiscoStore CamelDiscoStore;
+typedef struct _CamelDiscoStoreClass CamelDiscoStoreClass;
+
 enum {
 	CAMEL_DISCO_STORE_ARG_FIRST  = CAMEL_STORE_ARG_FIRST + 100
 };
@@ -46,14 +66,13 @@ typedef enum {
 } CamelDiscoStoreStatus;
 
 struct _CamelDiscoStore {
-	CamelStore parent_object;	
+	CamelStore parent;
 
 	CamelDiscoStoreStatus status;
-	CamelDiscoDiary *diary;
+	struct _CamelDiscoDiary *diary;
 };
 
-
-typedef struct {
+struct _CamelDiscoStoreClass {
 	CamelStoreClass parent_class;
 
 	void              (*set_status)              (CamelDiscoStore *,
@@ -97,8 +116,7 @@ typedef struct {
 							const char *top,
 							guint32 flags,
 							CamelException *ex);
-
-} CamelDiscoStoreClass;
+};
 
 
 /* Standard Camel function */
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index 16652ea..8bab46d 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -26,7 +26,7 @@
 
 
 #ifndef CAMEL_EXCEPTION_H
-#define CAMEL_EXCEPTION_H 1
+#define CAMEL_EXCEPTION_H
 
 #include <camel/camel-types.h>
 
diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
index 03f2572..1550673 100644
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_FILE_UTILS_H
-#define CAMEL_FILE_UTILS_H 1
+#define CAMEL_FILE_UTILS_H
 
 #include <glib.h>
 #include <stdio.h>
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 4620844..67ae36f 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -23,16 +23,30 @@
  */
 
 #ifndef CAMEL_FOLDER_H
-#define CAMEL_FOLDER_H 1
+#define CAMEL_FOLDER_H
 
 #include <glib.h>
 #include <camel/camel-object.h>
 #include <camel/camel-folder-summary.h>
 
-#define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())
-#define CAMEL_FOLDER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))
-#define CAMEL_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))
-#define CAMEL_IS_FOLDER(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_FOLDER_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_FOLDER \
+	(camel_folder_get_type ())
+#define CAMEL_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_FOLDER, CamelFolder))
+#define CAMEL_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_FOLDER, CamelFolderClass))
+#define CAMEL_IS_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_FOLDER))
+#define CAMEL_IS_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_FOLDER))
+#define CAMEL_FOLDER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_FOLDER, CamelFolderClass))
 
 G_BEGIN_DECLS
 
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index c03e519..8b72047 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -29,6 +29,7 @@
 #include <camel/camel-stream.h>
 #include <camel/camel-url.h>
 
+/* Standard GObject macros */
 #define CAMEL_TYPE_HTTP_STREAM \
 	(camel_http_stream_get_type ())
 #define CAMEL_HTTP_STREAM(obj) \
@@ -60,7 +61,7 @@ typedef enum {
 	/*CAMEL_HTTP_METHOD_CONNECT*/
 } CamelHttpMethod;
 
-
+typedef struct _CamelHttpStream CamelHttpStream;
 typedef struct _CamelHttpStreamClass CamelHttpStreamClass;
 
 struct _CamelHttpStream {
@@ -90,8 +91,6 @@ struct _CamelHttpStream {
 
 struct _CamelHttpStreamClass {
 	CamelStreamClass parent_class;
-	
-	/* Virtual methods */
 };
 
 /* Standard Camel function */
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index cdda559..b2628cd 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -25,24 +25,41 @@
 
 
 #ifndef CAMEL_MEDIUM_H
-#define CAMEL_MEDIUM_H 1
+#define CAMEL_MEDIUM_H
 
 #include <camel/camel-data-wrapper.h>
 
-#define CAMEL_MEDIUM_TYPE     (camel_medium_get_type ())
-#define CAMEL_MEDIUM(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))
-#define CAMEL_MEDIUM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))
-#define CAMEL_IS_MEDIUM(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MEDIUM_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_MEDIUM \
+	(camel_medium_get_type ())
+#define CAMEL_MEDIUM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_MEDIUM, CamelMedium))
+#define CAMEL_MEDIUM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_MEDIUM, CamelMediumClass))
+#define CAMEL_IS_MEDIUM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_MEDIUM))
+#define CAMEL_IS_MEDIUM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_MEDIUM))
+#define CAMEL_MEDIUM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_MEDIUM, CamelMediumClass))
 
 G_BEGIN_DECLS
 
+typedef struct _CamelMedium CamelMedium;
+typedef struct _CamelMediumClass CamelMediumClass;
+
 typedef struct {
 	const char *name;
 	const char *value;
 } CamelMediumHeader;
 
 struct _CamelMedium {
-	CamelDataWrapper parent_object;
+	CamelDataWrapper parent;
 
 	/* The content of the medium, as opposed to our parent
 	 * CamelDataWrapper, which wraps both the headers and the
@@ -51,7 +68,7 @@ struct _CamelMedium {
 	CamelDataWrapper *content;
 };
 
-typedef struct {
+struct _CamelMediumClass {
 	CamelDataWrapperClass parent_class;
 
 	/* Virtual methods */
@@ -65,7 +82,7 @@ typedef struct {
 
 	CamelDataWrapper * (*get_content_object) (CamelMedium *medium);
 	void (*set_content_object) (CamelMedium *medium, CamelDataWrapper *content);
-} CamelMediumClass;
+};
 
 /* Standard Camel function */
 GType camel_medium_get_type (void);
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 50e4e19..f8522c8 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_MIME_MESSAGE_H
-#define CAMEL_MIME_MESSAGE_H 1
+#define CAMEL_MIME_MESSAGE_H
 
 #include <camel/camel-mime-part.h>
 #include <camel/camel-mime-utils.h>
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 8f09799..de2722b 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -25,7 +25,7 @@
  */
 
 #ifndef CAMEL_MIME_PART_UTILS_H
-#define CAMEL_MIME_PART_UTILS_H 1
+#define CAMEL_MIME_PART_UTILS_H
 
 #include <camel/camel-mime-part.h>
 
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 2830844..0d2d87d 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -193,7 +193,7 @@ camel_mime_part_get_type (void)
 	static GType type = G_TYPE_INVALID;
 	
 	if (type == G_TYPE_INVALID)	{
-		type = camel_type_register (CAMEL_MEDIUM_TYPE,
+		type = camel_type_register (CAMEL_TYPE_MEDIUM,
 					    "CamelMimePart",
 					    sizeof (CamelMimePart),
 					    sizeof (CamelMimePartClass),
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index a4f47b0..0774c17 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_MIME_PART_H
-#define CAMEL_MIME_PART_H 1
+#define CAMEL_MIME_PART_H
 
 #include <camel/camel-medium.h>
 #include <camel/camel-mime-utils.h>
diff --git a/camel/camel-mime-tables.c b/camel/camel-mime-tables.c
new file mode 100644
index 0000000..28a6cf6
--- /dev/null
+++ b/camel/camel-mime-tables.c
@@ -0,0 +1,34 @@
+const unsigned short camel_mime_special_table[256] = {
+	0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005,
+	0x0005, 0x00e7, 0x0007, 0x0005, 0x0005, 0x0027, 0x0005, 0x0005,
+	0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005,
+	0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005,
+	0x00f2, 0x03c0, 0x004c, 0x02c0, 0x02c0, 0x00c0, 0x02c0, 0x00c0,
+	0x004c, 0x004c, 0x01c0, 0x03c0, 0x004c, 0x03c0, 0x0248, 0x0144,
+	0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x004c, 0x004c, 0x004c, 0x0004, 0x004c, 0x0044,
+	0x004c, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x006c, 0x00ec, 0x006c, 0x02c0, 0x0240,
+	0x02c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0,
+	0x03c0, 0x03c0, 0x03c0, 0x02c0, 0x02c0, 0x02c0, 0x02c0, 0x0005,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+};
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index 1d60f94..73915f8 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_MOVEMAIL_H
-#define CAMEL_MOVEMAIL_H 1
+#define CAMEL_MOVEMAIL_H
 
 #include <camel/camel-exception.h>
 
diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h
index cc599ea..b7146b4 100644
--- a/camel/camel-multipart-signed.h
+++ b/camel/camel-multipart-signed.h
@@ -25,7 +25,7 @@
    I'm not really sure yet ... ? */
 
 #ifndef CAMEL_MULTIPART_SIGNED_H
-#define CAMEL_MULTIPART_SIGNED_H 1
+#define CAMEL_MULTIPART_SIGNED_H
 
 #include <camel/camel-multipart.h>
 
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index 3af2a63..fbae193 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_MULTIPART_H
-#define CAMEL_MULTIPART_H 1
+#define CAMEL_MULTIPART_H
 
 #include <camel/camel-data-wrapper.h>
 
diff --git a/camel/camel-net-utils.h b/camel/camel-net-utils.h
index e319ca6..e1974dc 100644
--- a/camel/camel-net-utils.h
+++ b/camel/camel-net-utils.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_NET_UTILS_H
-#define CAMEL_NET_UTILS_H 1
+#define CAMEL_NET_UTILS_H
 
 #include <sys/types.h>
 
diff --git a/camel/camel-object.h b/camel/camel-object.h
index 5823a64..a933739 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef CAMEL_OBJECT_H
-#define CAMEL_OBJECT_H 1
+#define CAMEL_OBJECT_H
 
 #include <glib.h>
 #include <glib-object.h>
diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c
index 5c51313..72031e0 100644
--- a/camel/camel-offline-folder.c
+++ b/camel/camel-offline-folder.c
@@ -59,7 +59,7 @@ camel_offline_folder_get_type (void)
 	static GType type = 0;
 	
 	if (!type) {
-		type = camel_type_register (CAMEL_FOLDER_TYPE,
+		type = camel_type_register (CAMEL_TYPE_FOLDER,
 					    "CamelOfflineFolder",
 					    sizeof (CamelOfflineFolder),
 					    sizeof (CamelOfflineFolderClass),
@@ -78,7 +78,7 @@ camel_offline_folder_class_init (CamelOfflineFolderClass *klass)
 {
 	int i;
 	
-	parent_class = (CamelFolderClass *) g_type_class_peek (CAMEL_FOLDER_TYPE);
+	parent_class = (CamelFolderClass *) g_type_class_peek (CAMEL_TYPE_FOLDER);
 	
 	if (offline_folder_props == NULL) {
 		for (i = 0; i < G_N_ELEMENTS (offline_prop_list); i++) {
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index dc0ff23..fafd5d2 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_OPERATION_H
-#define CAMEL_OPERATION_H 1
+#define CAMEL_OPERATION_H
 
 #include <glib.h>
 
diff --git a/camel/camel-private.h b/camel/camel-private.h
index 9d9e701..3920383 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
+#define CAMEL_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 7e9ff05..a206f42 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -26,7 +26,7 @@
 
 
 #ifndef CAMEL_PROVIDER_H
-#define CAMEL_PROVIDER_H 1
+#define CAMEL_PROVIDER_H
 
 #include <camel/camel-types.h>
 #include <camel/camel-object.h>
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 4f933ff..93c9be3 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_SEEKABLE_STREAM_H
-#define CAMEL_SEEKABLE_STREAM_H 1
+#define CAMEL_SEEKABLE_STREAM_H
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 9028781..65b407b 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_SEEKABLE_SUBSTREAM_H
-#define CAMEL_SEEKABLE_SUBSTREAM_H 1
+#define CAMEL_SEEKABLE_SUBSTREAM_H
 
 #include <camel/camel-seekable-stream.h>
 
diff --git a/camel/camel-service.h b/camel/camel-service.h
index 4085a10..380ad84 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef CAMEL_SERVICE_H
-#define CAMEL_SERVICE_H 1
+#define CAMEL_SERVICE_H
 
 #include <camel/camel-object.h>
 #include <camel/camel-url.h>
diff --git a/camel/camel-session.h b/camel/camel-session.h
index 522b68d..be40a81 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_SESSION_H
-#define CAMEL_SESSION_H 1
+#define CAMEL_SESSION_H
 
 #include <camel/camel-msgport.h>
 #include <camel/camel-object.h>
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 8e50cd1..e85aa00 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -25,7 +25,7 @@
  */
 
 #ifndef CAMEL_STORE_H
-#define CAMEL_STORE_H 1
+#define CAMEL_STORE_H
 
 /* for mode_t */
 #include <sys/types.h>
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index e0f2953..2882c18 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_STREAM_FS_H
-#define CAMEL_STREAM_FS_H 1
+#define CAMEL_STREAM_FS_H
 
 /* for open flags */
 #include <sys/types.h>
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index 9cae371..10d87a4 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_STREAM_VFS_H
-#define CAMEL_STREAM_VFS_H 1
+#define CAMEL_STREAM_VFS_H
 
 #include <glib.h>
 #include <glib-object.h>
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index e01c936..30c4583 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_STREAM_H
-#define CAMEL_STREAM_H 1
+#define CAMEL_STREAM_H
 
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index c002e53..62f7869 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_TRANSPORT_H
-#define CAMEL_TRANSPORT_H 1
+#define CAMEL_TRANSPORT_H
 
 #include <glib.h>
 #include <camel/camel-service.h>
diff --git a/camel/camel-types.h b/camel/camel-types.h
index 5a301a0..41300f6 100644
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -19,7 +19,7 @@
  */
 
 #ifndef CAMEL_TYPES_H
-#define CAMEL_TYPES_H 1
+#define CAMEL_TYPES_H
 
 #include <glib.h>
 
@@ -28,9 +28,6 @@ G_BEGIN_DECLS
 typedef struct _CamelAddress CamelAddress;
 typedef struct _CamelDigestFolder CamelDigestFolder;
 typedef struct _CamelDigestStore CamelDigestStore;
-typedef struct _CamelDiscoDiary CamelDiscoDiary;
-typedef struct _CamelDiscoFolder CamelDiscoFolder;
-typedef struct _CamelDiscoStore CamelDiscoStore;
 typedef struct _CamelDataWrapper CamelDataWrapper;
 typedef struct _CamelException CamelException;
 typedef struct _CamelFilterDriver CamelFilterDriver;
@@ -38,7 +35,6 @@ typedef struct _CamelFolder CamelFolder;
 typedef struct _CamelFolderSearch CamelFolderSearch;
 typedef struct _CamelFolderSummary CamelFolderSummary;
 typedef struct _CamelInternetAddress CamelInternetAddress;
-typedef struct _CamelMedium CamelMedium;
 typedef struct _CamelMessageContentInfo CamelMessageContentInfo;
 typedef struct _CamelMimeFilter CamelMimeFilter;
 typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;
@@ -69,7 +65,6 @@ typedef struct _CamelStreamFs CamelStreamFs;
 typedef struct _CamelStreamMem CamelStreamMem;
 typedef struct _CamelTcpStream CamelTcpStream;
 typedef struct _CamelTcpStreamOpenSSL CamelTcpStreamOpenSSL;
-typedef struct _CamelHttpStream CamelHttpStream;
 typedef struct _CamelTransport CamelTransport;
 
 G_END_DECLS
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index a483327..a730705 100644
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef CAMEL_UID_CACHE_H
-#define CAMEL_UID_CACHE_H 1
+#define CAMEL_UID_CACHE_H
 
 #include <glib.h>
 
diff --git a/camel/camel-url.h b/camel/camel-url.h
index a59cd86..114a5ad 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_URL_H
-#define CAMEL_URL_H 1
+#define CAMEL_URL_H
 
 #include <glib.h>
 #include <camel/camel-types.h>
diff --git a/camel/camel.h b/camel/camel.h
index 8bc8873..b5552ad 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_H
-#define CAMEL_H 1
+#define CAMEL_H
 
 #include <camel/camel-address.h>
 #include <camel/camel-arg.h>
diff --git a/camel/providers/groupwise/camel-groupwise-folder.h b/camel/providers/groupwise/camel-groupwise-folder.h
index 6ecf52b..fe8948d 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.h
+++ b/camel/providers/groupwise/camel-groupwise-folder.h
@@ -26,7 +26,7 @@
 
 
 #ifndef CAMEL_GROUPWISE_FOLDER_H
-#define CAMEL_GROUPWISE_FOLDER_H 1
+#define CAMEL_GROUPWISE_FOLDER_H
 
 #include <camel/camel-offline-folder.h>
 #include <camel/camel-mime-message.h>
@@ -40,19 +40,35 @@
 
 #include "camel-groupwise-summary.h"
 
-#define CAMEL_GROUPWISE_FOLDER_TYPE     (camel_groupwise_folder_get_type ())
-#define CAMEL_GROUPWISE_FOLDER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_GROUPWISE_FOLDER_TYPE, CamelGroupwiseFolder))
-#define CAMEL_GROUPWISE_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_GROUPWISE_FOLDER_TYPE, CamelGroupwiseFolderClass))
-#define CAMEL_IS_GROUPWISE_FOLDER(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_GROUPWISE_FOLDER_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_GROUPWISE_FOLDER \
+	(camel_groupwise_folder_get_type ())
+#define CAMEL_GROUPWISE_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_GROUPWISE_FOLDER, CamelGroupwiseFolder))
+#define CAMEL_GROUPWISE_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_GROUPWISE_FOLDER, CamelGroupwiseFolderClass))
+#define CAMEL_IS_GROUPWISE_FOLDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_GROUPWISE_FOLDER))
+#define CAMEL_IS_GROUPWISE_FOLDER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_GROUPWISE_FOLDER))
+#define CAMEL_GROUPWISE_FOLDER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_GROUPWISE_FOLDER, CamelGroupwiseFolderClass))
 
 G_BEGIN_DECLS
 
-typedef struct  _CamelGroupwiseFolder CamelGroupwiseFolder;
-typedef struct  _CamelGroupwiseFolderClass CamelGroupwiseFolderClass;
+typedef struct _CamelGroupwiseFolder CamelGroupwiseFolder;
+typedef struct _CamelGroupwiseFolderClass CamelGroupwiseFolderClass;
+typedef struct _CamelGroupwiseFolderPrivate CamelGroupwiseFolderPrivate;
+
 struct _CamelGroupwiseFolder {
 	CamelOfflineFolder parent_object;
 
-	struct _CamelGroupwiseFolderPrivate *priv;
+	CamelGroupwiseFolderPrivate *priv;
 
 	CamelFolderSearch *search;
 
diff --git a/camel/providers/groupwise/camel-groupwise-private.h b/camel/providers/groupwise/camel-groupwise-private.h
index 91ff704..eaae018 100644
--- a/camel/providers/groupwise/camel-groupwise-private.h
+++ b/camel/providers/groupwise/camel-groupwise-private.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_GROUPWISE_PRIVATE_H
-#define CAMEL_GROUPWISE_PRIVATE_H 1
+#define CAMEL_GROUPWISE_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index 7aa60c5..b05591b 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -118,7 +118,7 @@ camel_groupwise_store_summary_get_type (void)
 CamelGroupwiseStoreSummary *
 camel_groupwise_store_summary_new (void)
 {
-	return g_object_new (CAMEL_TYPE_GW_STORE_SUMMARY, NULL);
+	return g_object_new (CAMEL_TYPE_GROUPWISE_STORE_SUMMARY, NULL);
 }
 
 
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 297e5fa..4f75fcb 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -26,14 +26,27 @@
 #include <camel/camel-object.h>
 #include <camel/camel-store-summary.h>
 
-#define CAMEL_GW_STORE_SUMMARY(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, camel_groupwise_store_summary_get_type (), CamelGroupwiseStoreSummary)
-#define CAMEL_GW_STORE_SUMMARY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_groupwise_store_summary_get_type (), CamelGroupwiseStoreSummaryClass)
-#define CAMEL_IS_GW_STORE_SUMMARY(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_groupwise_store_summary_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_GROUPWISE_STORE_SUMMARY \
+	(camel_groupwise_store_summary_get_type ())
+#define CAMEL_GROUPWISE_STORE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_GROUPWISE_STORE_SUMMARY, CamelGroupwiseStoreSummary))
+#define CAMEL_GROUPWISE_STORE_SUMMARY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_GROUPWISE_STORE_SUMMARY, CamelGroupwiseStoreSummaryClass))
+#define CAMEL_IS_GROUPWISE_STORE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_GROUPWISE_STORE_SUMMARY))
+#define CAMEL_IS_GROUPWISE_STORE_SUMMARY_CLASS(cls) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((cls), CAMEL_TYPE_GROUPWISE_STORE_SUMMARY, CamelGroupwiseStoreSummaryClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelGroupwiseStoreSummary      CamelGroupwiseStoreSummary;
+typedef struct _CamelGroupwiseStoreSummary CamelGroupwiseStoreSummary;
 typedef struct _CamelGroupwiseStoreSummaryClass CamelGroupwiseStoreSummaryClass;
+typedef struct _CamelGroupwiseStoreSummaryPrivate CamelGroupwiseStoreSummaryPrivate;
 
 typedef struct _CamelGroupwiseStoreInfo CamelGroupwiseStoreInfo;
 
@@ -58,7 +71,7 @@ struct _CamelGroupwiseStoreNamespace {
 struct _CamelGroupwiseStoreSummary {
 	CamelStoreSummary summary;
 
-	struct _CamelGroupwiseStoreSummaryPrivate *priv;
+	CamelGroupwiseStoreSummaryPrivate *priv;
 
 	/* header info */
 	guint32 version;        /* version of base part of file */
diff --git a/camel/providers/groupwise/camel-groupwise-store.h b/camel/providers/groupwise/camel-groupwise-store.h
index 56fc450..70eac84 100644
--- a/camel/providers/groupwise/camel-groupwise-store.h
+++ b/camel/providers/groupwise/camel-groupwise-store.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_GROUPWISE_STORE_H
-#define CAMEL_GROUPWISE_STORE_H 1
+#define CAMEL_GROUPWISE_STORE_H
 
 #include <camel/camel-store.h>
 #include <camel/camel-offline-store.h>
diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c
index d39b3a8..4d1db79 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-summary.c
@@ -166,7 +166,7 @@ camel_groupwise_summary_new (struct _CamelFolder *folder, const char *filename)
 	CamelException ex;
 	CamelFolderSummary *summary;
 	
-	summary = g_object_new (CAMEL_TYPE_GW_SUMMARY, NULL);
+	summary = g_object_new (CAMEL_TYPE_GROUPWISE_SUMMARY, NULL);
 	summary->folder = folder ;
 	camel_folder_summary_set_build_content (summary, TRUE);
 	camel_folder_summary_set_filename (summary, filename);
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index 18270ac..eb56802 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -26,9 +26,24 @@
 #include <camel/camel-exception.h>
 #include <camel/camel-store.h>
 
-#define CAMEL_GROUPWISE_SUMMARY(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, camel_groupwise_summary_get_type (), CamelGroupwiseSummary)
-#define CAMEL_GROUPWISE_SUMMARY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_groupwise_summary_get_type (), CamelGroupwiseSummaryClass)
-#define CAMEL_IS_GROUPWISE_SUMMARY(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_groupwise_summary_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_GROUPWISE_SUMMARY \
+	(camel_groupwise_summary_get_type ())
+#define CAMEL_GROUPWISE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_GROUPWISE_SUMMARY, CamelGroupwiseSummary))
+#define CAMEL_GROUPWISE_SUMMARY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_GROUPWISE_SUMMARY, CamelGroupwiseSummaryClass))
+#define CAMEL_IS_GROUPWISE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_GROUPWISE_SUMMARY))
+#define CAMEL_IS_GROUPWISE_SUMMARY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_GROUPWISE_SUMMARY))
+#define CAMEL_GROUPWISE_SUMMARY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_GROUPWISE_SUMMARY, CamelGroupwiseSummaryClass))
 
 G_BEGIN_DECLS
 
diff --git a/camel/providers/groupwise/camel-groupwise-transport.h b/camel/providers/groupwise/camel-groupwise-transport.h
index a59407f..2ee6505 100644
--- a/camel/providers/groupwise/camel-groupwise-transport.h
+++ b/camel/providers/groupwise/camel-groupwise-transport.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_GROUPWISE_TRANSPORT_H
-#define CAMEL_GROUPWISE_TRANSPORT_H 1
+#define CAMEL_GROUPWISE_TRANSPORT_H
 
 #include <camel/camel-transport.h>
 
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index 123ae10..3af9267 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_IMAP_COMMAND_H
-#define CAMEL_IMAP_COMMAND_H 1
+#define CAMEL_IMAP_COMMAND_H
 
 #include <glib.h>
 #include <camel-imap-store.h>
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index bcec884..2c0fcb9 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_IMAP_FOLDER_H
-#define CAMEL_IMAP_FOLDER_H 1
+#define CAMEL_IMAP_FOLDER_H
 
 #include <camel/camel-offline-folder.h>
 #include <camel/camel-folder-search.h>
diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index eb68646..f1f0699 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_IMAP_MESSAGE_CACHE_H
-#define CAMEL_IMAP_MESSAGE_CACHE_H 1
+#define CAMEL_IMAP_MESSAGE_CACHE_H
 
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-search.h>
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 7d09c83..c2a4901 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -1,5 +1,5 @@
 #ifndef CAMEL_IMAP_PRIVATE_H
-#define CAMEL_IMAP_PRIVATE_H 1
+#define CAMEL_IMAP_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 3140943..462c17f 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_IMAP_STORE_H
-#define CAMEL_IMAP_STORE_H 1
+#define CAMEL_IMAP_STORE_H
 
 #include <sys/time.h>
 #include <camel/camel-msgport.h>
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
index 357ca39..bba804d 100644
--- a/camel/providers/imap/camel-imap-utils.h
+++ b/camel/providers/imap/camel-imap-utils.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_IMAP_UTILS_H
-#define CAMEL_IMAP_UTILS_H 1
+#define CAMEL_IMAP_UTILS_H
 
 #include <sys/types.h>
 #include <camel/camel-folder-summary.h>
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index 3451eaf..7bcc4d0 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -21,7 +21,7 @@
 
 
 #ifndef CAMEL_IMAP_WRAPPER_H
-#define CAMEL_IMAP_WRAPPER_H 1
+#define CAMEL_IMAP_WRAPPER_H
 
 #include <camel/camel-data-wrapper.h>
 
diff --git a/camel/providers/imapp/camel-imapp-folder.h b/camel/providers/imapp/camel-imapp-folder.h
index c085360..30eb675 100644
--- a/camel/providers/imapp/camel-imapp-folder.h
+++ b/camel/providers/imapp/camel-imapp-folder.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef CAMEL_IMAPP_FOLDER_H
-#define CAMEL_IMAPP_FOLDER_H 1
+#define CAMEL_IMAPP_FOLDER_H
 
 #include <camel/camel-folder.h>
 
diff --git a/camel/providers/imapp/camel-imapp-store.h b/camel/providers/imapp/camel-imapp-store.h
index a3a67a7..e6ff880 100644
--- a/camel/providers/imapp/camel-imapp-store.h
+++ b/camel/providers/imapp/camel-imapp-store.h
@@ -23,7 +23,7 @@
 
 
 #ifndef CAMEL_IMAPP_STORE_H
-#define CAMEL_IMAPP_STORE_H 1
+#define CAMEL_IMAPP_STORE_H
 
 #include <camel/camel-types.h>
 #include <camel/camel-store.h>
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index 218e2b9..719093c 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_LOCAL_FOLDER_H
-#define CAMEL_LOCAL_FOLDER_H 1
+#define CAMEL_LOCAL_FOLDER_H
 
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-search.h>
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index 731aaa3..aa55bee 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -22,7 +22,7 @@
 
 
 #ifndef CAMEL_LOCAL_PRIVATE_H
-#define CAMEL_LOCAL_PRIVATE_H 1
+#define CAMEL_LOCAL_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index dd5fc3b..ae9e0b9 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_LOCAL_STORE_H
-#define CAMEL_LOCAL_STORE_H 1
+#define CAMEL_LOCAL_STORE_H
 
 #include "camel-store.h"
 
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 2459219..c3b7242 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_MAILDIR_STORE_H
-#define CAMEL_MAILDIR_STORE_H 1
+#define CAMEL_MAILDIR_STORE_H
 
 #include "camel-local-store.h"
 
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index 2ba528a..f1688a5 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_MBOX_FOLDER_H
-#define CAMEL_MBOX_FOLDER_H 1
+#define CAMEL_MBOX_FOLDER_H
 
 #include "camel-local-folder.h"
 #include "camel-mbox-summary.h"
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index c18d29a..36cf7eb 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_MBOX_STORE_H
-#define CAMEL_MBOX_STORE_H 1
+#define CAMEL_MBOX_STORE_H
 
 #include "camel-local-store.h"
 
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index def76d3..f934af6 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_MH_FOLDER_H
-#define CAMEL_MH_FOLDER_H 1
+#define CAMEL_MH_FOLDER_H
 
 #include "camel-local-folder.h"
 
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index cbfd25e..0bff6fb 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_MH_STORE_H
-#define CAMEL_MH_STORE_H 1
+#define CAMEL_MH_STORE_H
 
 #include "camel-local-store.h"
 
diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 95393aa..b100bf2 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CAMEL_SPOOL_FOLDER_H
-#define CAMEL_SPOOL_FOLDER_H 1
+#define CAMEL_SPOOL_FOLDER_H
 
 #include "camel-mbox-folder.h"
 #include <camel/camel-folder-search.h>
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 6637cd5..1625276 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -21,7 +21,7 @@
 
 
 #ifndef CAMEL_SPOOL_STORE_H
-#define CAMEL_SPOOL_STORE_H 1
+#define CAMEL_SPOOL_STORE_H
 
 #include "camel-mbox-store.h"
 
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 4d428c4..8b25041 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_NNTP_AUTH_H
-#define CAMEL_NNTP_AUTH_H 1
+#define CAMEL_NNTP_AUTH_H
 
 #include <camel-nntp-store.h>
 
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index dc0b0a2..35ec935 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -511,7 +511,7 @@ camel_nntp_folder_get_type (void)
 	static GType camel_nntp_folder_type = G_TYPE_INVALID;
 	
 	if (camel_nntp_folder_type == G_TYPE_INVALID)	{
-		camel_nntp_folder_type = camel_type_register (CAMEL_DISCO_FOLDER_TYPE, "CamelNNTPFolder",
+		camel_nntp_folder_type = camel_type_register (CAMEL_TYPE_DISCO_FOLDER, "CamelNNTPFolder",
 							      sizeof (CamelNNTPFolder),
 							      sizeof (CamelNNTPFolderClass),
 							      (CamelObjectClassInitFunc) nntp_folder_class_init,
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 815340f..16885fd 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef CAMEL_NNTP_GROUPLIST_H
-#define CAMEL_NNTP_GROUPLIST_H 1
+#define CAMEL_NNTP_GROUPLIST_H
 
 #include <time.h>
 #include "camel-nntp-store.h"
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index c0bed12..9a138fd 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_NNTP_PRIVATE_H
-#define CAMEL_NNTP_PRIVATE_H 1
+#define CAMEL_NNTP_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 573e161..0d859f3 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef CAMEL_NNTP_RESP_CODES_H
-#define CAMEL_NNTP_RESP_CODES_H 1
+#define CAMEL_NNTP_RESP_CODES_H
 
 #define CAMEL_NNTP_OK(x) ((x) < 400)
 #define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) && (x) < 500)
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index cbb1f20..3fcec04 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1156,7 +1156,7 @@ camel_nntp_store_get_type (void)
 	
 	if (camel_nntp_store_type == G_TYPE_INVALID) {
 		camel_nntp_store_type =
-			camel_type_register (CAMEL_DISCO_STORE_TYPE,
+			camel_type_register (CAMEL_TYPE_DISCO_STORE,
 					     "CamelNNTPStore",
 					     sizeof (CamelNNTPStore),
 					     sizeof (CamelNNTPStoreClass),
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index ad8d2ed..f05a5ea 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -22,7 +22,7 @@
 
 
 #ifndef CAMEL_NNTP_STORE_H
-#define CAMEL_NNTP_STORE_H 1
+#define CAMEL_NNTP_STORE_H
 
 #include <camel/camel-disco-store.h>
 
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index 19f36dc..07b6992 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef CAMEL_NNTP_TYPES_H
-#define CAMEL_NNTP_TYPES_H 1
+#define CAMEL_NNTP_TYPES_H
 
 G_BEGIN_DECLS
 
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 9556119..c4d803e 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -24,7 +24,7 @@
 
 
 #ifndef CAMEL_NNTP_UTILS_H
-#define CAMEL_NNTP_UTILS_H 1
+#define CAMEL_NNTP_UTILS_H
 
 G_BEGIN_DECLS
 
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 9499ff3..8e7c0e5 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -82,7 +82,7 @@ camel_pop3_folder_get_type (void)
 	static GType camel_pop3_folder_type = G_TYPE_INVALID;
 	
 	if (!camel_pop3_folder_type) {
-		camel_pop3_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelPOP3Folder",
+		camel_pop3_folder_type = camel_type_register (CAMEL_TYPE_FOLDER, "CamelPOP3Folder",
 							      sizeof (CamelPOP3Folder),
 							      sizeof (CamelPOP3FolderClass),
 							      (CamelObjectClassInitFunc) camel_pop3_folder_class_init,
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 294e7d7..2ea87f8 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef CAMEL_POP3_FOLDER_H
-#define CAMEL_POP3_FOLDER_H 1
+#define CAMEL_POP3_FOLDER_H
 
 #include "camel-folder.h"
 
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 14f96e8..1c878e9 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_POP3_STORE_H
-#define CAMEL_POP3_STORE_H 1
+#define CAMEL_POP3_STORE_H
 
 #include <camel/camel-types.h>
 #include <camel/camel-store.h>
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 3047846..c591572 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -25,7 +25,7 @@
 
 
 #ifndef CAMEL_SENDMAIL_TRANSPORT_H
-#define CAMEL_SENDMAIL_TRANSPORT_H 1
+#define CAMEL_SENDMAIL_TRANSPORT_H
 
 #include "camel-transport.h"
 
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index 2680fb7..5303649 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -23,15 +23,29 @@
  */
 
 #ifndef CAMEL_SMTP_TRANSPORT_H
-#define CAMEL_SMTP_TRANSPORT_H 1
+#define CAMEL_SMTP_TRANSPORT_H
 
 #include "camel-transport.h"
 #include "camel-tcp-stream.h"
 
-#define CAMEL_SMTP_TRANSPORT_TYPE     (camel_smtp_transport_get_type ())
-#define CAMEL_SMTP_TRANSPORT(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))
-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))
-#define CAMEL_IS_SMTP_TRANSPORT(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SMTP_TRANSPORT_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SMTP_TRANSPORT \
+	(camel_smtp_transport_get_type ())
+#define CAMEL_SMTP_TRANSPORT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SMTP_TRANSPORT, CamelSmtpTransport))
+#define CAMEL_SMTP_TRANSPORT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SMTP_TRANSPORT, CamelSmtpTransportClass))
+#define CAMEL_IS_SMTP_TRANSPORT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SMTP_TRANSPORT))
+#define CAMEL_IS_SMTP_TRANSPORT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SMTP_TRANSPORT))
+#define CAMEL_SMTP_TRANSPORT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SMTP_TRANSPORT, CamelSmtpTransportClass))
 
 #define CAMEL_SMTP_TRANSPORT_IS_ESMTP               (1 << 0)
 #define CAMEL_SMTP_TRANSPORT_8BITMIME               (1 << 1)
@@ -42,7 +56,10 @@
 
 G_BEGIN_DECLS
 
-typedef struct {
+typedef struct _CamelSmtpTransport CamelSmtpTransport;
+typedef struct _CamelSmtpTransportClass CamelSmtpTransportClass;
+
+struct _CamelSmtpTransport {
 	CamelTransport parent_object;
 	
 	CamelStream *istream, *ostream;
@@ -54,12 +71,11 @@ typedef struct {
 	socklen_t localaddrlen;
 	
 	GHashTable *authtypes;
-} CamelSmtpTransport;
+};
 
-typedef struct {
+struct _CamelSmtpTransportClass {
 	CamelTransportClass parent_class;
-
-} CamelSmtpTransportClass;
+};
 
 /* Standard Camel function */
 GType camel_smtp_transport_get_type (void);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]