[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:26:45 -0400 (EDT)
commit 264bc5e28f3d0ab8cb5ae5b632cc598d1fcb8a95
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Apr 17 09:24:14 2009 -0400
Adding GObject macros.
---
camel/camel-address.h | 6 +-
camel/camel-block-file.h | 6 +-
camel/camel-certdb.h | 6 +-
camel/camel-charset-map.h | 6 +-
camel/camel-db.h | 4 +-
camel/camel-digest-folder.h | 27 +++++--
camel/camel-digest-store.h | 29 +++++--
camel/camel-digest-summary.h | 32 +++++---
camel/camel-disco-diary.h | 22 +++++-
camel/camel-filter-driver.h | 6 +-
camel/camel-filter-search.h | 2 +-
camel/camel-folder-search.h | 6 +-
camel/camel-folder-summary.h | 6 +-
camel/camel-folder-thread.h | 6 +-
camel/camel-gpg-context.h | 6 +-
camel/camel-html-parser.h | 6 +-
camel/camel-http-stream.h | 6 +-
camel/camel-i18n.h | 6 +-
camel/camel-iconv.h | 6 +-
camel/camel-index.h | 6 +-
camel/camel-internet-address.h | 6 +-
camel/camel-junk-plugin.h | 4 +-
camel/camel-list-utils.h | 4 +-
camel/camel-lock-client.h | 6 +-
camel/camel-lock-helper.h | 6 +-
camel/camel-lock.h | 6 +-
camel/camel-mime-filter-basic.h | 6 +-
camel/camel-mime-filter-bestenc.h | 6 +-
camel/camel-mime-filter-canon.h | 6 +-
camel/camel-mime-filter-charset.h | 6 +-
camel/camel-mime-filter-crlf.h | 6 +-
camel/camel-mime-filter-enriched.h | 6 +-
camel/camel-mime-filter-from.h | 6 +-
camel/camel-mime-filter-gzip.h | 6 +-
camel/camel-mime-filter-html.h | 27 +++++--
camel/camel-mime-filter-index.h | 27 +++++--
camel/camel-mime-filter-linewrap.h | 28 +++++--
camel/camel-mime-filter-pgp.h | 28 +++++--
camel/camel-mime-filter-progress.h | 27 +++++--
camel/camel-mime-filter-save.c | 2 +-
camel/camel-mime-filter-save.h | 28 +++++--
camel/camel-mime-filter-tohtml.h | 27 +++++--
camel/camel-mime-filter-windows.h | 27 +++++--
camel/camel-mime-filter-yenc.h | 6 +-
camel/camel-mime-filter.h | 28 +++++--
camel/camel-mime-message.h | 24 +++++-
camel/camel-mime-parser.h | 27 +++++--
camel/camel-mime-part.h | 22 +++++-
camel/camel-mime-utils.h | 6 +-
camel/camel-multipart-encrypted.h | 28 +++++--
camel/camel-multipart-signed.c | 2 +-
camel/camel-multipart-signed.h | 22 +++++-
camel/camel-multipart.h | 22 +++++-
camel/camel-news-address.h | 6 +-
camel/camel-nntp-address.h | 27 +++++--
camel/camel-offline-folder.h | 6 +-
camel/camel-offline-journal.h | 6 +-
camel/camel-offline-store.h | 6 +-
camel/camel-partition-table.h | 43 ++++++++++-
camel/camel-process.h | 6 +-
camel/camel-sasl-gssapi.h | 6 +-
camel/camel-search-private.h | 6 +-
camel/camel-search-sql-sexp.h | 6 +-
camel/camel-search-sql.h | 6 +-
camel/camel-seekable-substream.h | 22 +++++-
camel/camel-smime-context.h | 6 +-
camel/camel-store-summary.h | 6 +-
camel/camel-stream-buffer.h | 24 +++++-
camel/camel-stream-filter.h | 27 +++++--
camel/camel-stream-fs.h | 21 ++++-
camel/camel-stream-mem.h | 24 +++++-
camel/camel-stream-null.h | 27 +++++--
camel/camel-stream-process.h | 27 +++++--
camel/camel-stream-vfs.h | 22 +++++-
camel/camel-string-utils.h | 6 +-
camel/camel-text-index.h | 81 ++++++++++++++++++--
camel/camel-url-scanner.h | 6 +-
camel/camel-utf8.h | 6 +-
camel/camel-vee-folder.h | 6 +-
camel/camel-vee-store.h | 6 +-
camel/camel-vee-summary.h | 6 +-
camel/camel-vtrash-folder.h | 6 +-
.../providers/groupwise/camel-groupwise-journal.h | 6 +-
.../groupwise/camel-groupwise-store-summary.h | 6 +-
.../providers/groupwise/camel-groupwise-summary.h | 6 +-
camel/providers/groupwise/camel-groupwise-utils.h | 4 +-
camel/providers/imap/camel-imap-journal.h | 6 +-
camel/providers/imap/camel-imap-search.h | 6 +-
camel/providers/imap/camel-imap-store-summary.h | 6 +-
camel/providers/imap/camel-imap-summary.h | 6 +-
camel/providers/imap4/camel-imap4-command.h | 6 +-
camel/providers/imap4/camel-imap4-engine.h | 6 +-
camel/providers/imap4/camel-imap4-folder.h | 6 +-
camel/providers/imap4/camel-imap4-journal.h | 6 +-
camel/providers/imap4/camel-imap4-search.h | 6 +-
camel/providers/imap4/camel-imap4-specials.h | 6 +-
camel/providers/imap4/camel-imap4-store-summary.h | 6 +-
camel/providers/imap4/camel-imap4-store.h | 6 +-
camel/providers/imap4/camel-imap4-stream.h | 6 +-
camel/providers/imap4/camel-imap4-summary.h | 6 +-
camel/providers/imap4/camel-imap4-utils.h | 6 +-
camel/providers/imapp/camel-imapp-driver.h | 4 +-
camel/providers/imapp/camel-imapp-engine.h | 4 +-
camel/providers/imapp/camel-imapp-exception.h | 4 +-
camel/providers/imapp/camel-imapp-fetch-stream.h | 6 +-
camel/providers/imapp/camel-imapp-store-summary.h | 6 +-
camel/providers/imapp/camel-imapp-stream.h | 6 +-
camel/providers/imapp/camel-imapp-summary.h | 6 +-
camel/providers/imapp/camel-imapp-utils.h | 4 +-
camel/providers/local/camel-local-summary.h | 6 +-
camel/providers/local/camel-maildir-summary.h | 6 +-
camel/providers/local/camel-mbox-summary.h | 6 +-
camel/providers/local/camel-mh-summary.h | 6 +-
camel/providers/local/camel-spool-summary.h | 6 +-
camel/providers/nntp/camel-nntp-newsrc.h | 6 +-
camel/providers/nntp/camel-nntp-store-summary.h | 6 +-
camel/providers/nntp/camel-nntp-stream.h | 6 +-
camel/providers/nntp/camel-nntp-summary.h | 6 +-
camel/providers/pop3/camel-pop3-engine.h | 6 +-
camel/providers/pop3/camel-pop3-stream.h | 6 +-
camel/tests/lib/camel-test-provider.h | 4 +-
121 files changed, 934 insertions(+), 429 deletions(-)
diff --git a/camel/camel-address.h b/camel/camel-address.h
index e6c0295..76f4d66 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_ADDRESS_H
-#define _CAMEL_ADDRESS_H
+#ifndef CAMEL_ADDRESS_H
+#define CAMEL_ADDRESS_H
#include <glib.h>
#include <camel/camel-object.h>
@@ -87,4 +87,4 @@ void camel_address_remove (CamelAddress *addr, int index);
G_END_DECLS
-#endif /* ! _CAMEL_ADDRESS_H */
+#endif /* CAMEL_ADDRESS_H */
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index fecdebf..ca0c197 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_BLOCK_FILE_H
-#define _CAMEL_BLOCK_FILE_H
+#ifndef CAMEL_BLOCK_FILE_H
+#define CAMEL_BLOCK_FILE_H
#include <camel/camel-object.h>
#include <camel/camel-list-utils.h>
@@ -182,4 +182,4 @@ int camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_
G_END_DECLS
-#endif /* ! _CAMEL_BLOCK_FILE_H */
+#endif /* CAMEL_BLOCK_FILE_H */
diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h
index 82f5387..129e3bd 100644
--- a/camel/camel-certdb.h
+++ b/camel/camel-certdb.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_CERTDB_H__
-#define __CAMEL_CERTDB_H__
+#ifndef CAMEL_CERTDB_H
+#define CAMEL_CERTDB_H
#include <stdio.h>
#include <camel/camel-object.h>
@@ -160,4 +160,4 @@ void camel_cert_set_trust (CamelCertDB *certdb, CamelCert *cert, CamelCertTrust
G_END_DECLS
-#endif /* __CAMEL_CERTDB_H__ */
+#endif /* CAMEL_CERTDB_H */
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index 290c480..a3beb6b 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_CHARSET_MAP_H
-#define _CAMEL_CHARSET_MAP_H
+#ifndef CAMEL_CHARSET_MAP_H
+#define CAMEL_CHARSET_MAP_H
#include <glib.h>
@@ -45,4 +45,4 @@ const char *camel_charset_iso_to_windows (const char *isocharset);
G_END_DECLS
-#endif /* ! _CAMEL_CHARSET_MAP_H */
+#endif /* CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-db.h b/camel/camel-db.h
index 3eaeeb1..2dce8d2 100644
--- a/camel/camel-db.h
+++ b/camel/camel-db.h
@@ -1,7 +1,7 @@
/* Srinivasa Ragavan - <sragavan novell com> - GPL v2 or later */
-#ifndef __CAMEL_DB_H
-#define __CAMEL_DB_H
+#ifndef CAMEL_DB_H
+#define CAMEL_DB_H
#include <sqlite3.h>
#include <glib.h>
diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h
index 149d8b1..bcc3f6f 100644
--- a/camel/camel-digest-folder.h
+++ b/camel/camel-digest-folder.h
@@ -22,17 +22,32 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef _CAMEL_DIGEST_FOLDER_H
-#define _CAMEL_DIGEST_FOLDER_H
+#ifndef CAMEL_DIGEST_FOLDER_H
+#define CAMEL_DIGEST_FOLDER_H
#include <glib.h>
#include <camel/camel-store.h>
#include <camel/camel-folder.h>
#include <camel/camel-mime-message.h>
-#define CAMEL_DIGEST_FOLDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_digest_folder_get_type (), CamelDigestFolder)
-#define CAMEL_DIGEST_FOLDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_digest_folder_get_type (), CamelDigestFolderClass)
-#define CAMEL_IS_DIGEST_FOLDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_digest_folder_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_DIGEST_FOLDER \
+ (camel_digest_folder_get_type ())
+#define CAMEL_DIGEST_FOLDER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_DIGEST_FOLDER, CamelDigestFolder))
+#define CAMEL_DIGEST_FOLDER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_DIGEST_FOLDER, CamelDigestFolderClass))
+#define CAMEL_IS_DIGEST_FOLDER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_DIGEST_FOLDER))
+#define CAMEL_IS_DIGEST_FOLDER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_DIGEST_FOLDER))
+#define CAMEL_DIGEST_FOLDER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_DIGEST_FOLDER, CamelDigestFolderClass))
G_BEGIN_DECLS
@@ -55,6 +70,6 @@ CamelFolder *camel_digest_folder_new (CamelStore *parent_store, CamelMimeMe
G_END_DECLS
-#endif /* ! _CAMEL_DIGEST_FOLDER_H */
+#endif /* CAMEL_DIGEST_FOLDER_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-digest-store.h b/camel/camel-digest-store.h
index fec01da..9dfdf7e 100644
--- a/camel/camel-digest-store.h
+++ b/camel/camel-digest-store.h
@@ -22,15 +22,30 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef __CAMEL_DIGEST_STORE_H__
-#define __CAMEL_DIGEST_STORE_H__
+#ifndef CAMEL_DIGEST_STORE_H
+#define CAMEL_DIGEST_STORE_H
#include <glib.h>
#include <camel/camel-store.h>
-#define CAMEL_DIGEST_STORE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_digest_store_get_type (), CamelDigestStore)
-#define CAMEL_DIGEST_STORE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_digest_store_get_type (), CamelDigestStoreClass)
-#define CAMEL_IS_DIGEST_STORE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_digest_store_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_DIGEST_STORE \
+ (camel_digest_store_get_type ())
+#define CAMEL_DIGEST_STORE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_DIGEST_STORE, CamelDigestStore))
+#define CAMEL_DIGEST_STORE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_DIGEST_STORE, CamelDigestStoreClass))
+#define CAMEL_IS_DIGEST_STORE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_DIGEST_STORE))
+#define CAMEL_IS_DIGEST_STORE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_DIGEST_STORE))
+#define CAMEL_DIGEST_STORE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_DIGEST_STORE, CamelDigestStoreClass))
G_BEGIN_DECLS
@@ -38,12 +53,10 @@ typedef struct _CamelDigestStoreClass CamelDigestStoreClass;
struct _CamelDigestStore {
CamelStore parent;
-
};
struct _CamelDigestStoreClass {
CamelStoreClass parent_class;
-
};
GType camel_digest_store_get_type (void);
@@ -52,6 +65,6 @@ CamelStore *camel_digest_store_new (const char *url);
G_END_DECLS
-#endif /* __CAMEL_DIGEST_STORE_H__ */
+#endif /* CAMEL_DIGEST_STORE_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-digest-summary.h b/camel/camel-digest-summary.h
index c045d28..24e3a26 100644
--- a/camel/camel-digest-summary.h
+++ b/camel/camel-digest-summary.h
@@ -22,39 +22,51 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef __CAMEL_DIGEST_SUMMARY_H__
-#define __CAMEL_DIGEST_SUMMARY_H__
+#ifndef CAMEL_DIGEST_SUMMARY_H
+#define CAMEL_DIGEST_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-folder.h>
#include <camel/camel-exception.h>
-#define CAMEL_DIGEST_SUMMARY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_digest_summary_get_type (), CamelDigestSummary)
-#define CAMEL_DIGEST_SUMMARY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_digest_summary_get_type (), CamelDigestSummaryClass)
-#define CAMEL_IS_DIGEST_SUMMARY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_digest_summary_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_DIGEST_SUMMARY \
+ (camel_digest_summary_get_type ())
+#define CAMEL_DIGEST_SUMMARY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_DIGEST_SUMMARY, CamelDigestSummary))
+#define CAMEL_DIGEST_SUMMARY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_DIGEST_SUMMARY, CamelDigestSummaryClass))
+#define CAMEL_IS_DIGEST_SUMMARY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_DIGEST_SUMMARY))
+#define CAMEL_IS_DIGEST_SUMMARY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_DIGEST_SUMMARY))
+#define CAMEL_DIGEST_SUMMARY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_DIGEST_SUMMARY, CamelDigestSummaryClass))
G_BEGIN_DECLS
-typedef struct _CamelDigestSummary CamelDigestSummary;
+typedef struct _CamelDigestSummary CamelDigestSummary;
typedef struct _CamelDigestSummaryClass CamelDigestSummaryClass;
struct _CamelDigestSummary {
CamelFolderSummary parent_object;
-
};
struct _CamelDigestSummaryClass {
CamelFolderSummaryClass parent_class;
-
};
-
GType camel_digest_summary_get_type (void);
CamelFolderSummary *camel_digest_summary_new (void);
G_END_DECLS
-#endif /* __CAMEL_DIGEST_SUMMARY_H__ */
+#endif /* CAMEL_DIGEST_SUMMARY_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 74ae816..bd85e0e 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -30,10 +30,24 @@
#include <stdarg.h>
#include <stdio.h>
-#define CAMEL_DISCO_DIARY_TYPE (camel_disco_diary_get_type ())
-#define CAMEL_DISCO_DIARY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiary))
-#define CAMEL_DISCO_DIARY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiaryClass))
-#define CAMEL_IS_DISCO_DIARY(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_DISCO_DIARY_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_DISCO_DIARY \
+ (camel_disco_diary_get_type ())
+#define CAMEL_DISCO_DIARY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_DISCO_DIARY, CamelDiscoDiary))
+#define CAMEL_DISCO_DIARY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_DISCO_DIARY, CamelDiscoDiaryClass))
+#define CAMEL_IS_DISCO_DIARY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_DISCO_DIARY))
+#define CAMEL_IS_DISCO_DIARY_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_DISCO_DIARY))
+#define CAMEL_DISCO_DIARY_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_DISCO_DIARY, CamelDiscoDiaryClass))
G_BEGIN_DECLS
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index 5b03122..8e18b73 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FILTER_DRIVER_H
-#define _CAMEL_FILTER_DRIVER_H
+#ifndef CAMEL_FILTER_DRIVER_H
+#define CAMEL_FILTER_DRIVER_H
#include <glib.h>
#include <camel/camel-object.h>
@@ -111,4 +111,4 @@ struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n)
G_END_DECLS
-#endif /* ! _CAMEL_FILTER_DRIVER_H */
+#endif /* CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index 8f1b3b2..8ac611f 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -45,4 +45,4 @@ int camel_filter_search_match (CamelSession *session,
G_END_DECLS
-#endif /* ! CAMEL_FILTER_SEARCH_H */
+#endif /* CAMEL_FILTER_SEARCH_H */
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index bbbcae9..95c550c 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_SEARCH_H
-#define _CAMEL_FOLDER_SEARCH_H
+#ifndef CAMEL_FOLDER_SEARCH_H
+#define CAMEL_FOLDER_SEARCH_H
#include <libedataserver/e-sexp.h>
#include <camel/camel-folder.h>
@@ -147,4 +147,4 @@ void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
G_END_DECLS
-#endif /* ! _CAMEL_FOLDER_SEARCH_H */
+#endif /* CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index cfadf55..5d994bf 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_SUMMARY_H
-#define _CAMEL_FOLDER_SUMMARY_H
+#ifndef CAMEL_FOLDER_SUMMARY_H
+#define CAMEL_FOLDER_SUMMARY_H
#include <stdio.h>
#include <time.h>
@@ -482,4 +482,4 @@ int camel_folder_summary_migrate_infos(CamelFolderSummary *s);
G_END_DECLS
-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */
+#endif /* CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index d94a7fd..6a84768 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_THREAD_H
-#define _CAMEL_FOLDER_THREAD_H
+#ifndef CAMEL_FOLDER_THREAD_H
+#define CAMEL_FOLDER_THREAD_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-folder.h>
@@ -65,4 +65,4 @@ int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
G_END_DECLS
-#endif /* !_CAMEL_FOLDER_THREAD_H */
+#endif /* !CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-gpg-context.h b/camel/camel-gpg-context.h
index a2946cb..b860212 100644
--- a/camel/camel-gpg-context.h
+++ b/camel/camel-gpg-context.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_GPG_CONTEXT_H__
-#define __CAMEL_GPG_CONTEXT_H__
+#ifndef CAMEL_GPG_CONTEXT_H
+#define CAMEL_GPG_CONTEXT_H
#include <camel/camel-cipher-context.h>
@@ -56,4 +56,4 @@ void camel_gpg_context_set_always_trust (CamelGpgContext *ctx, gboolean trust);
G_END_DECLS
-#endif /* __CAMEL_GPG_CONTEXT_H__ */
+#endif /* CAMEL_GPG_CONTEXT_H */
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
index 1f761d4..42d42a9 100644
--- a/camel/camel-html-parser.h
+++ b/camel/camel-html-parser.h
@@ -25,8 +25,8 @@
* IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME
*/
-#ifndef _CAMEL_HTML_PARSER_H
-#define _CAMEL_HTML_PARSER_H
+#ifndef CAMEL_HTML_PARSER_H
+#define CAMEL_HTML_PARSER_H
#include <camel/camel-object.h>
@@ -94,4 +94,4 @@ const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArra
G_END_DECLS
-#endif /* ! _CAMEL_HTML_PARSER_H */
+#endif /* CAMEL_HTML_PARSER_H */
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index 5e2cc2a..f01a1b4 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_HTTP_STREAM_H__
-#define __CAMEL_HTTP_STREAM_H__
+#ifndef CAMEL_HTTP_STREAM_H
+#define CAMEL_HTTP_STREAM_H
#include <camel/camel-mime-parser.h>
#include <camel/camel-mime-utils.h>
@@ -97,4 +97,4 @@ CamelContentType *camel_http_stream_get_content_type (CamelHttpStream *http_stre
G_END_DECLS
-#endif /* __CAMEL_HTTP_STREAM_H__ */
+#endif /* CAMEL_HTTP_STREAM_H */
diff --git a/camel/camel-i18n.h b/camel/camel-i18n.h
index e4f87ec..dfe24d8 100644
--- a/camel/camel-i18n.h
+++ b/camel/camel-i18n.h
@@ -22,8 +22,8 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef __CAMEL_I18N_H__
-#define __CAMEL_I18N_H__
+#ifndef CAMEL_I18N_H
+#define CAMEL_I18N_H
#include <glib.h>
@@ -51,6 +51,6 @@
# define N_(String) (String)
#endif
-#endif /* __CAMEL_I18N_H__ */
+#endif /* CAMEL_I18N_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-iconv.h b/camel/camel-iconv.h
index 39a9147..842d0b1 100644
--- a/camel/camel-iconv.h
+++ b/camel/camel-iconv.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_ICONV_H__
-#define __CAMEL_ICONV_H__
+#ifndef CAMEL_ICONV_H
+#define CAMEL_ICONV_H
#include <sys/types.h>
#include <iconv.h>
@@ -47,4 +47,4 @@ void camel_iconv_close (iconv_t cd);
G_END_DECLS
-#endif /* __CAMEL_ICONV_H__ */
+#endif /* CAMEL_ICONV_H */
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 63df5d9..1370690 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_INDEX_H
-#define _CAMEL_INDEX_H
+#ifndef CAMEL_INDEX_H
+#define CAMEL_INDEX_H
#include <camel/camel-exception.h>
#include <camel/camel-object.h>
@@ -209,4 +209,4 @@ CamelIndexCursor *camel_index_names(CamelIndex *idx);
G_END_DECLS
-#endif /* ! _CAMEL_INDEX_H */
+#endif /* CAMEL_INDEX_H */
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index 5e7c2ed..72dcce1 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_INTERNET_ADDRESS_H
-#define _CAMEL_INTERNET_ADDRESS_H
+#ifndef CAMEL_INTERNET_ADDRESS_H
+#define CAMEL_INTERNET_ADDRESS_H
#include <camel/camel-address.h>
@@ -72,4 +72,4 @@ char * camel_internet_address_format_address(const char *name, const char *add
G_END_DECLS
-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */
+#endif /* CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-junk-plugin.h b/camel/camel-junk-plugin.h
index 6f0f54e..784fcb2 100644
--- a/camel/camel-junk-plugin.h
+++ b/camel/camel-junk-plugin.h
@@ -20,8 +20,8 @@
* USA
*/
-#ifndef _CAMEL_JUNK_PLUGIN_H
-#define _CAMEL_JUNK_PLUGIN_H
+#ifndef CAMEL_JUNK_PLUGIN_H
+#define CAMEL_JUNK_PLUGIN_H
#define CAMEL_JUNK_PLUGIN(x) ((CamelJunkPlugin *) x)
diff --git a/camel/camel-list-utils.h b/camel/camel-list-utils.h
index d2cb5aa..4dcbec3 100644
--- a/camel/camel-list-utils.h
+++ b/camel/camel-list-utils.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef _CAMEL_LIST_UTILS_H
-#define _CAMEL_LIST_UTILS_H
+#ifndef CAMEL_LIST_UTILS_H
+#define CAMEL_LIST_UTILS_H
#include <glib.h>
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 6206585..b9e2e12 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -21,8 +21,8 @@
/* defines protocol for lock helper process ipc */
-#ifndef _CAMEL_LOCK_CLIENT_H
-#define _CAMEL_LOCK_CLIENT_H
+#ifndef CAMEL_LOCK_CLIENT_H
+#define CAMEL_LOCK_CLIENT_H
#include <camel/camel-exception.h>
@@ -33,4 +33,4 @@ int camel_lock_helper_unlock(int lockid);
G_END_DECLS
-#endif /* !_CAMEL_LOCK_HELPER_H */
+#endif /* !CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 0dbcfd7..ab464c5 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -21,8 +21,8 @@
/* defines protocol for lock helper process ipc */
-#ifndef _CAMEL_LOCK_HELPER_H
-#define _CAMEL_LOCK_HELPER_H
+#ifndef CAMEL_LOCK_HELPER_H
+#define CAMEL_LOCK_HELPER_H
#include <glib.h>
@@ -61,4 +61,4 @@ enum {
G_END_DECLS
-#endif /* !_CAMEL_LOCK_HELPER_H */
+#endif /* !CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 198b7d5..9ea31dc 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -19,8 +19,8 @@
* USA
*/
-#ifndef _CAMEL_LOCK_H
-#define _CAMEL_LOCK_H
+#ifndef CAMEL_LOCK_H
+#define CAMEL_LOCK_H
#include <camel/camel-exception.h>
@@ -55,4 +55,4 @@ void camel_unlock_folder(const char *path, int fd);
G_END_DECLS
-#endif /* !_CAMEL_LOCK_H */
+#endif /* !CAMEL_LOCK_H */
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index 2f5a3fb..70361b5 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_BASIC_H
-#define _CAMEL_MIME_FILTER_BASIC_H
+#ifndef CAMEL_MIME_FILTER_BASIC_H
+#define CAMEL_MIME_FILTER_BASIC_H
#include <camel/camel-mime-filter.h>
@@ -78,4 +78,4 @@ CamelMimeFilterBasic *camel_mime_filter_basic_new_type (CamelMimeFilterBasi
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
+#endif /* CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index 1274022..49aa691 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_BESTENC_H
-#define _CAMEL_MIME_FILTER_BESTENC_H
+#ifndef CAMEL_MIME_FILTER_BESTENC_H
+#define CAMEL_MIME_FILTER_BESTENC_H
#include <camel/camel-mime-filter.h>
#include <camel/camel-mime-part.h>
@@ -106,4 +106,4 @@ void camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *filter, unsi
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */
+#endif /* CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-canon.h b/camel/camel-mime-filter-canon.h
index 5712b76..5d61c0e 100644
--- a/camel/camel-mime-filter-canon.h
+++ b/camel/camel-mime-filter-canon.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_CANON_H
-#define _CAMEL_MIME_FILTER_CANON_H
+#ifndef CAMEL_MIME_FILTER_CANON_H
+#define CAMEL_MIME_FILTER_CANON_H
#include <camel/camel-mime-filter.h>
@@ -71,4 +71,4 @@ CamelMimeFilter *camel_mime_filter_canon_new(guint32 flags);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CANON_H */
+#endif /* CAMEL_MIME_FILTER_CANON_H */
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index 5667a5b..c5d1f35 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_CHARSET_H
-#define _CAMEL_MIME_FILTER_CHARSET_H
+#ifndef CAMEL_MIME_FILTER_CHARSET_H
+#define CAMEL_MIME_FILTER_CHARSET_H
#include <camel/camel-mime-filter.h>
#include <iconv.h>
@@ -69,4 +69,4 @@ CamelMimeFilterCharset *camel_mime_filter_charset_new_convert (const char *
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
+#endif /* CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index aedf2ec..d1a1e87 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -21,8 +21,8 @@
*/
-#ifndef _CAMEL_MIME_FILTER_CRLF_H
-#define _CAMEL_MIME_FILTER_CRLF_H
+#ifndef CAMEL_MIME_FILTER_CRLF_H
+#define CAMEL_MIME_FILTER_CRLF_H
#include <camel/camel-mime-filter.h>
@@ -79,4 +79,4 @@ CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direct
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CRLF_H */
+#endif /* CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-enriched.h b/camel/camel-mime-filter-enriched.h
index b6ee7f0..363b054 100644
--- a/camel/camel-mime-filter-enriched.h
+++ b/camel/camel-mime-filter-enriched.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_MIME_FILTER_ENRICHED_H__
-#define __CAMEL_MIME_FILTER_ENRICHED_H__
+#ifndef CAMEL_MIME_FILTER_ENRICHED_H
+#define CAMEL_MIME_FILTER_ENRICHED_H
#include <camel/camel-mime-filter.h>
@@ -57,4 +57,4 @@ char *camel_enriched_to_html(const char *in, guint32 flags);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_ENRICHED_H__ */
+#endif /* CAMEL_MIME_FILTER_ENRICHED_H */
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index 1e7f231..6d9f90a 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_MIME_FILTER_FROM_H
-#define _CAMEL_MIME_FILTER_FROM_H
+#ifndef CAMEL_MIME_FILTER_FROM_H
+#define CAMEL_MIME_FILTER_FROM_H
#include <camel/camel-mime-filter.h>
@@ -64,4 +64,4 @@ CamelMimeFilterFrom *camel_mime_filter_from_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */
+#endif /* CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-gzip.h b/camel/camel-mime-filter-gzip.h
index 4ba7cd9..c09b365 100644
--- a/camel/camel-mime-filter-gzip.h
+++ b/camel/camel-mime-filter-gzip.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_MIME_FILTER_GZIP_H__
-#define __CAMEL_MIME_FILTER_GZIP_H__
+#ifndef CAMEL_MIME_FILTER_GZIP_H
+#define CAMEL_MIME_FILTER_GZIP_H
#include <camel/camel-mime-filter.h>
@@ -64,4 +64,4 @@ CamelMimeFilter *camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, int l
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_GZIP_H__ */
+#endif /* CAMEL_MIME_FILTER_GZIP_H */
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index e6873a1..9cbe033 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -20,14 +20,29 @@
*/
-#ifndef _CAMEL_MIME_FILTER_HTML_H
-#define _CAMEL_MIME_FILTER_HTML_H
+#ifndef CAMEL_MIME_FILTER_HTML_H
+#define CAMEL_MIME_FILTER_HTML_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_HTML(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_html_get_type (), CamelMimeFilterHTML)
-#define CAMEL_MIME_FILTER_HTML_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_html_get_type (), CamelMimeFilterHTMLClass)
-#define CAMEL_IS_MIME_FILTER_HTML(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_html_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_HTML \
+ (camel_mime_filter_html_get_type ())
+#define CAMEL_MIME_FILTER_HTML(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_HTML, CamelMimeFilterHTML))
+#define CAMEL_MIME_FILTER_HTML_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_HTML, CamelMimeFilterHTMLClass))
+#define CAMEL_IS_MIME_FILTER_HTML(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_HTML))
+#define CAMEL_IS_MIME_FILTER_HTML_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_HTML))
+#define CAMEL_MIME_FILTER_HTML_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_HTML, CamelMimeFilterHTMLClass))
G_BEGIN_DECLS
@@ -49,4 +64,4 @@ CamelMimeFilterHTML *camel_mime_filter_html_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_HTML_H */
+#endif /* CAMEL_MIME_FILTER_HTML_H */
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index e1594af..35a351c 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -20,14 +20,29 @@
*/
-#ifndef _CAMEL_MIME_FILTER_INDEX_H
-#define _CAMEL_MIME_FILTER_INDEX_H
+#ifndef CAMEL_MIME_FILTER_INDEX_H
+#define CAMEL_MIME_FILTER_INDEX_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_INDEX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)
-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)
-#define CAMEL_IS_MIME_FILTER_INDEX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_index_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_INDEX \
+ (camel_mime_filter_index_get_type ())
+#define CAMEL_MIME_FILTER_INDEX(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_INDEX, CamelMimeFilterIndex))
+#define CAMEL_MIME_FILTER_INDEX_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_INDEX, CamelMimeFilterIndexClass))
+#define CAMEL_IS_MIME_FILTER_INDEX(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_INDEX))
+#define CAMEL_IS_MIME_FILTER_INDEX_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_INDEX))
+#define CAMEL_MIME_FILTER_INDEX_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_INDEX, CamelMimeFilterIndexClass))
G_BEGIN_DECLS
@@ -57,4 +72,4 @@ void camel_mime_filter_index_set_index (CamelMimeFilterIndex *filter, struct _Ca
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */
+#endif /* CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index 6ab7de2..5eba78c 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -19,15 +19,29 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_LINEWRAP_H
-#define _CAMEL_MIME_FILTER_LINEWRAP_H
+#ifndef CAMEL_MIME_FILTER_LINEWRAP_H
+#define CAMEL_MIME_FILTER_LINEWRAP_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_LINEWRAP_TYPE (camel_mime_filter_linewrap_get_type ())
-#define CAMEL_MIME_FILTER_LINEWRAP(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrap)
-#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass)
-#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE)
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_LINEWRAP \
+ (camel_mime_filter_linewrap_get_type ())
+#define CAMEL_MIME_FILTER_LINEWRAP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_LINEWRAP, CamelMimeFilterLinewrap))
+#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_LINEWRAP, CamelMimeFilterLinewrapClass))
+#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_LINEWRAP))
+#define CAMEL_IS_MIME_FILTER_LINEWRAP_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_LINEWRAP))
+#define CAMEL_MIME_FILTER_LINEWRAP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_LINEWRAP, CamelMimeFilterLinewrapClass))
G_BEGIN_DECLS
@@ -52,4 +66,4 @@ CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */
+#endif /* CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-pgp.h b/camel/camel-mime-filter-pgp.h
index 3930a3a..aac1e3f 100644
--- a/camel/camel-mime-filter-pgp.h
+++ b/camel/camel-mime-filter-pgp.h
@@ -19,15 +19,29 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_PGP_H
-#define _CAMEL_MIME_FILTER_PGP_H
+#ifndef CAMEL_MIME_FILTER_PGP_H
+#define CAMEL_MIME_FILTER_PGP_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_PGP_TYPE (camel_mime_filter_canon_get_type ())
-#define CAMEL_MIME_FILTER_PGP(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, CAMEL_MIME_FILTER_PGP_TYPE, CamelMimeFilterPgp)
-#define CAMEL_MIME_FILTER_PGP_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_PGP_TYPE, CamelMimeFilterPgpClass)
-#define CAMEL_IS_MIME_FILTER_PGP(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, CAMEL_MIME_FILTER_PGP_TYPE)
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_PGP \
+ (camel_mime_filter_canon_get_type ())
+#define CAMEL_MIME_FILTER_PGP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PGP, CamelMimeFilterPgp))
+#define CAMEL_MIME_FILTER_PGP_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_PGP, CamelMimeFilterPgpClass))
+#define CAMEL_IS_MIME_FILTER_PGP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PGP))
+#define CAMEL_IS_MIME_FILTER_PGP_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_PGP))
+#define CAMEL_MIME_FILTER_PGP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PGP, CamelMimeFilterPgpClass))
G_BEGIN_DECLS
@@ -46,4 +60,4 @@ CamelMimeFilter *camel_mime_filter_pgp_new(void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_PGP_H */
+#endif /* CAMEL_MIME_FILTER_PGP_H */
diff --git a/camel/camel-mime-filter-progress.h b/camel/camel-mime-filter-progress.h
index d8fac31..2a0e3c6 100644
--- a/camel/camel-mime-filter-progress.h
+++ b/camel/camel-mime-filter-progress.h
@@ -21,15 +21,30 @@
*/
-#ifndef __CAMEL_MIME_FILTER_PROGRESS_H__
-#define __CAMEL_MIME_FILTER_PROGRESS_H__
+#ifndef CAMEL_MIME_FILTER_PROGRESS_H
+#define CAMEL_MIME_FILTER_PROGRESS_H
#include <camel/camel-operation.h>
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_PROGRESS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_progress_get_type (), CamelMimeFilterProgress)
-#define CAMEL_MIME_FILTER_PROGRESS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_progress_get_type (), CamelMimeFilterProgressClass)
-#define CAMEL_IS_MIME_FILTER_PROGRESS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_progress_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_PROGRESS \
+ (camel_mime_filter_progress_get_type ())
+#define CAMEL_MIME_FILTER_PROGRESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PROGRESS, CamelMimeFilterProgress))
+#define CAMEL_MIME_FILTER_PROGRESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_PROGRESS, CamelMimeFilterProgressClass))
+#define CAMEL_IS_MIME_FILTER_PROGRESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PROGRESS))
+#define CAMEL_IS_MIME_FILTER_PROGRESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_PROGRESS))
+#define CAMEL_MIME_FILTER_PROGRESS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_PROGRESS, CamelMimeFilterProgressClass))
G_BEGIN_DECLS
@@ -56,4 +71,4 @@ CamelMimeFilter *camel_mime_filter_progress_new (CamelOperation *operation, size
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_PROGRESS_H__ */
+#endif /* CAMEL_MIME_FILTER_PROGRESS_H */
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
index dd59d76..f7bbd36 100644
--- a/camel/camel-mime-filter-save.c
+++ b/camel/camel-mime-filter-save.c
@@ -106,7 +106,7 @@ camel_mime_filter_save_new (void)
{
CamelMimeFilterSave *save;
- save = g_object_new (CAMEL_TYPE_MIME_FILTER_SAVE);
+ save = g_object_new (CAMEL_TYPE_MIME_FILTER_SAVE, NULL);
save->stream = camel_stream_mem_new ();
return CAMEL_MIME_FILTER (save);
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
index 8e9a749..9e55862 100644
--- a/camel/camel-mime-filter-save.h
+++ b/camel/camel-mime-filter-save.h
@@ -21,16 +21,30 @@
*/
-#ifndef __CAMEL_MIME_FILTER_SAVE_H__
-#define __CAMEL_MIME_FILTER_SAVE_H__
+#ifndef CAMEL_MIME_FILTER_SAVE_H
+#define CAMEL_MIME_FILTER_SAVE_H
#include <camel/camel-mime-filter.h>
#include <camel/camel-seekable-stream.h>
-#define CAMEL_MIME_FILTER_SAVE_TYPE (camel_mime_filter_save_get_type ())
-#define CAMEL_MIME_FILTER_SAVE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)
-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)
-#define CAMEL_IS_MIME_FILTER_SAVE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_save_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_SAVE \
+ (camel_mime_filter_save_get_type ())
+#define CAMEL_MIME_FILTER_SAVE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_SAVE, CamelMimeFilterSave))
+#define CAMEL_MIME_FILTER_SAVE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_SAVE, CamelMimeFilterSaveClass))
+#define CAMEL_IS_MIME_FILTER_SAVE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_SAVE))
+#define CAMEL_IS_MIME_FILTER_SAVE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_SAVE))
+#define CAMEL_MIME_FILTER_SAVE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_SAVE, CamelMimeFilterSaveClass))
G_BEGIN_DECLS
@@ -53,4 +67,4 @@ CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_SAVE_H__ */
+#endif /* CAMEL_MIME_FILTER_SAVE_H */
diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h
index 55cfce1..ac2498a 100644
--- a/camel/camel-mime-filter-tohtml.h
+++ b/camel/camel-mime-filter-tohtml.h
@@ -21,14 +21,29 @@
*/
-#ifndef __CAMEL_MIME_FILTER_TOHTML_H__
-#define __CAMEL_MIME_FILTER_TOHTML_H__
+#ifndef CAMEL_MIME_FILTER_TOHTML_H
+#define CAMEL_MIME_FILTER_TOHTML_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_TOHTML(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTML)
-#define CAMEL_MIME_FILTER_TOHTML_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTMLClass)
-#define CAMEL_IS_MIME_FILTER_TOHTML(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_tohtml_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_TOHTML \
+ (camel_mime_filter_tohtml_get_type ())
+#define CAMEL_MIME_FILTER_TOHTML(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_FILTER_TOHTML, CamelMimeFilterToHTML))
+#define CAMEL_MIME_FILTER_TOHTML_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_FILTER_TOHTML, CamelMimeFilterToHTMLClass))
+#define CAMEL_IS_MIME_FILTER_TOHTML(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_FILTER_TOHTML))
+#define CAMEL_IS_MIME_FILTER_TOHTML_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_FILTER_TOHTML))
+#define CAMEL_MIME_FILTER_TOHTML_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_FILTER_TOHTML, CamelMimeFilterToHTMLClass))
#define CAMEL_MIME_FILTER_TOHTML_PRE (1 << 0)
#define CAMEL_MIME_FILTER_TOHTML_CONVERT_NL (1 << 1)
@@ -74,4 +89,4 @@ char *camel_text_to_html (const char *in, guint32 flags, guint32 colour);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_TOHTML_H__ */
+#endif /* CAMEL_MIME_FILTER_TOHTML_H */
diff --git a/camel/camel-mime-filter-windows.h b/camel/camel-mime-filter-windows.h
index d7d8138..1dc6c7e 100644
--- a/camel/camel-mime-filter-windows.h
+++ b/camel/camel-mime-filter-windows.h
@@ -21,14 +21,29 @@
*/
-#ifndef __CAMEL_MIME_FILTER_WINDOWS_H__
-#define __CAMEL_MIME_FILTER_WINDOWS_H__
+#ifndef CAMEL_MIME_FILTER_WINDOWS_H
+#define CAMEL_MIME_FILTER_WINDOWS_H
#include <camel/camel-mime-filter.h>
-#define CAMEL_MIME_FILTER_WINDOWS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_windows_get_type (), CamelMimeFilterWindows)
-#define CAMEL_MIME_FILTER_WINDOWS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_windows_get_type (), CamelMimeFilterWindowsClass)
-#define CAMEL_IS_MIME_FILTER_WINDOWS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_windows_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER_WINDOWS \
+ (camel_mime_filter_windows_get_type ())
+#define CAMEL_MIME_FILTER_WINDOWS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER_WINDOWS, CamelMimeFilterWindows))
+#define CAMEL_MIME_FILTER_WINDOWS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER_WINDOWS, CamelMimeFilterWindowsClass))
+#define CAMEL_IS_MIME_FILTER_WINDOWS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER_WINDOWS))
+#define CAMEL_IS_MIME_FILTER_WINDOWS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER_WINDOWS))
+#define CAMEL_MIME_FILTER_WINDOWS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER_WINDOWS, CamelMimeFilterWindowsClass))
G_BEGIN_DECLS
@@ -57,4 +72,4 @@ const char *camel_mime_filter_windows_real_charset (CamelMimeFilterWindows *filt
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_WINDOWS_H__ */
+#endif /* CAMEL_MIME_FILTER_WINDOWS_H */
diff --git a/camel/camel-mime-filter-yenc.h b/camel/camel-mime-filter-yenc.h
index a01c2e5..9810820 100644
--- a/camel/camel-mime-filter-yenc.h
+++ b/camel/camel-mime-filter-yenc.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_MIME_FILTER_YENC_H__
-#define __CAMEL_MIME_FILTER_YENC_H__
+#ifndef CAMEL_MIME_FILTER_YENC_H
+#define CAMEL_MIME_FILTER_YENC_H
#include <camel/camel-mime-filter.h>
@@ -101,4 +101,4 @@ size_t camel_yencode_close (const unsigned char *in, size_t inlen, unsigned char
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_YENC_H__ */
+#endif /* CAMEL_MIME_FILTER_YENC_H */
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index 35c7a5a..8b4b3af 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -21,16 +21,30 @@
/* Abstract class for non-copying filters */
-#ifndef _CAMEL_MIME_FILTER_H
-#define _CAMEL_MIME_FILTER_H
+#ifndef CAMEL_MIME_FILTER_H
+#define CAMEL_MIME_FILTER_H
#include <sys/types.h>
#include <camel/camel-object.h>
-#define CAMEL_MIME_FILTER_TYPE (camel_mime_filter_get_type ())
-#define CAMEL_MIME_FILTER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)
-#define CAMEL_MIME_FILTER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)
-#define CAMEL_IS_MIME_FILTER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_filter_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_FILTER \
+ (camel_mime_filter_get_type ())
+#define CAMEL_MIME_FILTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_FILTER, CamelMimeFilter))
+#define CAMEL_MIME_FILTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_FILTER, CamelMimeFilterClass))
+#define CAMEL_IS_MIME_FILTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_FILTER))
+#define CAMEL_IS_MIME_FILTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_FILTER))
+#define CAMEL_MIME_FILTER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_FILTER, CamelMimeFilterClass))
G_BEGIN_DECLS
@@ -86,4 +100,4 @@ void camel_mime_filter_set_size(CamelMimeFilter *filter, size_t size, int keep);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_H */
+#endif /* CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index cb8f897..50e4e19 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -30,6 +30,25 @@
#include <camel/camel-internet-address.h>
#include <camel/camel-mime-filter-bestenc.h>
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_MESSAGE \
+ (camel_mime_message_get_type ())
+#define CAMEL_MIME_MESSAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_MESSAGE, CamelMimeMessage))
+#define CAMEL_MIME_MESSAGE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_MESSAGE, CamelMimeMessageClass))
+#define CAMEL_IS_MIME_MESSAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_MESSAGE))
+#define CAMEL_IS_MIME_MESSAGE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_MESSAGE))
+#define CAMEL_MIME_MESSAGE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_MESSAGE, CamelMimeMessageClass))
+
#define CAMEL_RECIPIENT_TYPE_TO "To"
#define CAMEL_RECIPIENT_TYPE_CC "Cc"
#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"
@@ -38,11 +57,6 @@
#define CAMEL_RECIPIENT_TYPE_RESENT_CC "Resent-Cc"
#define CAMEL_RECIPIENT_TYPE_RESENT_BCC "Resent-Bcc"
-#define CAMEL_MIME_MESSAGE_TYPE (camel_mime_message_get_type ())
-#define CAMEL_MIME_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))
-#define CAMEL_MIME_MESSAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))
-#define CAMEL_IS_MIME_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))
-
/* specify local time */
#define CAMEL_MESSAGE_DATE_CURRENT (~0)
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index 8349dfa..d7fe1d8 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_MIME_PARSER_H
-#define _CAMEL_MIME_PARSER_H
+#ifndef CAMEL_MIME_PARSER_H
+#define CAMEL_MIME_PARSER_H
#include <camel/camel-object.h>
@@ -29,9 +29,24 @@
#include <camel/camel-mime-filter.h>
#include <camel/camel-stream.h>
-#define CAMEL_MIME_PARSER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)
-#define CAMEL_MIME_PARSER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)
-#define CAMEL_IS_MIME_PARSER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_mime_parser_get_type ())
+/* Stardard GObject macros */
+#define CAMEL_TYPE_MIME_PARSER \
+ (camel_mime_parser_get_type ())
+#define CAMEL_MIME_PARSER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_PARSER, CamelMimeParser))
+#define CAMEL_MIME_PARSER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_PARSER, CamelMimeParserClass))
+#define CAMEL_IS_MIME_PARSER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_PARSER))
+#define CAMEL_IS_MIME_PARSER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_PARSER))
+#define CAMEL_MIME_PARSER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_PARSER, CamelMimeParserClass))
G_BEGIN_DECLS
@@ -140,4 +155,4 @@ off_t camel_mime_parser_tell_start_boundary(CamelMimeParser *parser);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_PARSER_H */
+#endif /* CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 28fcc35..a4f47b0 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -31,10 +31,24 @@
#include <camel/camel-mime-utils.h>
#include <camel/camel-mime-parser.h>
-#define CAMEL_MIME_PART_TYPE (camel_mime_part_get_type ())
-#define CAMEL_MIME_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))
-#define CAMEL_MIME_PART_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))
-#define CAMEL_IS_MIME_PART(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MIME_PART_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_MIME_PART \
+ (camel_mime_part_get_type ())
+#define CAMEL_MIME_PART(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MIME_PART, CamelMimePart))
+#define CAMEL_MIME_PART_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MIME_PART, CamelMimePartClass))
+#define CAMEL_IS_MIME_PART(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MIME_PART))
+#define CAMEL_IS_MIME_PART_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MIME_PART))
+#define CAMEL_MIME_PART_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MIME_PART, CamelMimePartClass))
G_BEGIN_DECLS
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index c9e967b..ac1a8c0 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -21,8 +21,8 @@
*/
-#ifndef _CAMEL_MIME_UTILS_H
-#define _CAMEL_MIME_UTILS_H
+#ifndef CAMEL_MIME_UTILS_H
+#define CAMEL_MIME_UTILS_H
#include <time.h>
#include <glib.h>
@@ -284,4 +284,4 @@ extern unsigned short camel_mime_special_table[256];
G_END_DECLS
-#endif /* ! _CAMEL_MIME_UTILS_H */
+#endif /* CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-multipart-encrypted.h b/camel/camel-multipart-encrypted.h
index 3650579..5f0df97 100644
--- a/camel/camel-multipart-encrypted.h
+++ b/camel/camel-multipart-encrypted.h
@@ -21,15 +21,29 @@
*/
-#ifndef __CAMEL_MULTIPART_ENCRYPTED_H__
-#define __CAMEL_MULTIPART_ENCRYPTED_H__
+#ifndef CAMEL_MULTIPART_ENCRYPTED_H
+#define CAMEL_MULTIPART_ENCRYPTED_H
#include <camel/camel-multipart.h>
-#define CAMEL_MULTIPART_ENCRYPTED_TYPE (camel_multipart_encrypted_get_type ())
-#define CAMEL_MULTIPART_ENCRYPTED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MULTIPART_ENCRYPTED_TYPE, CamelMultipartEncrypted))
-#define CAMEL_MULTIPART_ENCRYPTED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_ENCRYPTED_TYPE, CamelMultipartEncryptedClass))
-#define CAMEL_IS_MULTIPART_ENCRYPTED(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MULTIPART_ENCRYPTED_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_MULTIPART_ENCRYPTED \
+ (camel_multipart_encrypted_get_type ())
+#define CAMEL_MULTIPART_ENCRYPTED(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MULTIPART_ENCRYPTED, CamelMultipartEncrypted))
+#define CAMEL_MULTIPART_ENCRYPTED_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MULTIPART_ENCRYPTED, CamelMultipartEncryptedClass))
+#define CAMEL_IS_MULTIPART_ENCRYPTED(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MULTIPART_ENCRYPTED))
+#define CAMEL_IS_MULTIPART_ENCRYPTED_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MULTIPART_ENCRYPTED))
+#define CAMEL_MULTIPART_ENCRYPTED_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MULTIPART_ENCRYPTED, CamelMultipartEncryptedClass))
G_BEGIN_DECLS
@@ -63,4 +77,4 @@ CamelMultipartEncrypted *camel_multipart_encrypted_new (void);
G_END_DECLS
-#endif /* __CAMEL_MULTIPART_ENCRYPTED_H__ */
+#endif /* CAMEL_MULTIPART_ENCRYPTED_H */
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index d98cdd1..6621cbc 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -173,7 +173,7 @@ camel_multipart_signed_get_type (void)
CamelMultipartSigned *
camel_multipart_signed_new (void)
{
- return g_object_new (CAMEL_TYPE_MULTIPART_SIGNED_TYPE, NULL);
+ return g_object_new (CAMEL_TYPE_MULTIPART_SIGNED, NULL);
}
static int
diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h
index c4e312b..cc599ea 100644
--- a/camel/camel-multipart-signed.h
+++ b/camel/camel-multipart-signed.h
@@ -29,10 +29,24 @@
#include <camel/camel-multipart.h>
-#define CAMEL_MULTIPART_SIGNED_TYPE (camel_multipart_signed_get_type ())
-#define CAMEL_MULTIPART_SIGNED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MULTIPART_SIGNED_TYPE, CamelMultipartSigned))
-#define CAMEL_MULTIPART_SIGNED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_SIGNED_TYPE, CamelMultipartSignedClass))
-#define CAMEL_IS_MULTIPART_SIGNED(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MULTIPART_SIGNED_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_MULTIPART_SIGNED \
+ (camel_multipart_signed_get_type ())
+#define CAMEL_MULTIPART_SIGNED(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MULTIPART_SIGNED, CamelMultipartSigned))
+#define CAMEL_MULTIPART_SIGNED_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MULTIPART_SIGNED, CamelMultipartSignedClass))
+#define CAMEL_IS_MULTIPART_SIGNED(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MULTIPART_SIGNED))
+#define CAMEL_IS_MULTIPART_SIGNED_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MULTIPART_SIGNED))
+#define CAMEL_MULTIPART_SIGNED_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MULTIPART_SIGNED, CamelMultipartSignedClass))
G_BEGIN_DECLS
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index 4a752b7..3af2a63 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -29,10 +29,24 @@
#include <camel/camel-data-wrapper.h>
-#define CAMEL_MULTIPART_TYPE (camel_multipart_get_type ())
-#define CAMEL_MULTIPART(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))
-#define CAMEL_MULTIPART_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))
-#define CAMEL_IS_MULTIPART(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_MULTIPART_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_MULTIPART \
+ (camel_multipart_get_type ())
+#define CAMEL_MULTIPART(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MULTIPART, CamelMultipart))
+#define CAMEL_MULTIPART_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MULTIPART, CamelMultipartClass))
+#define CAMEL_IS_MULTIPART(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MULTIPART))
+#define CAMEL_IS_MULTIPART_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MULTIPART))
+#define CAMEL_MULTIPART_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MULTIPART, CamelMultipartClass))
G_BEGIN_DECLS
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
index aae4e14..a077e92 100644
--- a/camel/camel-news-address.h
+++ b/camel/camel-news-address.h
@@ -21,8 +21,8 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef _CAMEL_NEWS_ADDRESS_H
-#define _CAMEL_NEWS_ADDRESS_H
+#ifndef CAMEL_NEWS_ADDRESS_H
+#define CAMEL_NEWS_ADDRESS_H
#include <camel/camel-address.h>
@@ -49,6 +49,6 @@ CamelNewsAddress *camel_news_address_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
+#endif /* CAMEL_NEWS_ADDRESS_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h
index d8b000f..f84ba0a 100644
--- a/camel/camel-nntp-address.h
+++ b/camel/camel-nntp-address.h
@@ -19,14 +19,29 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_ADDRESS_H
-#define _CAMEL_NNTP_ADDRESS_H
+#ifndef CAMEL_NNTP_ADDRESS_H
+#define CAMEL_NNTP_ADDRESS_H
#include <camel/camel-address.h>
-#define CAMEL_NNTP_ADDRESS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_nntp_address_get_type (), CamelNNTPAddress)
-#define CAMEL_NNTP_ADDRESS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_nntp_address_get_type (), CamelNNTPAddressClass)
-#define CAMEL_IS_NNTP_ADDRESS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_nntp_address_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_NNTP_ADDRESS \
+ (camel_nntp_address_get_type ())
+#define CAMEL_NNTP_ADDRESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_NNTP_ADDRESS, CamelNNTPAddress))
+#define CAMEL_NNTP_ADDRESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_NNTP_ADDRESS, CamelNNTPAddressClass))
+#define CAMEL_IS_NNTP_ADDRESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_NNTP_ADDRESS))
+#define CAMEL_IS_NNTP_ADDRESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_NNTP_ADDRESS))
+#define CAMEL_NNTP_ADDRESS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_NTTP_ADDRESS, CamelNNTPAddressClass))
G_BEGIN_DECLS
@@ -51,4 +66,4 @@ gboolean camel_nntp_address_get (const CamelNNTPAddress *a, int index, const ch
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_ADDRESS_H */
+#endif /* CAMEL_NNTP_ADDRESS_H */
diff --git a/camel/camel-offline-folder.h b/camel/camel-offline-folder.h
index 3f2ef82..165f9df 100644
--- a/camel/camel-offline-folder.h
+++ b/camel/camel-offline-folder.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_OFFLINE_FOLDER_H__
-#define __CAMEL_OFFLINE_FOLDER_H__
+#ifndef CAMEL_OFFLINE_FOLDER_H
+#define CAMEL_OFFLINE_FOLDER_H
#include <camel/camel-folder.h>
@@ -64,4 +64,4 @@ void camel_offline_folder_downsync (CamelOfflineFolder *offline, const char *exp
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_FOLDER_H__ */
+#endif /* CAMEL_OFFLINE_FOLDER_H */
diff --git a/camel/camel-offline-journal.h b/camel/camel-offline-journal.h
index bcb4135..1b33e14 100644
--- a/camel/camel-offline-journal.h
+++ b/camel/camel-offline-journal.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_OFFLINE_JOURNAL_H__
-#define __CAMEL_OFFLINE_JOURNAL_H__
+#ifndef CAMEL_OFFLINE_JOURNAL_H
+#define CAMEL_OFFLINE_JOURNAL_H
#include <stdio.h>
#include <stdarg.h>
@@ -77,4 +77,4 @@ int camel_offline_journal_replay (CamelOfflineJournal *journal, CamelException *
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_JOURNAL_H__ */
+#endif /* CAMEL_OFFLINE_JOURNAL_H */
diff --git a/camel/camel-offline-store.h b/camel/camel-offline-store.h
index 740346c..22c2865 100644
--- a/camel/camel-offline-store.h
+++ b/camel/camel-offline-store.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_OFFLINE_STORE_H__
-#define __CAMEL_OFFLINE_STORE_H__
+#ifndef CAMEL_OFFLINE_STORE_H
+#define CAMEL_OFFLINE_STORE_H
#include <camel/camel-store.h>
@@ -70,4 +70,4 @@ void camel_offline_store_prepare_for_offline (CamelOfflineStore *store, CamelExc
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_STORE_H__ */
+#endif /* CAMEL_OFFLINE_STORE_H */
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index 4e0d2d5..fcb231f 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_PARTITION_TABLE_H
-#define _CAMEL_PARTITION_TABLE_H
+#ifndef CAMEL_PARTITION_TABLE_H
+#define CAMEL_PARTITION_TABLE_H
#include <camel/camel-object.h>
#include <glib.h>
@@ -27,6 +27,43 @@
#include "camel-block-file.h"
#include "camel-list-utils.h"
+/* Standard GObject macros */
+#define CAMEL_TYPE_PARTITION_TABLE \
+ (camel_partition_table_get_type ())
+#define CAMEL_PARTITION_TABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTable))
+#define CAMEL_PARTITION_TABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTableClass))
+#define CAMEL_IS_PARTITION_TABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_PARTITION_TABLE))
+#define CAMEL_IS_PARTITION_TABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_PARTITION_TABLE))
+#define CAMEL_PARTITION_TABLE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTableClass))
+
+#define CAMEL_TYPE_KEY_TABLE \
+ (camel_key_table_get_type ())
+#define CAMEL_KEY_TABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_KEY_TABLE, CamelKeyTable))
+#define CAMEL_KEY_TABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_KEY_TABLE, CamelKeyTableClass))
+#define CAMEL_IS_KEY_TABLE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_KEY_TABLE))
+#define CAMEL_IS_KEY_TABLE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_KEY_TABLE))
+#define CAMEL_KEY_TABLE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_KEY_TABLE, CamelKeyTableClass))
+
G_BEGIN_DECLS
/* ********************************************************************** */
@@ -153,4 +190,4 @@ camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **key
G_END_DECLS
-#endif /* ! _CAMEL_PARTITION_TABLE_H */
+#endif /* CAMEL_PARTITION_TABLE_H */
diff --git a/camel/camel-process.h b/camel/camel-process.h
index 1c08ef0..d1ab41c 100644
--- a/camel/camel-process.h
+++ b/camel/camel-process.h
@@ -22,8 +22,8 @@
#ifndef CAMEL_DISABLE_DEPRECATED
-#ifndef __CAMEL_PROCESS_H__
-#define __CAMEL_PROCESS_H__
+#ifndef CAMEL_PROCESS_H
+#define CAMEL_PROCESS_H
#include <sys/types.h>
@@ -37,6 +37,6 @@ int camel_process_wait (pid_t pid);
G_END_DECLS
-#endif /* __CAMEL_PROCESS_H__ */
+#endif /* CAMEL_PROCESS_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-sasl-gssapi.h b/camel/camel-sasl-gssapi.h
index 70e4135..8ae251b 100644
--- a/camel/camel-sasl-gssapi.h
+++ b/camel/camel-sasl-gssapi.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_SASL_GSSAPI_H__
-#define __CAMEL_SASL_GSSAPI_H__
+#ifndef CAMEL_SASL_GSSAPI_H
+#define CAMEL_SASL_GSSAPI_H
#include <sys/types.h>
#include <camel/camel-sasl.h>
@@ -56,4 +56,4 @@ extern CamelServiceAuthType camel_sasl_gssapi_authtype;
G_END_DECLS
-#endif /* __CAMEL_SASL_GSSAPI_H__ */
+#endif /* CAMEL_SASL_GSSAPI_H */
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index 6a4807c..eb6a569 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_PRIVATE_H
-#define _CAMEL_SEARCH_PRIVATE_H
+#ifndef CAMEL_SEARCH_PRIVATE_H
+#define CAMEL_SEARCH_PRIVATE_H
/* POSIX requires <sys/types.h> be included before <regex.h> */
#include <sys/types.h>
@@ -89,4 +89,4 @@ void camel_search_words_free(struct _camel_search_words *);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_PRIVATE_H */
+#endif /* CAMEL_SEARCH_PRIVATE_H */
diff --git a/camel/camel-search-sql-sexp.h b/camel/camel-search-sql-sexp.h
index 1bcced0..584be08 100644
--- a/camel/camel-search-sql-sexp.h
+++ b/camel/camel-search-sql-sexp.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_SQL_SEXP_H
-#define _CAMEL_SEARCH_SQL_SEXP_H
+#ifndef CAMEL_SEARCH_SQL_SEXP_H
+#define CAMEL_SEARCH_SQL_SEXP_H
G_BEGIN_DECLS
@@ -29,4 +29,4 @@ char * camel_sexp_to_sql_sexp (const char *sexp);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_SQL_H */
+#endif /* CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-search-sql.h b/camel/camel-search-sql.h
index 845e0d1..3bc297e 100644
--- a/camel/camel-search-sql.h
+++ b/camel/camel-search-sql.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_SQL_H
-#define _CAMEL_SEARCH_SQL_H
+#ifndef CAMEL_SEARCH_SQL_H
+#define CAMEL_SEARCH_SQL_H
G_BEGIN_DECLS
@@ -28,4 +28,4 @@ char * camel_sexp_to_sql (const char *sexp);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_SQL_H */
+#endif /* CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 9fc4adc..9028781 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -28,10 +28,24 @@
#include <camel/camel-seekable-stream.h>
-#define CAMEL_SEEKABLE_SUBSTREAM_TYPE (camel_seekable_substream_get_type ())
-#define CAMEL_SEEKABLE_SUBSTREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))
-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))
-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_SEEKABLE_SUBSTREAM \
+ (camel_seekable_substream_get_type ())
+#define CAMEL_SEEKABLE_SUBSTREAM(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_SEEKABLE_SUBSTREAM, CamelSeekableSubstream))
+#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_SEEKABLE_SUBSTREAM, CamelSeekableSubstreamClass))
+#define CAMEL_IS_SEEKABLE_SUBSTREAM(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_SEEKABLE_SUBSTREAM))
+#define CAMEL_IS_SEEKABLE_SUBSTREAM_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_SEEKABLE_SUBSTREAM))
+#define CAMEL_SEEKABLE_SUBSTREAM_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_SEEKABLE_SUBSTREAM, CamelSeekableSubstreamClass))
G_BEGIN_DECLS
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
index e66f0e4..f88e5d6 100644
--- a/camel/camel-smime-context.h
+++ b/camel/camel-smime-context.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __CAMEL_SMIME_CONTEXT_H__
-#define __CAMEL_SMIME_CONTEXT_H__
+#ifndef CAMEL_SMIME_CONTEXT_H
+#define CAMEL_SMIME_CONTEXT_H
#include <camel/camel-cipher-context.h>
@@ -71,4 +71,4 @@ guint32 camel_smime_context_describe_part(CamelSMIMEContext *, struct _CamelMime
G_END_DECLS
-#endif /* __CAMEL_SMIME_CONTEXT_H__ */
+#endif /* CAMEL_SMIME_CONTEXT_H */
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 81bded9..f776312 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_STORE_SUMMARY_H
-#define _CAMEL_STORE_SUMMARY_H
+#ifndef CAMEL_STORE_SUMMARY_H
+#define CAMEL_STORE_SUMMARY_H
#include <stdio.h>
@@ -181,4 +181,4 @@ void camel_store_info_set_string(CamelStoreSummary *summary, CamelStoreInfo *inf
G_END_DECLS
-#endif /* ! _CAMEL_STORE_SUMMARY_H */
+#endif /* CAMEL_STORE_SUMMARY_H */
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 4511333..14b9a99 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -25,15 +25,29 @@
#ifndef CAMEL_STREAM_BUFFER_H
-#define CAMEL_STREAM_BUFFER_H 1
+#define CAMEL_STREAM_BUFFER_H
#include <stdio.h>
#include <camel/camel-seekable-stream.h>
-#define CAMEL_STREAM_BUFFER_TYPE (camel_stream_buffer_get_type ())
-#define CAMEL_STREAM_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))
-#define CAMEL_STREAM_BUFFER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))
-#define CAMEL_IS_STREAM_BUFFER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_BUFFER \
+ (camel_stream_buffer_get_type ())
+#define CAMEL_STREAM_BUFFER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_BUFFER, CamelStreamBuffer))
+#define CAMEL_STREAM_BUFFER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_BUFFER, CamelStreamBufferClass))
+#define CAMEL_IS_STREAM_BUFFER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_BUFFER))
+#define CAMEL_IS_STREAM_BUFFER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_BUFFER))
+#define CAMEL_STREAM_BUFFER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_BUFFER, CamelStreamBufferClass))
G_BEGIN_DECLS
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index 8a9563d..3e913f2 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -20,15 +20,30 @@
*/
-#ifndef _CAMEL_STREAM_FILTER_H
-#define _CAMEL_STREAM_FILTER_H
+#ifndef CAMEL_STREAM_FILTER_H
+#define CAMEL_STREAM_FILTER_H
#include <camel/camel-stream.h>
#include <camel/camel-mime-filter.h>
-#define CAMEL_STREAM_FILTER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)
-#define CAMEL_STREAM_FILTER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)
-#define CAMEL_IS_STREAM_FILTER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_stream_filter_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_FILTER \
+ (camel_stream_filter_get_type ())
+#define CAMEL_STREAM_FILTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_FILTER, CamelStreamFilter))
+#define CAMEL_STREAM_FILTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_FILTER, CamelStreamFilterClass))
+#define CAMEL_IS_STREAM_FILTER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_FILTER))
+#define CAMEL_IS_STREAM_FILTER_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_FILTER))
+#define CAMEL_STREAM_FILTER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_FILTER, CamelStreamFilterClass))
G_BEGIN_DECLS
@@ -55,4 +70,4 @@ void camel_stream_filter_remove (CamelStreamFilter *stream, int id);
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_FILTER_H */
+#endif /* CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 6a97a1c..e0f2953 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -33,10 +33,23 @@
#include <camel/camel-seekable-stream.h>
-#define CAMEL_STREAM_FS_TYPE (camel_stream_fs_get_type ())
-#define CAMEL_STREAM_FS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))
-#define CAMEL_STREAM_FS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))
-#define CAMEL_IS_STREAM_FS(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_STREAM_FS_TYPE))
+#define CAMEL_TYPE_STREAM_FS \
+ (camel_stream_fs_get_type ())
+#define CAMEL_STREAM_FS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_FS, CamelStreamFs))
+#define CAMEL_STREAM_FS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_FS, CamelStreamFsClass))
+#define CAMEL_IS_STREAM_FS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_FS))
+#define CAMEL_IS_STREAM_FS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_FS))
+#define CAMEL_STREAM_FS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_FS, CamelStreamFsClass))
G_BEGIN_DECLS
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 79f5198..c51a8cb 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -24,15 +24,29 @@
#ifndef CAMEL_STREAM_MEM_H
-#define CAMEL_STREAM_MEM_H 1
+#define CAMEL_STREAM_MEM_H
#include <sys/types.h>
#include <camel/camel-seekable-stream.h>
-#define CAMEL_STREAM_MEM_TYPE (camel_stream_mem_get_type ())
-#define CAMEL_STREAM_MEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))
-#define CAMEL_STREAM_MEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))
-#define CAMEL_IS_STREAM_MEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_STREAM_MEM_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_MEM \
+ (camel_stream_mem_get_type ())
+#define CAMEL_STREAM_MEM(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_MEM, CamelStreamMem))
+#define CAMEL_STREAM_MEM_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_MEM, CamelStreamMemClass))
+#define CAMEL_IS_STREAM_MEM(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_MEM))
+#define CAMEL_IS_STREAM_MEM_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_MEM))
+#define CAMEL_STREAM_MEM_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_MEM, CamelStreamMemClass))
G_BEGIN_DECLS
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index 3f806eb..8331c12 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -20,14 +20,29 @@
*/
-#ifndef _CAMEL_STREAM_NULL_H
-#define _CAMEL_STREAM_NULL_H
+#ifndef CAMEL_STREAM_NULL_H
+#define CAMEL_STREAM_NULL_H
#include <camel/camel-stream.h>
-#define CAMEL_STREAM_NULL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_stream_null_get_type (), CamelStreamNull)
-#define CAMEL_STREAM_NULL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_stream_null_get_type (), CamelStreamNullClass)
-#define CAMEL_IS_STREAM_NULL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_stream_null_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_NULL \
+ (camel_stream_null_get_type ())
+#define CAMEL_STREAM_NULL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_NULL, CamelStreamNull))
+#define CAMEL_STREAM_NULL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_NULL, CamelStreamNullClass))
+#define CAMEL_IS_STREAM_NULL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_NULL))
+#define CAMEL_IS_STREAM_NULL_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_NULL))
+#define CAMEL_STREAM_NULL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_NULL, CamelStreamNullClass))
G_BEGIN_DECLS
@@ -49,4 +64,4 @@ CamelStream *camel_stream_null_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_NULL_H */
+#endif /* CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h
index 7b9760c..08991d5 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -20,14 +20,29 @@
*/
-#ifndef _CAMEL_STREAM_NULL_H
-#define _CAMEL_STREAM_NULL_H
+#ifndef CAMEL_STREAM_NULL_H
+#define CAMEL_STREAM_NULL_H
#include <camel/camel-stream.h>
-#define CAMEL_STREAM_PROCESS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_stream_process_get_type (), CamelStreamProcess)
-#define CAMEL_STREAM_PROCESS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_stream_process_get_type (), CamelStreamProcessClass)
-#define CAMEL_IS_STREAM_PROCESS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_stream_process_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_PROCESS \
+ (camel_stream_process_get_type ())
+#define CAMEL_STREAM_PROCESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_PROCESS, CamelStreamProcess))
+#define CAMEL_STREAM_PROCESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_PROCESS, CamelStreamProcessClass))
+#define CAMEL_IS_STREAM_PROCESS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_PROCESS))
+#define CAMEL_IS_STREAM_PROCESS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_PROCESS))
+#define CAMEL_STREAM_PROCESS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_PROCSS, CamelStreamProcessClass))
G_BEGIN_DECLS
@@ -51,4 +66,4 @@ int camel_stream_process_connect(CamelStreamProcess *, const char *, const char
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_PROCESS_H */
+#endif /* CAMEL_STREAM_PROCESS_H */
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index 990f274..9cae371 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -31,10 +31,24 @@
#include <camel/camel-stream.h>
-#define CAMEL_STREAM_VFS_TYPE (camel_stream_vfs_get_type ())
-#define CAMEL_STREAM_VFS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CAMEL_STREAM_VFS_TYPE, CamelStreamVFS))
-#define CAMEL_STREAM_VFS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CAMEL_STREAM_VFS_TYPE, CamelStreamVFSClass))
-#define CAMEL_IS_STREAM_VFS(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), CAMEL_STREAM_VFS_TYPE))
+/* Standard GObject macros */
+#define CAMEL_TYPE_STREAM_VFS \
+ (camel_stream_vfs_get_type ())
+#define CAMEL_STREAM_VFS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_STREAM_VFS, CamelStreamVFS))
+#define CAMEL_STREAM_VFS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_STREAM_VFS, CamelStreamVFSClass))
+#define CAMEL_IS_STREAM_VFS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_STREAM_VFS))
+#define CAMEL_IS_STREAM_VFS_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_STREAM_VFS))
+#define CAMEL_STREAM_VFS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_STREAM_VFS, CamelStreamVFSClass))
G_BEGIN_DECLS
diff --git a/camel/camel-string-utils.h b/camel/camel-string-utils.h
index 3423386..58e85a8 100644
--- a/camel/camel-string-utils.h
+++ b/camel/camel-string-utils.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_STRING_UTILS_H__
-#define __CAMEL_STRING_UTILS_H__
+#ifndef CAMEL_STRING_UTILS_H
+#define CAMEL_STRING_UTILS_H
#include <glib.h>
@@ -46,4 +46,4 @@ const char * camel_pstring_peek (const char *str);
G_END_DECLS
-#endif /* __CAMEL_STRING_UTILS_H__ */
+#endif /* CAMEL_STRING_UTILS_H */
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index 89bc845..71e1e6a 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -19,16 +19,85 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_TEXT_INDEX_H
-#define _CAMEL_TEXT_INDEX_H
+#ifndef CAMEL_TEXT_INDEX_H
+#define CAMEL_TEXT_INDEX_H
#include <camel/camel-exception.h>
#include <camel/camel-object.h>
#include "camel-index.h"
-#define CAMEL_TEXT_INDEX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, camel_text_index_get_type (), CamelTextIndex)
-#define CAMEL_TEXT_INDEX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, camel_text_index_get_type (), CamelTextIndexClass)
-#define CAMEL_IS_TEXT_INDEX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, camel_text_index_get_type ())
+/* Standard GObject macros */
+#define CAMEL_TYPE_TEXT_INDEX \
+ (camel_text_index_get_type ())
+#define CAMEL_TEXT_INDEX(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_TEXT_INDEX, CamelTextIndex))
+#define CAMEL_TEXT_INDEX_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_TEXT_INDEX, CamelTextIndexClass))
+#define CAMEL_IS_TEXT_INDEX(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_TEXT_INDEX))
+#define CAMEL_IS_TEXT_INDEX_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_TEXT_INDEX))
+#define CAMEL_TEXT_INDEX_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_TEXT_INDEX, CamelTextIndexClass))
+
+#define CAMEL_TYPE_TEXT_INDEX_NAME \
+ (camel_text_index_name_get_type ())
+#define CAMEL_TEXT_INDEX_NAME(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_NAME, CamelTextIndexName))
+#define CAMEL_TEXT_INDEX_NAME_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_NAME, CamelTextIndexNameClass))
+#define CAMEL_IS_TEXT_INDEX_NAME(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_NAME))
+#define CAMEL_IS_TEXT_INDEX_NAME_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_NAME))
+#define CAMEL_TEXT_INDEX_NAME_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_NAME, CamelTextIndexNameClass))
+
+#define CAMEL_TYPE_TEXT_INDEX_CURSOR \
+ (camel_text_index_cursor_get_type ())
+#define CAMEL_TEXT_INDEX_CURSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_CURSOR, CamelTextIndexCursor))
+#define CAMEL_TEXT_INDEX_CURSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_CURSOR, CamelTextIndexCursorClass))
+#define CAMEL_IS_TEXT_INDEX_CURSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_CURSOR))
+#define CAMEL_IS_TEXT_INDEX_CURSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_CURSOR))
+#define CAMEL_TEXT_INDEX_CURSOR_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_CURSOR, CamelTextIndexCursorClass))
+
+#define CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR \
+ (camel_text_index_key_cursor_get_type ())
+#define CAMEL_TEXT_INDEX_KEY_CURSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR, CamelTextIndexKeyCursor))
+#define CAMEL_TEXT_INDEX_KEY_CURSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR, CamelTextIndexKeyCursorClass))
+#define CAMEL_IS_TEXT_INDEX_KEY_CURSOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR))
+#define CAMEL_IS_TEXT_INDEX_KEY_CURSOR_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR))
+#define CAMEL_TEXT_INDEX_KEY_CURSOR_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR, CamelTextIndexKeyCursorClass))
G_BEGIN_DECLS
@@ -114,4 +183,4 @@ void camel_text_index_validate(CamelTextIndex *idx);
G_END_DECLS
-#endif /* ! _CAMEL_TEXT_INDEX_H */
+#endif /* CAMEL_TEXT_INDEX_H */
diff --git a/camel/camel-url-scanner.h b/camel/camel-url-scanner.h
index 7456454..e5494b2 100644
--- a/camel/camel-url-scanner.h
+++ b/camel/camel-url-scanner.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_URL_SCANNER_H__
-#define __CAMEL_URL_SCANNER_H__
+#ifndef CAMEL_URL_SCANNER_H
+#define CAMEL_URL_SCANNER_H
#include <glib.h>
#include <sys/types.h>
@@ -64,4 +64,4 @@ gboolean camel_url_scanner_scan (CamelUrlScanner *scanner, const char *in, size_
G_END_DECLS
-#endif /* __CAMEL_URL_SCANNER_H__ */
+#endif /* CAMEL_URL_SCANNER_H */
diff --git a/camel/camel-utf8.h b/camel/camel-utf8.h
index a67ff85..5452ce2 100644
--- a/camel/camel-utf8.h
+++ b/camel/camel-utf8.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef _CAMEL_UTF8_H
-#define _CAMEL_UTF8_H
+#ifndef CAMEL_UTF8_H
+#define CAMEL_UTF8_H
G_BEGIN_DECLS
@@ -45,4 +45,4 @@ char *camel_utf8_make_valid (const char *text);
G_END_DECLS
-#endif /* ! _CAMEL_UTF8_H */
+#endif /* CAMEL_UTF8_H */
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index e692b43..f173db2 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_VEE_FOLDER_H
-#define _CAMEL_VEE_FOLDER_H
+#ifndef CAMEL_VEE_FOLDER_H
+#define CAMEL_VEE_FOLDER_H
#include <glib.h>
#include <camel/camel-folder.h>
@@ -95,4 +95,4 @@ void camel_vee_folder_sync_headers (CamelFolder *vf, CamelException *ex);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_FOLDER_H */
+#endif /* CAMEL_VEE_FOLDER_H */
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index 633991c..79a2b6f 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_VEE_STORE_H
-#define _CAMEL_VEE_STORE_H
+#ifndef CAMEL_VEE_STORE_H
+#define CAMEL_VEE_STORE_H
#include <glib.h>
#include <camel/camel-store.h>
@@ -56,4 +56,4 @@ CamelVeeStore *camel_vee_store_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_STORE_H */
+#endif /* CAMEL_VEE_STORE_H */
diff --git a/camel/camel-vee-summary.h b/camel/camel-vee-summary.h
index 25fba1c..ed8d413 100644
--- a/camel/camel-vee-summary.h
+++ b/camel/camel-vee-summary.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_VEE_SUMMARY_H
-#define _CAMEL_VEE_SUMMARY_H
+#ifndef CAMEL_VEE_SUMMARY_H
+#define CAMEL_VEE_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-exception.h>
@@ -66,5 +66,5 @@ void camel_vee_summary_load_check_unread_vfolder (CamelVeeSummary *vs);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_SUMMARY_H */
+#endif /* CAMEL_VEE_SUMMARY_H */
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index cc33dfc..9cdbfd6 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -21,8 +21,8 @@
*/
-#ifndef _CAMEL_VTRASH_FOLDER_H
-#define _CAMEL_VTRASH_FOLDER_H
+#ifndef CAMEL_VTRASH_FOLDER_H
+#define CAMEL_VTRASH_FOLDER_H
#include <camel/camel-folder.h>
#include <camel/camel-vee-folder.h>
@@ -63,4 +63,4 @@ CamelFolder *camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash
G_END_DECLS
-#endif /* ! _CAMEL_VTRASH_FOLDER_H */
+#endif /* CAMEL_VTRASH_FOLDER_H */
diff --git a/camel/providers/groupwise/camel-groupwise-journal.h b/camel/providers/groupwise/camel-groupwise-journal.h
index 643b890..159f7d8 100644
--- a/camel/providers/groupwise/camel-groupwise-journal.h
+++ b/camel/providers/groupwise/camel-groupwise-journal.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_GROUPWISE_JOURNAL_H__
-#define __CAMEL_GROUPWISE_JOURNAL_H__
+#ifndef CAMEL_GROUPWISE_JOURNAL_H
+#define CAMEL_GROUPWISE_JOURNAL_H
#include <stdarg.h>
@@ -84,4 +84,4 @@ void camel_groupwise_journal_transfer (CamelGroupwiseJournal *journal, CamelGrou
G_END_DECLS
-#endif /* __CAMEL_GROUPWISE_JOURNAL_H__ */
+#endif /* CAMEL_GROUPWISE_JOURNAL_H */
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index bd62ade..297e5fa 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_GW_STORE_SUMMARY_H
-#define _CAMEL_GW_STORE_SUMMARY_H
+#ifndef CAMEL_GW_STORE_SUMMARY_H
+#define CAMEL_GW_STORE_SUMMARY_H
#include <camel/camel-object.h>
#include <camel/camel-store-summary.h>
@@ -87,4 +87,4 @@ void camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s,
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index 3adcd29..18270ac 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_GW_SUMMARY_H
-#define _CAMEL_GW_SUMMARY_H
+#ifndef CAMEL_GW_SUMMARY_H
+#define CAMEL_GW_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-exception.h>
@@ -80,4 +80,4 @@ void groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache);
G_END_DECLS
-#endif /*_CAMEL_GW_SUMMARY_H*/
+#endif /*CAMEL_GW_SUMMARY_H*/
diff --git a/camel/providers/groupwise/camel-groupwise-utils.h b/camel/providers/groupwise/camel-groupwise-utils.h
index 46f8814..3984934 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.h
+++ b/camel/providers/groupwise/camel-groupwise-utils.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_GROUPWISE_UTILS__
-#define __CAMEL_GROUPWISE_UTILS__
+#ifndef CAMEL_GROUPWISE_UTILS__
+#define CAMEL_GROUPWISE_UTILS__
#include <glib.h>
#include <camel/camel-mime-message.h>
diff --git a/camel/providers/imap/camel-imap-journal.h b/camel/providers/imap/camel-imap-journal.h
index 83c8483..7fdf420 100644
--- a/camel/providers/imap/camel-imap-journal.h
+++ b/camel/providers/imap/camel-imap-journal.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __CAMEL_IMAP_JOURNAL_H__
-#define __CAMEL_IMAP_JOURNAL_H__
+#ifndef CAMEL_IMAP_JOURNAL_H
+#define CAMEL_IMAP_JOURNAL_H
#include <stdarg.h>
@@ -89,4 +89,4 @@ void camel_imap_journal_close_folders (CamelIMAPJournal *journal);
G_END_DECLS
-#endif /* __CAMEL_IMAP_JOURNAL_H__ */
+#endif /* CAMEL_IMAP_JOURNAL_H */
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index 918386b..0b76036 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -23,8 +23,8 @@
*
*/
-#ifndef _CAMEL_IMAP_SEARCH_H
-#define _CAMEL_IMAP_SEARCH_H
+#ifndef CAMEL_IMAP_SEARCH_H
+#define CAMEL_IMAP_SEARCH_H
#include <camel/camel-folder-search.h>
#include <camel/camel-list-utils.h>
@@ -63,4 +63,4 @@ CamelFolderSearch *camel_imap_search_new (const char *cachedir);
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_SEARCH_H */
+#endif /* CAMEL_IMAP_SEARCH_H */
diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h
index 3737f09..4c4d08a 100644
--- a/camel/providers/imap/camel-imap-store-summary.h
+++ b/camel/providers/imap/camel-imap-store-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_IMAP_STORE_SUMMARY_H
-#define _CAMEL_IMAP_STORE_SUMMARY_H
+#ifndef CAMEL_IMAP_STORE_SUMMARY_H
+#define CAMEL_IMAP_STORE_SUMMARY_H
#include <camel/camel-object.h>
#include <camel/camel-store-summary.h>
@@ -94,4 +94,4 @@ char *camel_imap_store_summary_full_from_path(CamelImapStoreSummary *s, const ch
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index aaef3ce..ed08ad0 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAP_SUMMARY_H
-#define _CAMEL_IMAP_SUMMARY_H
+#ifndef CAMEL_IMAP_SUMMARY_H
+#define CAMEL_IMAP_SUMMARY_H
#include "camel-imap-types.h"
#include <camel/camel-folder-summary.h>
@@ -82,4 +82,4 @@ void camel_imap_summary_add_offline_uncached (CamelFolderSummary *summary,
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_SUMMARY_H */
+#endif /* CAMEL_IMAP_SUMMARY_H */
diff --git a/camel/providers/imap4/camel-imap4-command.h b/camel/providers/imap4/camel-imap4-command.h
index bc0da25..1041091 100644
--- a/camel/providers/imap4/camel-imap4-command.h
+++ b/camel/providers/imap4/camel-imap4-command.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_COMMAND_H__
-#define __CAMEL_IMAP4_COMMAND_H__
+#ifndef CAMEL_IMAP4_COMMAND_H
+#define CAMEL_IMAP4_COMMAND_H
#include <stdarg.h>
@@ -140,4 +140,4 @@ void camel_imap4_command_reset (CamelIMAP4Command *ic);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_COMMAND_H__ */
+#endif /* CAMEL_IMAP4_COMMAND_H */
diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index 5db6da4..3fa984d 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_ENGINE_H__
-#define __CAMEL_IMAP4_ENGINE_H__
+#ifndef CAMEL_IMAP4_ENGINE_H
+#define CAMEL_IMAP4_ENGINE_H
#include <stdarg.h>
@@ -234,4 +234,4 @@ void camel_imap4_resp_code_free (CamelIMAP4RespCode *rcode);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_ENGINE_H__ */
+#endif /* CAMEL_IMAP4_ENGINE_H */
diff --git a/camel/providers/imap4/camel-imap4-folder.h b/camel/providers/imap4/camel-imap4-folder.h
index 58d217c..5edea53 100644
--- a/camel/providers/imap4/camel-imap4-folder.h
+++ b/camel/providers/imap4/camel-imap4-folder.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_FOLDER_H__
-#define __CAMEL_IMAP4_FOLDER_H__
+#ifndef CAMEL_IMAP4_FOLDER_H
+#define CAMEL_IMAP4_FOLDER_H
#include <camel/camel-store.h>
#include <camel/camel-folder.h>
@@ -85,4 +85,4 @@ const char *camel_imap4_folder_utf7_name (CamelIMAP4Folder *folder);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_FOLDER_H__ */
+#endif /* CAMEL_IMAP4_FOLDER_H */
diff --git a/camel/providers/imap4/camel-imap4-journal.h b/camel/providers/imap4/camel-imap4-journal.h
index 5c63afe..e1de2ae 100644
--- a/camel/providers/imap4/camel-imap4-journal.h
+++ b/camel/providers/imap4/camel-imap4-journal.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_JOURNAL_H__
-#define __CAMEL_IMAP4_JOURNAL_H__
+#ifndef CAMEL_IMAP4_JOURNAL_H
+#define CAMEL_IMAP4_JOURNAL_H
#include <stdarg.h>
@@ -83,4 +83,4 @@ void camel_imap4_journal_append (CamelIMAP4Journal *journal, CamelMimeMessage *m
G_END_DECLS
-#endif /* __CAMEL_IMAP4_JOURNAL_H__ */
+#endif /* CAMEL_IMAP4_JOURNAL_H */
diff --git a/camel/providers/imap4/camel-imap4-search.h b/camel/providers/imap4/camel-imap4-search.h
index 369a5a3..1647966 100644
--- a/camel/providers/imap4/camel-imap4-search.h
+++ b/camel/providers/imap4/camel-imap4-search.h
@@ -21,8 +21,8 @@
*/
-#ifndef __CAMEL_IMAP4_SEARCH_H__
-#define __CAMEL_IMAP4_SEARCH_H__
+#ifndef CAMEL_IMAP4_SEARCH_H
+#define CAMEL_IMAP4_SEARCH_H
#include <camel/camel-data-cache.h>
#include <camel/camel-folder-search.h>
@@ -68,4 +68,4 @@ CamelFolderSearch *camel_imap4_search_new (struct _CamelIMAP4Engine *engine, con
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SEARCH_H__ */
+#endif /* CAMEL_IMAP4_SEARCH_H */
diff --git a/camel/providers/imap4/camel-imap4-specials.h b/camel/providers/imap4/camel-imap4-specials.h
index b8a13a9..1b866f7 100644
--- a/camel/providers/imap4/camel-imap4-specials.h
+++ b/camel/providers/imap4/camel-imap4-specials.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_SPECIALS_H__
-#define __CAMEL_IMAP4_SPECIALS_H__
+#ifndef CAMEL_IMAP4_SPECIALS_H
+#define CAMEL_IMAP4_SPECIALS_H
#include <glib.h>
@@ -49,4 +49,4 @@ void camel_imap4_specials_init (void);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SPECIALS_H__ */
+#endif /* CAMEL_IMAP4_SPECIALS_H */
diff --git a/camel/providers/imap4/camel-imap4-store-summary.h b/camel/providers/imap4/camel-imap4-store-summary.h
index 6d77ba2..e9e135d 100644
--- a/camel/providers/imap4/camel-imap4-store-summary.h
+++ b/camel/providers/imap4/camel-imap4-store-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP_STORE_SUMMARY_H__
-#define __CAMEL_IMAP_STORE_SUMMARY_H__
+#ifndef CAMEL_IMAP_STORE_SUMMARY_H
+#define CAMEL_IMAP_STORE_SUMMARY_H
#include <camel/camel-store-summary.h>
#include "camel-imap4-engine.h"
@@ -83,4 +83,4 @@ struct _CamelFolderInfo *camel_imap4_store_summary_get_folder_info (CamelIMAP4St
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STORE_SUMMARY_H__ */
+#endif /* CAMEL_IMAP4_STORE_SUMMARY_H */
diff --git a/camel/providers/imap4/camel-imap4-store.h b/camel/providers/imap4/camel-imap4-store.h
index 79837d6..401280a 100644
--- a/camel/providers/imap4/camel-imap4-store.h
+++ b/camel/providers/imap4/camel-imap4-store.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_STORE_H__
-#define __CAMEL_IMAP4_STORE_H__
+#ifndef CAMEL_IMAP4_STORE_H
+#define CAMEL_IMAP4_STORE_H
#include <camel/camel-offline-store.h>
@@ -57,4 +57,4 @@ GType camel_imap4_store_get_type (void);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STORE_H__ */
+#endif /* CAMEL_IMAP4_STORE_H */
diff --git a/camel/providers/imap4/camel-imap4-stream.h b/camel/providers/imap4/camel-imap4-stream.h
index d2f083e..aaf7b93 100644
--- a/camel/providers/imap4/camel-imap4-stream.h
+++ b/camel/providers/imap4/camel-imap4-stream.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_STREAM_H__
-#define __CAMEL_IMAP4_STREAM_H__
+#ifndef CAMEL_IMAP4_STREAM_H
+#define CAMEL_IMAP4_STREAM_H
#include <camel/camel-stream.h>
@@ -119,4 +119,4 @@ int camel_imap4_stream_literal (CamelIMAP4Stream *stream, unsigned char **litera
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STREAM_H__ */
+#endif /* CAMEL_IMAP4_STREAM_H */
diff --git a/camel/providers/imap4/camel-imap4-summary.h b/camel/providers/imap4/camel-imap4-summary.h
index 1c0ef44..63e5e48 100644
--- a/camel/providers/imap4/camel-imap4-summary.h
+++ b/camel/providers/imap4/camel-imap4-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_SUMMARY_H__
-#define __CAMEL_IMAP4_SUMMARY_H__
+#ifndef CAMEL_IMAP4_SUMMARY_H
+#define CAMEL_IMAP4_SUMMARY_H
#include <sys/types.h>
@@ -98,4 +98,4 @@ int camel_imap4_summary_flush_updates (CamelFolderSummary *summary, CamelExcepti
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SUMMARY_H__ */
+#endif /* CAMEL_IMAP4_SUMMARY_H */
diff --git a/camel/providers/imap4/camel-imap4-utils.h b/camel/providers/imap4/camel-imap4-utils.h
index d534b95..8d82f7f 100644
--- a/camel/providers/imap4/camel-imap4-utils.h
+++ b/camel/providers/imap4/camel-imap4-utils.h
@@ -20,8 +20,8 @@
*/
-#ifndef __CAMEL_IMAP4_UTILS_H__
-#define __CAMEL_IMAP4_UTILS_H__
+#ifndef CAMEL_IMAP4_UTILS_H
+#define CAMEL_IMAP4_UTILS_H
#include <glib.h>
@@ -104,4 +104,4 @@ int camel_imap4_untagged_status (struct _CamelIMAP4Engine *engine, struct _Camel
G_END_DECLS
-#endif /* __CAMEL_IMAP4_UTILS_H__ */
+#endif /* CAMEL_IMAP4_UTILS_H */
diff --git a/camel/providers/imapp/camel-imapp-driver.h b/camel/providers/imapp/camel-imapp-driver.h
index dc3f6c7..b0337f8 100644
--- a/camel/providers/imapp/camel-imapp-driver.h
+++ b/camel/providers/imapp/camel-imapp-driver.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_IMAPP_DRIVER_H
-#define _CAMEL_IMAPP_DRIVER_H
+#ifndef CAMEL_IMAPP_DRIVER_H
+#define CAMEL_IMAPP_DRIVER_H
#include <camel/camel-list-utils.h>
#include <camel/camel-object.h>
diff --git a/camel/providers/imapp/camel-imapp-engine.h b/camel/providers/imapp/camel-imapp-engine.h
index e02b4db..5bcf7d6 100644
--- a/camel/providers/imapp/camel-imapp-engine.h
+++ b/camel/providers/imapp/camel-imapp-engine.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_IMAPP_ENGINE_H
-#define _CAMEL_IMAPP_ENGINE_H
+#ifndef CAMEL_IMAPP_ENGINE_H
+#define CAMEL_IMAPP_ENGINE_H
#include <camel/camel-list-utils.h>
#include <camel/camel-msgport.h>
diff --git a/camel/providers/imapp/camel-imapp-exception.h b/camel/providers/imapp/camel-imapp-exception.h
index 65af322..2264ca7 100644
--- a/camel/providers/imapp/camel-imapp-exception.h
+++ b/camel/providers/imapp/camel-imapp-exception.h
@@ -3,8 +3,8 @@
/* Still experimental code */
-#ifndef __CAMEL_IMAPP_EXCEPTION_H
-#define __CAMEL_IMAPP_EXCEPTION_H
+#ifndef CAMEL_IMAPP_EXCEPTION_H
+#define CAMEL_IMAPP_EXCEPTION_H
#include <setjmp.h>
#include "camel/camel-exception.h"
diff --git a/camel/providers/imapp/camel-imapp-fetch-stream.h b/camel/providers/imapp/camel-imapp-fetch-stream.h
index cd46480..8d34d4e 100644
--- a/camel/providers/imapp/camel-imapp-fetch-stream.h
+++ b/camel/providers/imapp/camel-imapp-fetch-stream.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAPP_FETCH_STREAM_H
-#define _CAMEL_IMAPP_FETCH_STREAM_H
+#ifndef CAMEL_IMAPP_FETCH_STREAM_H
+#define CAMEL_IMAPP_FETCH_STREAM_H
#include <camel/camel-stream.h>
@@ -48,4 +48,4 @@ CamelStream *camel_imapp_fetch_stream_new (struct _CamelIMAPPEngine *src, c
G_END_DECLS
-#endif /* ! _CAMEL_IMAPP_FETCH_STREAM_H */
+#endif /* CAMEL_IMAPP_FETCH_STREAM_H */
diff --git a/camel/providers/imapp/camel-imapp-store-summary.h b/camel/providers/imapp/camel-imapp-store-summary.h
index a1f71e8..948c2b7 100644
--- a/camel/providers/imapp/camel-imapp-store-summary.h
+++ b/camel/providers/imapp/camel-imapp-store-summary.h
@@ -20,8 +20,8 @@
*/
-#ifndef _CAMEL_IMAPP_STORE_SUMMARY_H
-#define _CAMEL_IMAPP_STORE_SUMMARY_H
+#ifndef CAMEL_IMAPP_STORE_SUMMARY_H
+#define CAMEL_IMAPP_STORE_SUMMARY_H
#include <camel/camel-object.h>
#include <camel/camel-store-summary.h>
@@ -94,4 +94,4 @@ char *camel_imapp_store_summary_full_from_path(CamelIMAPPStoreSummary *s, const
G_END_DECLS
-#endif /* ! _CAMEL_IMAPP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAPP_STORE_SUMMARY_H */
diff --git a/camel/providers/imapp/camel-imapp-stream.h b/camel/providers/imapp/camel-imapp-stream.h
index e5ce7a2..85cafc1 100644
--- a/camel/providers/imapp/camel-imapp-stream.h
+++ b/camel/providers/imapp/camel-imapp-stream.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAPP_STREAM_H
-#define _CAMEL_IMAPP_STREAM_H
+#ifndef CAMEL_IMAPP_STREAM_H
+#define CAMEL_IMAPP_STREAM_H
#include <camel/camel-stream.h>
@@ -91,4 +91,4 @@ guint32 camel_imapp_stream_number(CamelIMAPPStream *is);
G_END_DECLS
-#endif /* ! _CAMEL_IMAPP_STREAM_H */
+#endif /* CAMEL_IMAPP_STREAM_H */
diff --git a/camel/providers/imapp/camel-imapp-summary.h b/camel/providers/imapp/camel-imapp-summary.h
index 48ead6d..87c6361 100644
--- a/camel/providers/imapp/camel-imapp-summary.h
+++ b/camel/providers/imapp/camel-imapp-summary.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAPP_SUMMARY_H
-#define _CAMEL_IMAPP_SUMMARY_H
+#ifndef CAMEL_IMAPP_SUMMARY_H
+#define CAMEL_IMAPP_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-exception.h>
@@ -66,4 +66,4 @@ CamelFolderSummary *camel_imapp_summary_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_IMAPP_SUMMARY_H */
+#endif /* CAMEL_IMAPP_SUMMARY_H */
diff --git a/camel/providers/imapp/camel-imapp-utils.h b/camel/providers/imapp/camel-imapp-utils.h
index ef79779..291f982 100644
--- a/camel/providers/imapp/camel-imapp-utils.h
+++ b/camel/providers/imapp/camel-imapp-utils.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_IMAPP_UTILS_H
-#define _CAMEL_IMAPP_UTILS_H
+#ifndef CAMEL_IMAPP_UTILS_H
+#define CAMEL_IMAPP_UTILS_H
#include <camel/camel-mime-utils.h>
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 488864c..9b85a35 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_LOCAL_SUMMARY_H
-#define _CAMEL_LOCAL_SUMMARY_H
+#ifndef CAMEL_LOCAL_SUMMARY_H
+#define CAMEL_LOCAL_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-folder.h>
@@ -97,4 +97,4 @@ int camel_local_summary_write_headers(int fd, struct _camel_header_raw *header,
G_END_DECLS
-#endif /* ! _CAMEL_LOCAL_SUMMARY_H */
+#endif /* CAMEL_LOCAL_SUMMARY_H */
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index 27910e3..b91dce0 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MAILDIR_SUMMARY_H
-#define _CAMEL_MAILDIR_SUMMARY_H
+#ifndef CAMEL_MAILDIR_SUMMARY_H
+#define CAMEL_MAILDIR_SUMMARY_H
#include "camel-local-summary.h"
#include <camel/camel-folder.h>
@@ -76,4 +76,4 @@ int camel_maildir_summary_name_to_info(CamelMaildirMessageInfo *info, const char
G_END_DECLS
-#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */
+#endif /* CAMEL_MAILDIR_SUMMARY_H */
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index 1a45c3e..ceb0f14 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MBOX_SUMMARY_H
-#define _CAMEL_MBOX_SUMMARY_H
+#ifndef CAMEL_MBOX_SUMMARY_H
+#define CAMEL_MBOX_SUMMARY_H
#include "camel-local-summary.h"
@@ -76,4 +76,4 @@ int camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFold
G_END_DECLS
-#endif /* ! _CAMEL_MBOX_SUMMARY_H */
+#endif /* CAMEL_MBOX_SUMMARY_H */
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 0bf5376..8d752ca 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MH_SUMMARY_H
-#define _CAMEL_MH_SUMMARY_H
+#ifndef CAMEL_MH_SUMMARY_H
+#define CAMEL_MH_SUMMARY_H
#include "camel-local-summary.h"
#include <camel/camel-folder.h>
@@ -53,4 +53,4 @@ CamelMhSummary *camel_mh_summary_new(struct _CamelFolder *, const char *filename
G_END_DECLS
-#endif /* ! _CAMEL_MH_SUMMARY_H */
+#endif /* CAMEL_MH_SUMMARY_H */
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index cee5377..4ba7b55 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SPOOL_SUMMARY_H
-#define _CAMEL_SPOOL_SUMMARY_H
+#ifndef CAMEL_SPOOL_SUMMARY_H
+#define CAMEL_SPOOL_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-folder.h>
@@ -69,4 +69,4 @@ int camel_spool_summary_write_headers(int fd, struct _camel_header_raw *header,
G_END_DECLS
-#endif /* ! _CAMEL_SPOOL_SUMMARY_H */
+#endif /* CAMEL_SPOOL_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
index 9feee1f..72c04c3 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ b/camel/providers/nntp/camel-nntp-newsrc.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_NNTP_NEWSRC_H_
-#define _CAMEL_NNTP_NEWSRC_H_
+#ifndef CAMEL_NNTP_NEWSRC_H
+#define CAMEL_NNTP_NEWSRC_H
#include <stdio.h>
#include "glib.h"
@@ -33,4 +33,4 @@ CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server (const char *serve
G_END_DECLS
-#endif /* _CAMEL_NNTP_NEWSRC_H_ */
+#endif /* CAMEL_NNTP_NEWSRC_H */
diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
index e92b34b..6340087 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/camel/providers/nntp/camel-nntp-store-summary.h
@@ -22,8 +22,8 @@
/* currently, this is just a straigt s/imap/nntp from the IMAP file*/
-#ifndef _CAMEL_NNTP_STORE_SUMMARY_H
-#define _CAMEL_NNTP_STORE_SUMMARY_H
+#ifndef CAMEL_NNTP_STORE_SUMMARY_H
+#define CAMEL_NNTP_STORE_SUMMARY_H
#include <camel/camel-object.h>
#include <camel/camel-store-summary.h>
@@ -93,4 +93,4 @@ char *camel_nntp_store_summary_full_from_path(CamelNNTPStoreSummary *s, const ch
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_STORE_SUMMARY_H */
+#endif /* CAMEL_NNTP_STORE_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
index 3425c60..8a6b02a 100644
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ b/camel/providers/nntp/camel-nntp-stream.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_STREAM_H
-#define _CAMEL_NNTP_STREAM_H
+#ifndef CAMEL_NNTP_STREAM_H
+#define CAMEL_NNTP_STREAM_H
#include <camel/camel-stream.h>
@@ -67,4 +67,4 @@ int camel_nntp_stream_getd (CamelNNTPStream *is, unsigned char **start, unsi
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_STREAM_H */
+#endif /* CAMEL_NNTP_STREAM_H */
diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h
index b1b83b7..11aefe9 100644
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ b/camel/providers/nntp/camel-nntp-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_SUMMARY_H
-#define _CAMEL_NNTP_SUMMARY_H
+#ifndef CAMEL_NNTP_SUMMARY_H
+#define CAMEL_NNTP_SUMMARY_H
#include <camel/camel-folder-summary.h>
@@ -56,5 +56,5 @@ int camel_nntp_summary_check(CamelNNTPSummary *cns, struct _CamelNNTPStore *stor
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_SUMMARY_H */
+#endif /* CAMEL_NNTP_SUMMARY_H */
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index fa95717..d144245 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_POP3_ENGINE_H
-#define _CAMEL_POP3_ENGINE_H
+#ifndef CAMEL_POP3_ENGINE_H
+#define CAMEL_POP3_ENGINE_H
#include <camel/camel-object.h>
#include <camel/camel-list-utils.h>
@@ -135,4 +135,4 @@ CamelPOP3Command *camel_pop3_engine_command_new (CamelPOP3Engine *pe, guint32 fl
G_END_DECLS
-#endif /* ! _CAMEL_POP3_ENGINE_H */
+#endif /* CAMEL_POP3_ENGINE_H */
diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h
index 02629a9..8e12108 100644
--- a/camel/providers/pop3/camel-pop3-stream.h
+++ b/camel/providers/pop3/camel-pop3-stream.h
@@ -21,8 +21,8 @@
/* This is *identical* to the camel-nntp-stream, so should probably
work out a way to merge them */
-#ifndef _CAMEL_POP3_STREAM_H
-#define _CAMEL_POP3_STREAM_H
+#ifndef CAMEL_POP3_STREAM_H
+#define CAMEL_POP3_STREAM_H
#include <camel/camel-stream.h>
@@ -70,4 +70,4 @@ int camel_pop3_stream_getd (CamelPOP3Stream *is, unsigned char **start, unsi
G_END_DECLS
-#endif /* ! _CAMEL_POP3_STREAM_H */
+#endif /* CAMEL_POP3_STREAM_H */
diff --git a/camel/tests/lib/camel-test-provider.h b/camel/tests/lib/camel-test-provider.h
index 08606cf..5f967d4 100644
--- a/camel/tests/lib/camel-test-provider.h
+++ b/camel/tests/lib/camel-test-provider.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_TEST_PROVIDER_H
-#define _CAMEL_TEST_PROVIDER_H
+#ifndef CAMEL_TEST_PROVIDER_H
+#define CAMEL_TEST_PROVIDER_H
void camel_test_provider_init(int argc, char **argv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
