GNOME.org
 

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

commit 941103e6d2d0446519aa06bda223e7799e46b26d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Apr 18 00:40:52 2009 -0400

    Adding GObject macros.
---
 camel/camel-gpg-context.h     |   23 ++++++++++++++++++-----
 camel/camel-http-stream.h     |   21 +++++++++++++++++----
 camel/camel-sasl-anonymous.h  |   22 ++++++++++++++++++----
 camel/camel-sasl-cram-md5.h   |   37 +++++++++++++++++++++++++------------
 camel/camel-sasl-digest-md5.h |   40 +++++++++++++++++++++++++++-------------
 camel/camel-sasl-gssapi.h     |   28 ++++++++++++++++++++--------
 camel/camel-sasl-login.h      |   41 +++++++++++++++++++++++++++--------------
 camel/camel-sasl-ntlm.h       |   37 +++++++++++++++++++++++++------------
 camel/camel-sasl-plain.h      |   37 +++++++++++++++++++++++++------------
 camel/camel-sasl-popb4smtp.h  |   37 +++++++++++++++++++++++++------------
 camel/camel-smime-context.h   |   30 ++++++++++++++++++++++--------
 camel/camel-store-summary.h   |   26 +++++++++++++++++++++-----
 12 files changed, 270 insertions(+), 109 deletions(-)

diff --git a/camel/camel-gpg-context.h b/camel/camel-gpg-context.h
index b860212..679b5df 100644
--- a/camel/camel-gpg-context.h
+++ b/camel/camel-gpg-context.h
@@ -26,10 +26,24 @@
 
 #include <camel/camel-cipher-context.h>
 
-#define CAMEL_GPG_CONTEXT_TYPE     (camel_gpg_context_get_type ())
-#define CAMEL_GPG_CONTEXT(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_GPG_CONTEXT_TYPE, CamelGpgContext))
-#define CAMEL_GPG_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_GPG_CONTEXT_TYPE, CamelGpgContextClass))
-#define CAMEL_IS_GPG_CONTEXT(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_GPG_CONTEXT_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_GPG_CONTEXT \
+	(camel_gpg_context_get_type ())
+#define CAMEL_GPG_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_GPG_CONTEXT, CamelGpgContext))
+#define CAMEL_GPG_CONTEXT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_GPG_CONTEXT, CamelGpgContextClass))
+#define CAMEL_IS_GPG_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_GPG_CONTEXT))
+#define CAMEL_IS_GPG_CONTEXT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_GPG_CONTEXT))
+#define CAMEL_GPG_CONTEXT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_GPG_CONTEXT, CamelGpgContextClass))
 
 G_BEGIN_DECLS
 
@@ -47,7 +61,6 @@ struct _CamelGpgContextClass {
 	
 };
 
-
 GType camel_gpg_context_get_type (void);
 
 CamelCipherContext *camel_gpg_context_new (CamelSession *session);
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index f01a1b4..c03e519 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -29,10 +29,23 @@
 #include <camel/camel-stream.h>
 #include <camel/camel-url.h>
 
-#define CAMEL_HTTP_STREAM_TYPE     (camel_http_stream_get_type ())
-#define CAMEL_HTTP_STREAM(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_HTTP_STREAM_TYPE, CamelHttpStream))
-#define CAMEL_HTTP_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_HTTP_STREAM_TYPE, CamelHttpStreamClass))
-#define CAMEL_IS_HTTP_STREAM(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_HTTP_STREAM_TYPE))
+#define CAMEL_TYPE_HTTP_STREAM \
+	(camel_http_stream_get_type ())
+#define CAMEL_HTTP_STREAM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_HTTP_STREAM, CamelHttpStream))
+#define CAMEL_HTTP_STREAM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_HTTP_STREAM, CamelHttpStreamClass))
+#define CAMEL_IS_HTTP_STREAM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_HTTP_STREAM))
+#define CAMEL_IS_HTTP_STREAM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_HTTP_STREAM))
+#define CAMEL_HTTP_STREAM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_HTTP_STREAM, CamelHttpStreamClass))
 
 G_BEGIN_DECLS
 
diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h
index c0fd927..53c33af 100644
--- a/camel/camel-sasl-anonymous.h
+++ b/camel/camel-sasl-anonymous.h
@@ -25,10 +25,24 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_ANONYMOUS_TYPE     (camel_sasl_anonymous_get_type ())
-#define CAMEL_SASL_ANONYMOUS(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymous))
-#define CAMEL_SASL_ANONYMOUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymousClass))
-#define CAMEL_IS_SASL_ANONYMOUS(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_ANONYMOUS_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_ANONYMOUS \
+	(camel_sasl_anonymous_get_type ())
+#define CAMEL_SASL_ANONYMOUS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_ANONYMOUS, CamelSaslAnonymous))
+#define CAMEL_SASL_ANONYMOUS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_ANONYMOUS, CamelSaslAnonymousClass))
+#define CAMEL_IS_SASL_ANONYMOUS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_ANONYMOUS))
+#define CAMEL_IS_SASL_ANONYMOUS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_ANONYMOUS))
+#define CAMEL_SASL_ANONYMOUS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_ANONYMOUS, CamelSaslAnonymousClass))
 
 G_BEGIN_DECLS
 
diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h
index a2e52aa..888b2e7 100644
--- a/camel/camel-sasl-cram-md5.h
+++ b/camel/camel-sasl-cram-md5.h
@@ -25,24 +25,37 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_CRAM_MD5_TYPE     (camel_sasl_cram_md5_get_type ())
-#define CAMEL_SASL_CRAM_MD5(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5))
-#define CAMEL_SASL_CRAM_MD5_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5Class))
-#define CAMEL_IS_SASL_CRAM_MD5(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_CRAM_MD5_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_CRAM_MD5 \
+	(camel_sasl_cram_md5_get_type ())
+#define CAMEL_SASL_CRAM_MD5(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5))
+#define CAMEL_SASL_CRAM_MD5_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5Class))
+#define CAMEL_IS_SASL_CRAM_MD5(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_CRAM_MD5))
+#define CAMEL_IS_SASL_CRAM_MD5_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_CRAM_MD5))
+#define CAMEL_SASL_CRAM_MD5_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5Class))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslCramMd5 {
-	CamelSasl parent_object;
-
-} CamelSaslCramMd5;
+typedef struct _CamelSaslCramMd5 CamelSaslCramMd5;
+typedef struct _CamelSaslCramMd5Class CamelSaslCramMd5Class;
 
+struct _CamelSaslCramMd5 {
+	CamelSasl parent_object;
+};
 
-typedef struct _CamelSaslCramMd5Class {
+struct _CamelSaslCramMd5Class {
 	CamelSaslClass parent_class;
-	
-} CamelSaslCramMd5Class;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_cram_md5_get_type (void);
diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h
index a53ece4..4e34de8 100644
--- a/camel/camel-sasl-digest-md5.h
+++ b/camel/camel-sasl-digest-md5.h
@@ -26,25 +26,39 @@
 #include <sys/types.h>
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_DIGEST_MD5_TYPE     (camel_sasl_digest_md5_get_type ())
-#define CAMEL_SASL_DIGEST_MD5(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5))
-#define CAMEL_SASL_DIGEST_MD5_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5Class))
-#define CAMEL_IS_SASL_DIGEST_MD5(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_DIGEST_MD5_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_DIGEST_MD5 \
+	(camel_sasl_digest_md5_get_type ())
+#define CAMEL_SASL_DIGEST_MD5(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5))
+#define CAMEL_SASL_DIGEST_MD5_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5Class))
+#define CAMEL_IS_SASL_DIGEST_MD5(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_DIGEST_MD5))
+#define CAMEL_IS_SASL_DIGEST_MD5_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_DIGEST_MD5))
+#define CAMEL_SASL_DIGEST_MD5_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5Class))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslDigestMd5 {
-	CamelSasl parent_object;
-	struct _CamelSaslDigestMd5Private *priv;
-	
-} CamelSaslDigestMd5;
+typedef struct _CamelSaslDigestMd5 CamelSaslDigestMd5;
+typedef struct _CamelSaslDigestMd5Class CamelSaslDigestMd5Class;
+typedef struct _CamelSaslDigestMd5Private CamelSaslDigestMd5Private;
 
