GNOME.org
 

[evolution-data-server] Limit usage of legacy CamelObject class.

commit 04fd312b9a4a4410a1b90b9d044575636c975b06
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 1 11:50:17 2013 -0400

    Limit usage of legacy CamelObject class.
    
    Only CamelFolder and CamelSession utilize what's left in CamelObject,
    which is just binary state files to persistently store a flag or two.
    
    All other Camel classes should inherit directly from GObject.  This
    requires a libcamel soname bump since the class structure sizes will
    decrease by two pointers (no state_read() and state_write() methods).

 camel/camel-address.c                      |    2 +-
 camel/camel-address.h                      |    6 +++---
 camel/camel-block-file.c                   |    4 ++--
 camel/camel-block-file.h                   |   11 ++++++-----
 camel/camel-cipher-context.c               |    2 +-
 camel/camel-cipher-context.h               |    4 ++--
 camel/camel-data-cache.c                   |    3 ++-
 camel/camel-data-cache.h                   |    4 ++--
 camel/camel-data-wrapper.c                 |    4 ++--
 camel/camel-data-wrapper.h                 |    4 ++--
 camel/camel-disco-diary.c                  |    2 +-
 camel/camel-disco-diary.h                  |    4 ++--
 camel/camel-filter-driver.c                |    2 +-
 camel/camel-filter-driver.h                |    4 ++--
 camel/camel-folder-search.c                |    2 +-
 camel/camel-folder-search.h                |    4 ++--
 camel/camel-folder-summary.c               |    2 +-
 camel/camel-folder-summary.h               |    4 ++--
 camel/camel-folder.h                       |    1 +
 camel/camel-html-parser.c                  |    3 ++-
 camel/camel-html-parser.h                  |    6 +++---
 camel/camel-index.c                        |    6 +++---
 camel/camel-index.h                        |   14 +++++++-------
 camel/camel-mime-filter-enriched.c         |    1 +
 camel/camel-mime-filter-progress.h         |    2 ++
 camel/camel-mime-filter.c                  |    2 +-
 camel/camel-mime-filter.h                  |    7 ++++---
 camel/camel-mime-parser.c                  |    2 +-
 camel/camel-mime-parser.h                  |    6 ++----
 camel/camel-multipart-signed.c             |    1 +
 camel/camel-partition-table.c              |    4 ++--
 camel/camel-partition-table.h              |   12 +++++-------
 camel/camel-provider.h                     |    3 ++-
 camel/camel-sasl.c                         |    2 +-
 camel/camel-sasl.h                         |    5 ++---
 camel/camel-session.c                      |    2 +-
 camel/camel-session.h                      |    4 ++--
 camel/camel-store-summary.c                |    2 +-
 camel/camel-store-summary.h                |    5 ++---
 camel/camel-stream.c                       |    2 +-
 camel/camel-stream.h                       |    7 ++++---
 camel/camel-text-index.h                   |    3 +--
 camel/providers/imapx/camel-imapx-server.c |    2 +-
 camel/providers/imapx/camel-imapx-server.h |    4 ++--
 camel/providers/pop3/camel-pop3-engine.c   |    2 +-
 camel/providers/pop3/camel-pop3-engine.h   |    4 ++--
 configure.ac                               |    2 +-
 47 files changed, 94 insertions(+), 90 deletions(-)
---
diff --git a/camel/camel-address.c b/camel/camel-address.c
index 544e2e9..311aed0 100644
--- a/camel/camel-address.c
+++ b/camel/camel-address.c
@@ -20,7 +20,7 @@
 
 #include "camel-address.h"
 
-G_DEFINE_TYPE (CamelAddress, camel_address, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelAddress, camel_address, G_TYPE_OBJECT)
 
 static void
 address_finalize (GObject *object)
diff --git a/camel/camel-address.h b/camel/camel-address.h
index cf9ed02..1afd266 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -26,7 +26,7 @@
 #ifndef CAMEL_ADDRESS_H
 #define CAMEL_ADDRESS_H
 