+struct _CamelSaslDigestMd5 {
+	CamelSasl parent;
+	CamelSaslDigestMd5Private *priv;
+};
 
-typedef struct _CamelSaslDigestMd5Class {
+struct _CamelSaslDigestMd5Class {
 	CamelSaslClass parent_class;
-	
-} CamelSaslDigestMd5Class;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_digest_md5_get_type (void);
diff --git a/camel/camel-sasl-gssapi.h b/camel/camel-sasl-gssapi.h
index 8ae251b..6461a4d 100644
--- a/camel/camel-sasl-gssapi.h
+++ b/camel/camel-sasl-gssapi.h
@@ -27,26 +27,38 @@
 #include <sys/types.h>
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_GSSAPI_TYPE     (camel_sasl_gssapi_get_type ())
-#define CAMEL_SASL_GSSAPI(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_GSSAPI_TYPE, CamelSaslGssapi))
-#define CAMEL_SASL_GSSAPI_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_GSSAPI_TYPE, CamelSaslGssapiClass))
-#define CAMEL_IS_SASL_GSSAPI(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_GSSAPI_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_GSSAPI \
+	(camel_sasl_gssapi_get_type ())
+#define CAMEL_SASL_GSSAPI(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapi))
+#define CAMEL_SASL_GSSAPI_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapiClass))
+#define CAMEL_IS_SASL_GSSAPI(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_GSSAPI))
+#define CAMEL_IS_SASL_GSSAPI_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_GSSAPI))
+#define CAMEL_SASL_GSSAPI_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapiClass))
 
 G_BEGIN_DECLS
 
 typedef struct _CamelSaslGssapi CamelSaslGssapi;
 typedef struct _CamelSaslGssapiClass CamelSaslGssapiClass;
+typedef struct _CamelSaslGssapiPrivate CamelSaslGssapiPrivate;
 
 struct _CamelSaslGssapi {
 	CamelSasl parent_object;
-	
-	struct _CamelSaslGssapiPrivate *priv;
-	
+	CamelSaslGssapiPrivate *priv;
 };
 
 struct _CamelSaslGssapiClass {
 	CamelSaslClass parent_class;
-	
 };
 
 /* Standard Camel function */
diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h
index d24b8f4..3d42329 100644
--- a/camel/camel-sasl-login.h
+++ b/camel/camel-sasl-login.h
@@ -25,26 +25,39 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_LOGIN_TYPE     (camel_sasl_login_get_type ())
-#define CAMEL_SASL_LOGIN(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_LOGIN_TYPE, CamelSaslLogin))
-#define CAMEL_SASL_LOGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_LOGIN_TYPE, CamelSaslLoginClass))
-#define CAMEL_IS_SASL_LOGIN(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_LOGIN_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_LOGIN \
+	(camel_sasl_login_get_type ())
+#define CAMEL_SASL_LOGIN(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_LOGIN, CamelSaslLogin))
+#define CAMEL_SASL_LOGIN_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_LOGIN, CamelSaslLoginClass))
+#define CAMEL_IS_SASL_LOGIN(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_LOGIN))
+#define CAMEL_IS_SASL_LOGIN_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_LOGIN))
+#define CAMEL_SASL_LOGIN_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_LOGIN, CamelSaslLoginClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslLogin {
-	CamelSasl parent_object;
-	
-	struct _CamelSaslLoginPrivate *priv;
-	
-} CamelSaslLogin;
+typedef struct _CamelSaslLogin CamelSaslLogin;
+typedef struct _CamelSaslLoginClass CamelSaslLoginClass;
+typedef struct _CamelSaslLoginPrivate CamelSaslLoginPrivate;
 
+struct _CamelSaslLogin {
+	CamelSasl parent;
+	CamelSaslLoginPrivate *priv;
+};
 
-typedef struct _CamelSaslLoginClass {
+struct _CamelSaslLoginClass {
 	CamelSaslClass parent_class;
-	
-} CamelSaslLoginClass;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_login_get_type (void);
diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h
index 1089044..068b729 100644
--- a/camel/camel-sasl-ntlm.h
+++ b/camel/camel-sasl-ntlm.h
@@ -23,24 +23,37 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_NTLM_TYPE     (camel_sasl_ntlm_get_type ())
-#define CAMEL_SASL_NTLM(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLM))
-#define CAMEL_SASL_NTLM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLMClass))
-#define CAMEL_IS_SASL_NTLM(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_NTLM_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_NTLM \
+	(camel_sasl_ntlm_get_type ())
+#define CAMEL_SASL_NTLM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_NTLM, CamelSaslNTLM))
+#define CAMEL_SASL_NTLM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_NTLM, CamelSaslNTLMClass))
+#define CAMEL_IS_SASL_NTLM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_NTLM))
+#define CAMEL_IS_SASL_NTLM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_NTLM))
+#define CAMEL_SASL_NTLM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_NTLM, CamelSaslNTLMClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslNTLM {
-	CamelSasl parent_object;
+typedef struct _CamelSaslNTLM CamelSaslNTLM;
+typedef struct _CamelSaslNTLMClass CamelSaslNTLMClass;
 
-} CamelSaslNTLM;
+struct _CamelSaslNTLM {
+	CamelSasl parent;
+};
 
-
-typedef struct _CamelSaslNTLMClass {
+struct _CamelSaslNTLMClass {
 	CamelSaslClass parent_class;
-	
-} CamelSaslNTLMClass;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_ntlm_get_type (void);
diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h
index 031b8ab..95f6656 100644
--- a/camel/camel-sasl-plain.h
+++ b/camel/camel-sasl-plain.h
@@ -25,24 +25,37 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_PLAIN_TYPE     (camel_sasl_plain_get_type ())
-#define CAMEL_SASL_PLAIN(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlain))
-#define CAMEL_SASL_PLAIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlainClass))
-#define CAMEL_IS_SASL_PLAIN(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_PLAIN_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_PLAIN \
+	(camel_sasl_plain_get_type ())
+#define CAMEL_SASL_PLAIN(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_PLAIN, CamelSaslPlain))
+#define CAMEL_SASL_PLAIN_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_PLAIN, CamelSaslPlainClass))
+#define CAMEL_IS_SASL_PLAIN(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_PLAIN))
+#define CAMEL_IS_SASL_PLAIN_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_PLAIN))
+#define CAMEL_SASL_PLAIN_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_PLAIN, CamelSaslPlainClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslPlain {
-	CamelSasl parent_object;
+typedef struct _CamelSaslPlain CamelSaslPlain;
+typedef struct _CamelSaslPlainClass CamelSaslPlainClass;
 
-} CamelSaslPlain;
+struct _CamelSaslPlain {
+	CamelSasl parent;
+};
 
-
-typedef struct _CamelSaslPlainClass {
+struct _CamelSaslPlainClass {
 	CamelSaslClass parent_class;
-	
-} CamelSaslPlainClass;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_plain_get_type (void);
diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h
index d82973f..13e3474 100644
--- a/camel/camel-sasl-popb4smtp.h
+++ b/camel/camel-sasl-popb4smtp.h
@@ -25,24 +25,37 @@
 
 #include <camel/camel-sasl.h>
 
-#define CAMEL_SASL_POPB4SMTP_TYPE     (camel_sasl_popb4smtp_get_type ())
-#define CAMEL_SASL_POPB4SMTP(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTP))
-#define CAMEL_SASL_POPB4SMTP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTPClass))
-#define CAMEL_IS_SASL_POPB4SMTP(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SASL_POPB4SMTP_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SASL_POPB4SMTP \
+	(camel_sasl_popb4smtp_get_type ())
+#define CAMEL_SASL_POPB4SMTP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTP))
+#define CAMEL_SASL_POPB4SMTP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTPClass))
+#define CAMEL_IS_SASL_POPB4SMTP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SASL_POPB4SMTP))
+#define CAMEL_IS_SASL_POPB4SMTP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SASL_POPB4SMTP))
+#define CAMEL_SASL_POPB4SMTP_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTPClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelSaslPOPB4SMTP {
-	CamelSasl parent_object;
+typedef struct _CamelSaslPOPB4SMTP CamelSaslPOPB4SMTP;
+typedef struct _CamelSaslPOPB4SMTPClass CamelSaslPOPB4SMTPClass;
 
-} CamelSaslPOPB4SMTP;
+struct _CamelSaslPOPB4SMTP {
+	CamelSasl parent;
+};
 