-#include <camel/camel-object.h>
+#include <glib-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_ADDRESS \
@@ -54,7 +54,7 @@ typedef struct _CamelAddressClass CamelAddressClass;
 typedef struct _CamelAddressPrivate CamelAddressPrivate;
 
 struct _CamelAddress {
-       CamelObject parent;
+       GObject parent;
 
        GPtrArray *addresses;
 
@@ -62,7 +62,7 @@ struct _CamelAddress {
 };
 
 struct _CamelAddressClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        gint            (*decode)               (CamelAddress *addr,
                                                 const gchar *raw);
diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index a1d8968..2453f56 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -69,7 +69,7 @@ static gint block_file_threshhold = 10;
 static gint sync_nolock (CamelBlockFile *bs);
 static gint sync_block_nolock (CamelBlockFile *bs, CamelBlock *bl);
 
-G_DEFINE_TYPE (CamelBlockFile, camel_block_file, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelBlockFile, camel_block_file, G_TYPE_OBJECT)
 
 static gint
 block_file_validate_root (CamelBlockFile *bs)
@@ -856,7 +856,7 @@ static GQueue key_file_active_list = G_QUEUE_INIT;
 static gint key_file_count = 0;
 static const gint key_file_threshhold = 10;
 
-G_DEFINE_TYPE (CamelKeyFile, camel_key_file, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelKeyFile, camel_key_file, G_TYPE_OBJECT)
 
 static void
 key_file_finalize (GObject *object)
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 64e5644..d2a7938 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -25,10 +25,11 @@
 #ifndef CAMEL_BLOCK_FILE_H
 #define CAMEL_BLOCK_FILE_H
 
-#include <camel/camel-object.h>
 #include <stdio.h>
 #include <sys/types.h>
 
+#include <glib-object.h>
+
 /* Standard GObject macros */
 #define CAMEL_TYPE_BLOCK_FILE \
        (camel_block_file_get_type ())
@@ -111,7 +112,7 @@ struct _CamelBlock {
 };
 
 struct _CamelBlockFile {
-       CamelObject parent;
+       GObject parent;
        CamelBlockFilePrivate *priv;
 
        gchar version[8];
@@ -132,7 +133,7 @@ struct _CamelBlockFile {
 };
 
 struct _CamelBlockFileClass {
-       CamelObjectClass parent;
+       GObjectClass parent_class;
 
        gint (*validate_root)(CamelBlockFile *);
        gint (*init_root)(CamelBlockFile *);
@@ -170,7 +171,7 @@ typedef struct _CamelKeyFileClass CamelKeyFileClass;
 typedef struct _CamelKeyFilePrivate CamelKeyFilePrivate;
 
 struct _CamelKeyFile {
-       CamelObject parent;
+       GObject parent;
        CamelKeyFilePrivate *priv;
 
        FILE *fp;
@@ -180,7 +181,7 @@ struct _CamelKeyFile {
 };
 
 struct _CamelKeyFileClass {
-       CamelObjectClass parent;
+       GObjectClass parent_class;
 };
 
 GType      camel_key_file_get_type (void);
diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c
index 02826e1..c45e9f8 100644
--- a/camel/camel-cipher-context.c
+++ b/camel/camel-cipher-context.c
@@ -79,7 +79,7 @@ enum {
        PROP_SESSION
 };
 
-G_DEFINE_TYPE (CamelCipherContext, camel_cipher_context, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelCipherContext, camel_cipher_context, G_TYPE_OBJECT)
 
 static void
 async_context_free (AsyncContext *async_context)
diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h
index 9206904..987a47b 100644
--- a/camel/camel-cipher-context.h
+++ b/camel/camel-cipher-context.h
@@ -117,12 +117,12 @@ struct _CamelCipherValidity {
 };
 
 struct _CamelCipherContext {
-       CamelObject parent;
+       GObject parent;
        CamelCipherContextPrivate *priv;
 };
 
 struct _CamelCipherContextClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* these MUST be set by implementors */
        const gchar *sign_protocol;
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 08bad33..8716378 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -34,6 +34,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "camel-data-cache.h"
+#include "camel-object.h"
 #include "camel-object-bag.h"
 #include "camel-stream-mem.h"
 #include "camel-file-utils.h"
@@ -68,7 +69,7 @@ enum {
        PROP_PATH
 };
 
-G_DEFINE_TYPE (CamelDataCache, camel_data_cache, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelDataCache, camel_data_cache, G_TYPE_OBJECT)
 
 static void
 data_cache_set_property (GObject *object,
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index c39dab2..b0ac9a2 100644
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -55,12 +55,12 @@ typedef struct _CamelDataCacheClass CamelDataCacheClass;
 typedef struct _CamelDataCachePrivate CamelDataCachePrivate;
 
 struct _CamelDataCache {
-       CamelObject parent;
+       GObject parent;
        CamelDataCachePrivate *priv;
 };
 
 struct _CamelDataCacheClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 };
 
 GType          camel_data_cache_get_type       (void);
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index eb01fe2..64eae92 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -55,6 +55,8 @@ struct _AsyncContext {
        gssize bytes_written;
 };
 
+G_DEFINE_TYPE (CamelDataWrapper, camel_data_wrapper, G_TYPE_OBJECT)
+
 static void
 async_context_free (AsyncContext *async_context)
 {
@@ -64,8 +66,6 @@ async_context_free (AsyncContext *async_context)
        g_slice_free (AsyncContext, async_context);
 }
 
-G_DEFINE_TYPE (CamelDataWrapper, camel_data_wrapper, CAMEL_TYPE_OBJECT)
-
 static void
 data_wrapper_dispose (GObject *object)
 {
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index f70a844..d0ea9e8 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -60,7 +60,7 @@ typedef struct _CamelDataWrapperClass CamelDataWrapperClass;
 typedef struct _CamelDataWrapperPrivate CamelDataWrapperPrivate;
 
 struct _CamelDataWrapper {
-       CamelObject parent;
+       GObject parent;
        CamelDataWrapperPrivate *priv;
 
        CamelTransferEncoding encoding;
@@ -71,7 +71,7 @@ struct _CamelDataWrapper {
 };
 
 struct _CamelDataWrapperClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* Non-Blocking Methods */
        void            (*set_mime_type)        (CamelDataWrapper *data_wrapper,
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 6e6cffc..e943456 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -43,7 +43,7 @@
 
 #define d(x)
 
-G_DEFINE_TYPE (CamelDiscoDiary, camel_disco_diary, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelDiscoDiary, camel_disco_diary, G_TYPE_OBJECT)
 
 static void
 unref_folder (gpointer key,
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 5c219cd..a2e6f7f 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -68,7 +68,7 @@ typedef enum {
 } CamelDiscoDiaryAction;
 
 struct _CamelDiscoDiary {
-       CamelObject parent;
+       GObject parent;
 
        CamelDiscoStore *store;
        FILE *file;
@@ -76,7 +76,7 @@ struct _CamelDiscoDiary {
 };
 
 struct _CamelDiscoDiaryClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 };
 
 GType          camel_disco_diary_get_type      (void);
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 0f6598a..e331956 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -170,7 +170,7 @@ static struct {
        { "only-once",         (CamelSExpFunc) do_only_once, 0 }
 };
 
-G_DEFINE_TYPE (CamelFilterDriver, camel_filter_driver, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelFilterDriver, camel_filter_driver, G_TYPE_OBJECT)
 
 static void
 free_hash_strings (gpointer key,
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index cbe583d..bdfbf3e 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -57,12 +57,12 @@ typedef struct _CamelFilterDriverClass CamelFilterDriverClass;
 typedef struct _CamelFilterDriverPrivate CamelFilterDriverPrivate;
 
 struct _CamelFilterDriver {
-       CamelObject parent;
+       GObject parent;
        CamelFilterDriverPrivate *priv;
 };
 
 struct _CamelFilterDriverClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 };
 
 /* FIXME: this maybe should change... */
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index d991a18..ebb1671 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -200,7 +200,7 @@ static struct {
          CAMEL_FOLDER_SEARCH_ALWAYS_ENTER },
 };
 
-G_DEFINE_TYPE (CamelFolderSearch, camel_folder_search, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelFolderSearch, camel_folder_search, G_TYPE_OBJECT)
 
 /* this is just to OR results together */
 struct IterData {
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 2c1db57..be4d3b7 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -56,7 +56,7 @@ typedef struct _CamelFolderSearchClass CamelFolderSearchClass;
 typedef struct _CamelFolderSearchPrivate CamelFolderSearchPrivate;
 
 struct _CamelFolderSearch {
-       CamelObject parent;
+       GObject parent;
        CamelFolderSearchPrivate *priv;
 
        CamelSExp *sexp;                /* s-exp evaluator */
@@ -72,7 +72,7 @@ struct _CamelFolderSearch {
 };
 
 struct _CamelFolderSearchClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* General bool/comparison options.  Usually these won't need
         * to be set, unless it is compiling into another language. */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index d125515..4742373 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -156,7 +156,7 @@ enum {
        PROP_NEED_PREVIEW
 };
 
-G_DEFINE_TYPE (CamelFolderSummary, camel_folder_summary, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelFolderSummary, camel_folder_summary, G_TYPE_OBJECT)
 
 static gboolean
 remove_each_item (gpointer uid,
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 3d12c70..c808ed7 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -226,7 +226,7 @@ typedef enum {
 } CamelFolderSummaryFlags;
 
 struct _CamelFolderSummary {
-       CamelObject parent;
+       GObject parent;
        CamelFolderSummaryPrivate *priv;
 
        /* header info */
@@ -245,7 +245,7 @@ struct _CamelMIRecord;
 struct _CamelFIRecord;
 
 struct _CamelFolderSummaryClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* sizes of memory objects */
        gsize message_info_size;
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 49a2704..7c1b318 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -31,6 +31,7 @@
 
 #include <camel/camel-enums.h>
 #include <camel/camel-folder-summary.h>
+#include <camel/camel-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_FOLDER \
diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c
index 9bcce24..27a5a25 100644
--- a/camel/camel-html-parser.c
+++ b/camel/camel-html-parser.c
@@ -27,6 +27,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "camel-html-parser.h"
@@ -58,7 +59,7 @@ static CamelHTMLParserPrivate *tokenize_init (void);
 static void tokenize_free (CamelHTMLParserPrivate *p);
 static gint tokenize_step (CamelHTMLParserPrivate *p, gchar **datap, gint *lenp);
 
-G_DEFINE_TYPE (CamelHTMLParser, camel_html_parser, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelHTMLParser, camel_html_parser, G_TYPE_OBJECT)
 
 /* ********************************************************************** */
 
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
index 74deea3..870740d 100644
--- a/camel/camel-html-parser.h
+++ b/camel/camel-html-parser.h
@@ -32,7 +32,7 @@
 #ifndef CAMEL_HTML_PARSER_H
 #define CAMEL_HTML_PARSER_H
 
-#include <camel/camel-object.h>
+#include <glib-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_HTML_PARSER \
@@ -78,12 +78,12 @@ typedef enum _camel_html_parser_t {
 } camel_html_parser_t;
 
 struct _CamelHTMLParser {
-       CamelObject parent;
+       GObject parent;
        CamelHTMLParserPrivate *priv;
 };
 
 struct _CamelHTMLParserClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 };
 
 GType          camel_html_parser_get_type      (void);
diff --git a/camel/camel-index.c b/camel/camel-index.c
index 16813d9..af37c4a 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -51,7 +51,7 @@ struct _CamelIndexPrivate {
 /* CamelIndex */
 /* ********************************************************************** */
 
-G_DEFINE_TYPE (CamelIndex, camel_index, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelIndex, camel_index, G_TYPE_OBJECT)
 
 static void
 index_finalize (GObject *object)
@@ -320,7 +320,7 @@ camel_index_words (CamelIndex *idx)
 /* CamelIndexName */
 /* ********************************************************************** */
 
-G_DEFINE_TYPE (CamelIndexName, camel_index_name, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelIndexName, camel_index_name, G_TYPE_OBJECT)
 
 static void
 index_name_dispose (GObject *object)
@@ -390,7 +390,7 @@ camel_index_name_add_buffer (CamelIndexName *idn,
 /* CamelIndexCursor */
 /* ********************************************************************** */
 
-G_DEFINE_TYPE (CamelIndexCursor, camel_index_cursor, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelIndexCursor, camel_index_cursor, G_TYPE_OBJECT)
 
 static void
 index_cursor_dispose (GObject *object)
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 7c729c0..9fe6157 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -25,7 +25,7 @@
 #ifndef CAMEL_INDEX_H
 #define CAMEL_INDEX_H
 
-#include <camel/camel-object.h>
+#include <glib-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_INDEX \
@@ -101,14 +101,14 @@ typedef gchar * (*CamelIndexNorm)(CamelIndex *index, const gchar *word, gpointer
 /* ********************************************************************** */
 
 struct _CamelIndexCursor {
-       CamelObject parent;
+       GObject parent;
        CamelIndexCursorPrivate *priv;
 
        CamelIndex *index;
 };
 
 struct _CamelIndexCursorClass {
-       CamelObjectClass parent;
+       GObjectClass parent;
 
        const gchar * (*next) (CamelIndexCursor *idc);
 };
@@ -119,7 +119,7 @@ const gchar        *camel_index_cursor_next (CamelIndexCursor *idc);
 /* ********************************************************************** */
 
 struct _CamelIndexName {
-       CamelObject parent;
+       GObject parent;
        CamelIndexNamePrivate *priv;
 
        CamelIndex *index;
@@ -131,7 +131,7 @@ struct _CamelIndexName {
 };
 
 struct _CamelIndexNameClass {
-       CamelObjectClass parent;
+       GObjectClass parent;
 
        void (*add_word)(CamelIndexName *name, const gchar *word);
        gsize (*add_buffer)(CamelIndexName *name, const gchar *buffer, gsize len);
@@ -144,7 +144,7 @@ gsize             camel_index_name_add_buffer (CamelIndexName *name, const gchar
 /* ********************************************************************** */
 
 struct _CamelIndex {
-       CamelObject parent;
+       GObject parent;
        CamelIndexPrivate *priv;
 
        gchar *path;
@@ -157,7 +157,7 @@ struct _CamelIndex {
 };
 
 struct _CamelIndexClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        gint            (*sync)                 (CamelIndex *index);
        gint            (*compress)             (CamelIndex *index);
diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c
index 577ff9d..c3b611a 100644
--- a/camel/camel-mime-filter-enriched.c
+++ b/camel/camel-mime-filter-enriched.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "camel-mime-filter-enriched.h"
diff --git a/camel/camel-mime-filter-progress.h b/camel/camel-mime-filter-progress.h
index 437cd3f..5393446 100644
--- a/camel/camel-mime-filter-progress.h
+++ b/camel/camel-mime-filter-progress.h
@@ -27,6 +27,8 @@
 #ifndef CAMEL_MIME_FILTER_PROGRESS_H
 #define CAMEL_MIME_FILTER_PROGRESS_H
 
+#include <gio/gio.h>
+
 #include <camel/camel-mime-filter.h>
 
 /* Standard GObject macros */
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
index a4bea13..1b16706 100644
--- a/camel/camel-mime-filter.c
+++ b/camel/camel-mime-filter.c
@@ -41,7 +41,7 @@ struct _CamelMimeFilterPrivate {
 #define PRE_HEAD (64)
 #define BACK_HEAD (64)
 
-G_DEFINE_ABSTRACT_TYPE (CamelMimeFilter, camel_mime_filter, CAMEL_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (CamelMimeFilter, camel_mime_filter, G_TYPE_OBJECT)
 
 static void
 mime_filter_finalize (GObject *object)
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index 63650ba..d45f5a1 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -29,7 +29,8 @@
 #define CAMEL_MIME_FILTER_H
 
 #include <sys/types.h>
-#include <camel/camel-object.h>
+
+#include <glib-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_MIME_FILTER \
@@ -57,7 +58,7 @@ typedef struct _CamelMimeFilterClass CamelMimeFilterClass;
 typedef struct _CamelMimeFilterPrivate CamelMimeFilterPrivate;
 
 struct _CamelMimeFilter {
-       CamelObject parent;
+       GObject parent;
        CamelMimeFilterPrivate *priv;
 
        gchar *outreal;         /* real malloc'd buffer */
@@ -72,7 +73,7 @@ struct _CamelMimeFilter {
 };
 
 struct _CamelMimeFilterClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        void            (*filter)               (CamelMimeFilter *filter,
                                                 const gchar *in,
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 019125a..3a42262 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -180,7 +180,7 @@ static gchar *states[] = {
 };
 #endif
 
-G_DEFINE_TYPE (CamelMimeParser, camel_mime_parser, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelMimeParser, camel_mime_parser, G_TYPE_OBJECT)
 
 static void
 mime_parser_finalize (GObject *object)
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index 98897a6..48615fe 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -26,8 +26,6 @@
 #ifndef CAMEL_MIME_PARSER_H
 #define CAMEL_MIME_PARSER_H
 
-#include <camel/camel-object.h>
-
 #include <camel/camel-mime-utils.h>
 #include <camel/camel-mime-filter.h>
 #include <camel/camel-stream.h>
@@ -83,12 +81,12 @@ typedef enum _camel_mime_parser_state_t {
 } camel_mime_parser_state_t;
 
 struct _CamelMimeParser {
-       CamelObject parent;
+       GObject parent;
        CamelMimeParserPrivate *priv;
 };
 
 struct _CamelMimeParserClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        void (*message) (CamelMimeParser *parser, gpointer headers);
        void (*part) (CamelMimeParser *parser);
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index fe7d186..79a51f9 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -38,6 +38,7 @@
 #include "camel-mime-parser.h"
 #include "camel-mime-part.h"
 #include "camel-multipart-signed.h"
+#include "camel-object.h"
 #include "camel-stream-filter.h"
 #include "camel-stream-mem.h"
 
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index a6e9295..4d5bc18 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -55,7 +55,7 @@ struct _CamelPartitionTablePrivate {
        GMutex lock;    /* for locking partition */
 };
 
-G_DEFINE_TYPE (CamelPartitionTable, camel_partition_table, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelPartitionTable, camel_partition_table, G_TYPE_OBJECT)
 
 static void
 partition_table_finalize (GObject *object)
@@ -630,7 +630,7 @@ struct _CamelKeyTablePrivate {
        GMutex lock;    /* for locking key */
 };
 
-G_DEFINE_TYPE (CamelKeyTable, camel_key_table, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelKeyTable, camel_key_table, G_TYPE_OBJECT)
 
 static void
 key_table_finalize (GObject *object)
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index f59e753..38dddbf 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -25,9 +25,7 @@
 #ifndef CAMEL_PARTITION_TABLE_H
 #define CAMEL_PARTITION_TABLE_H
 
-#include <camel/camel-object.h>
-
-#include "camel-block-file.h"
+#include <camel/camel-block-file.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_PARTITION_TABLE \
@@ -105,7 +103,7 @@ struct _CamelPartitionMapBlock {
 };
 
 struct _CamelPartitionTable {
-       CamelObject parent;
+       GObject parent;
        CamelPartitionTablePrivate *priv;
 
        CamelBlockFile *blocks;
@@ -119,7 +117,7 @@ struct _CamelPartitionTable {
 };
 
 struct _CamelPartitionTableClass {
-       CamelObjectClass parent;
+       GObjectClass parent;
 };
 
 GType          camel_partition_table_get_type  (void);
@@ -170,7 +168,7 @@ struct _CamelKeyBlock {
 #define CAMEL_KEY_TABLE_MAX_KEY (128) /* max size of any key */
 
 struct _CamelKeyTable {
-       CamelObject parent;
+       GObject parent;
        CamelKeyTablePrivate *priv;
 
        CamelBlockFile *blocks;
@@ -182,7 +180,7 @@ struct _CamelKeyTable {
 };
 
 struct _CamelKeyTableClass {
-       CamelObjectClass parent;
+       GObjectClass parent;
 };
 
 GType          camel_key_table_get_type        (void);
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 9bb49e0..820963c 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -31,8 +31,9 @@
 #ifndef CAMEL_PROVIDER_H
 #define CAMEL_PROVIDER_H
 
+#include <glib-object.h>
+
 #include <camel/camel-enums.h>
-#include <camel/camel-object.h>
 #include <camel/camel-object-bag.h>
 #include <camel/camel-url.h>
 
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index 0b80227..fc21cd8 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -72,7 +72,7 @@ enum {
        PROP_SERVICE_NAME
 };
 
-G_DEFINE_ABSTRACT_TYPE (CamelSasl, camel_sasl, CAMEL_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (CamelSasl, camel_sasl, G_TYPE_OBJECT)
 
 static void
 async_context_free (AsyncContext *async_context)
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
index d24de05..d3411f2 100644
--- a/camel/camel-sasl.h
+++ b/camel/camel-sasl.h
@@ -27,7 +27,6 @@
 #ifndef CAMEL_SASL_H
 #define CAMEL_SASL_H
 
-#include <camel/camel-object.h>
 #include <camel/camel-service.h>
 
 /* Standard GObject macros */
@@ -56,12 +55,12 @@ typedef struct _CamelSaslClass CamelSaslClass;
 typedef struct _CamelSaslPrivate CamelSaslPrivate;
 
 struct _CamelSasl {
-       CamelObject parent;
+       GObject parent;
        CamelSaslPrivate *priv;
 };
 
 struct _CamelSaslClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* Auth Mechanism Details */
        CamelServiceAuthType *auth_type;
diff --git a/camel/camel-session.c b/camel/camel-session.c
index fd29ae0..38e5b47 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -112,7 +112,7 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (CamelSession, camel_session, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelSession, camel_session, G_TYPE_OBJECT)
 
 static void
 async_context_free (AsyncContext *async_context)
diff --git a/camel/camel-session.h b/camel/camel-session.h
index e504e6b..b0e8912 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -71,7 +71,7 @@ enum {
 };
 
 struct _CamelSession {
-       CamelObject parent;
+       GObject parent;
        CamelSessionPrivate *priv;
 };
 
@@ -94,7 +94,7 @@ typedef void  (*CamelSessionCallback)         (CamelSession *session,
                                                 GError **error);
 
 struct _CamelSessionClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        CamelService *  (*add_service)          (CamelSession *session,
                                                 const gchar *uid,
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index c933140..a38ebdf 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -72,7 +72,7 @@ struct _CamelStoreSummaryPrivate {
        guint scheduled_save_id;
 };
 
-G_DEFINE_TYPE (CamelStoreSummary, camel_store_summary, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelStoreSummary, camel_store_summary, G_TYPE_OBJECT)
 
 static void
 store_summary_finalize (GObject *object)
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 4cabcfa..3b2863e 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -30,7 +30,6 @@
 
 #include <camel/camel-enums.h>
 #include <camel/camel-mime-parser.h>
-#include <camel/camel-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_STORE_SUMMARY \
@@ -77,7 +76,7 @@ struct _CamelStoreInfo {
 };
 
 struct _CamelStoreSummary {
-       CamelObject parent;
+       GObject parent;
        CamelStoreSummaryPrivate *priv;
 
        GPtrArray *folders;     /* CamelStoreInfo's */
@@ -85,7 +84,7 @@ struct _CamelStoreSummary {
 };
 
 struct _CamelStoreSummaryClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        /* size of memory objects */
        gsize store_info_size;
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index 01fcf80..12f4ece 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -49,7 +49,7 @@ static void   camel_stream_seekable_init      (GSeekableIface *interface);
 G_DEFINE_TYPE_WITH_CODE (
        CamelStream,
        camel_stream,
-       CAMEL_TYPE_OBJECT,
+       G_TYPE_OBJECT,
        G_IMPLEMENT_INTERFACE (
                G_TYPE_SEEKABLE,
                camel_stream_seekable_init))
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index dc6f8f3..147062c 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -31,7 +31,8 @@
 
 #include <stdarg.h>
 #include <unistd.h>
-#include <camel/camel-object.h>
+
+#include <gio/gio.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_STREAM \
@@ -59,14 +60,14 @@ typedef struct _CamelStreamClass CamelStreamClass;
 typedef struct _CamelStreamPrivate CamelStreamPrivate;
 
 struct _CamelStream {
-       CamelObject parent;
+       GObject parent;
        CamelStreamPrivate *priv;
 
        gboolean eos;
 };
 
 struct _CamelStreamClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        gssize          (*read)                 (CamelStream *stream,
                                                 gchar *buffer,
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index 74d21a0..e8929a3 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -26,8 +26,7 @@
 #ifndef CAMEL_TEXT_INDEX_H
 #define CAMEL_TEXT_INDEX_H
 
-#include <camel/camel-object.h>
-#include "camel-index.h"
+#include <camel/camel-index.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_TEXT_INDEX \
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 2e8e2ea..088b316 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -522,7 +522,7 @@ static void imapx_maybe_select              (CamelIMAPXServer *is,
                                                 CamelIMAPXJob *job,
                                                 CamelIMAPXMailbox *mailbox);
 
-G_DEFINE_TYPE (CamelIMAPXServer, camel_imapx_server, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelIMAPXServer, camel_imapx_server, G_TYPE_OBJECT)
 
 static const CamelIMAPXUntaggedRespHandlerDesc *
 replace_untagged_descriptor (GHashTable *untagged_handlers,
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index faec7ff..666ec38 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -98,7 +98,7 @@ struct _CamelIMAPXUntaggedRespHandlerDesc {
 };
 
 struct _CamelIMAPXServer {
-       CamelObject parent;
+       GObject parent;
        CamelIMAPXServerPrivate *priv;
 
        /* Info about the current connection */
@@ -126,7 +126,7 @@ struct _CamelIMAPXServer {
 };
 
 struct _CamelIMAPXServerClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        gchar tagprefix;
 
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index fd66cd9..d7f976e 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -43,7 +43,7 @@ extern CamelServiceAuthType camel_pop3_apop_authtype;
 
 static gboolean get_capabilities (CamelPOP3Engine *pe, GCancellable *cancellable, GError **error);
 
-G_DEFINE_TYPE (CamelPOP3Engine, camel_pop3_engine, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelPOP3Engine, camel_pop3_engine, G_TYPE_OBJECT)
 
 static void
 pop3_engine_dispose (GObject *object)
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index cc58001..b8fbd86 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -110,7 +110,7 @@ struct _CamelPOP3Command {
 };
 
 struct _CamelPOP3Engine {
-       CamelObject parent;
+       GObject parent;
 
        guint32 flags;
 
@@ -136,7 +136,7 @@ struct _CamelPOP3Engine {
 };
 
 struct _CamelPOP3EngineClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 };
 
 GType          camel_pop3_engine_get_type      (void);
diff --git a/configure.ac b/configure.ac
index 999a637..f06a828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ LIBEBOOK_CONTACTS_CURRENT=0
 LIBEBOOK_CONTACTS_REVISION=0
 LIBEBOOK_CONTACTS_AGE=0
 
-LIBCAMEL_CURRENT=46
+LIBCAMEL_CURRENT=47
 LIBCAMEL_REVISION=0
 LIBCAMEL_AGE=0
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]