-
-typedef struct _CamelSaslPOPB4SMTPClass {
+struct _CamelSaslPOPB4SMTPClass {
 	CamelSaslClass parent_class;
-	
-} CamelSaslPOPB4SMTPClass;
-
+};
 
 /* Standard Camel function */
 GType camel_sasl_popb4smtp_get_type (void);
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
index f88e5d6..6fc1e86 100644
--- a/camel/camel-smime-context.h
+++ b/camel/camel-smime-context.h
@@ -26,10 +26,24 @@
 
 #include <camel/camel-cipher-context.h>
 
-#define CAMEL_SMIME_CONTEXT_TYPE    (camel_smime_context_get_type())
-#define CAMEL_SMIME_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SMIME_CONTEXT_TYPE, CamelSMIMEContext))
-#define CAMEL_SMIME_CONTEXT_CLASS(k)(G_TYPE_CHECK_CLASS_CAST((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMIMEContextClass))
-#define CAMEL_IS_SMIME_CONTEXT(o)   (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SMIME_CONTEXT \
+	(camel_smime_context_get_type())
+#define CAMEL_SMIME_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_SMIME_CONTEXT, CamelSMIMEContext))
+#define CAMEL_SMIME_CONTEXT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_SMIME_CONTEXT, CamelSMIMEContextClass))
+#define CAMEL_IS_SMIME_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_SMIME_CONTEXT))
+#define CAMEL_IS_SMIME_CONTEXT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_SMIME_CONTEXT))
+#define CAMEL_SMIME_CONTEXT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_SMIME_CONTEXT, CamelSMIMEContextClass))
 
 G_BEGIN_DECLS
 
@@ -47,15 +61,15 @@ typedef enum _camel_smime_describe_t {
 
 typedef struct _CamelSMIMEContext CamelSMIMEContext;
 typedef struct _CamelSMIMEContextClass CamelSMIMEContextClass;
+typedef struct _CamelSMIMEContextPrivate CamelSMIMEContextPrivate;
 
 struct _CamelSMIMEContext {
-	CamelCipherContext cipher;
-
-	struct _CamelSMIMEContextPrivate *priv;
+	CamelCipherContext parent;
+	CamelSMIMEContextPrivate *priv;
 };
 
 struct _CamelSMIMEContextClass {
-	CamelCipherContextClass cipher_class;
+	CamelCipherContextClass parent_class;
 };
 
 GType camel_smime_context_get_type(void);
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index f776312..599779f 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -31,14 +31,30 @@
 #include <camel/camel-object.h>
 #include <camel/camel-url.h>
 
-#define CAMEL_STORE_SUMMARY(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, camel_store_summary_get_type (), CamelStoreSummary)
-#define CAMEL_STORE_SUMMARY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_store_summary_get_type (), CamelStoreSummaryClass)
-#define CAMEL_IS_STORE_SUMMARY(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_store_summary_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_STORE_SUMMARY \
+	(camel_store_summary_get_type ())
+#define CAMEL_STORE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummary))
+#define CAMEL_STORE_SUMMARY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummaryClass))
+#define CAMEL_IS_STORE_SUMMARY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), CAMEL_TYPE_STORE_SUMMARY))
+#define CAMEL_IS_STORE_SUMMARY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), CAMEL_TYPE_STORE_SUMMARY))
+#define CAMEL_STORE_SUMMARY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummaryClass))
 
 G_BEGIN_DECLS
 
-typedef struct _CamelStoreSummary      CamelStoreSummary;
+typedef struct _CamelStoreSummary CamelStoreSummary;
 typedef struct _CamelStoreSummaryClass CamelStoreSummaryClass;
+typedef struct _CamelStoreSummaryPrivate CamelStoreSummaryPrivate;
 
 typedef struct _CamelStoreInfo CamelStoreInfo;
 
@@ -88,7 +104,7 @@ typedef enum _CamelStoreSummaryFlags {
 struct _CamelStoreSummary {
 	CamelObject parent;
 
-	struct _CamelStoreSummaryPrivate *priv;
+	CamelStoreSummaryPrivate *priv;
 
 	/* header info */
 	guint32 version;	/* version of base part of file */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]