diff options
| author | Pablo Barciela <scow@riseup.net> | 2019-09-09 11:17:34 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2019-09-09 11:17:34 +0200 |
| commit | f94369975d773c023c5e7e292f97a5cc3987dfa2 (patch) | |
| tree | 96eb6bd5d4537d915eca5fb799bb3f96711c446f | |
| parent | 1b31cd57bd5f5d30455a22aaa6ad1f38f3361505 (diff) | |
| download | evolution-data-server-f94369975d773c023c5e7e292f97a5cc3987dfa2.tar.gz | |
M!32 - Replace deprecated 'g_type_class_add_private'
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/32
237 files changed, 836 insertions, 2042 deletions
diff --git a/src/addressbook/backends/carddav/e-book-backend-carddav.c b/src/addressbook/backends/carddav/e-book-backend-carddav.c index 3509229ea..6075f59cb 100644 --- a/src/addressbook/backends/carddav/e-book-backend-carddav.c +++ b/src/addressbook/backends/carddav/e-book-backend-carddav.c @@ -48,7 +48,7 @@ struct _EBookBackendCardDAVPrivate { gboolean is_google; }; -G_DEFINE_TYPE (EBookBackendCardDAV, e_book_backend_carddav, E_TYPE_BOOK_META_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendCardDAV, e_book_backend_carddav, E_TYPE_BOOK_META_BACKEND) static EWebDAVSession * ebb_carddav_ref_session (EBookBackendCardDAV *bbdav) @@ -1354,7 +1354,7 @@ e_book_backend_carddav_finalize (GObject *object) static void e_book_backend_carddav_init (EBookBackendCardDAV *bbdav) { - bbdav->priv = G_TYPE_INSTANCE_GET_PRIVATE (bbdav, E_TYPE_BOOK_BACKEND_CARDDAV, EBookBackendCardDAVPrivate); + bbdav->priv = e_book_backend_carddav_get_instance_private (bbdav); g_mutex_init (&bbdav->priv->webdav_lock); } @@ -1366,8 +1366,6 @@ e_book_backend_carddav_class_init (EBookBackendCardDAVClass *klass) EBookBackendClass *book_backend_class; EBookMetaBackendClass *book_meta_backend_class; - g_type_class_add_private (klass, sizeof (EBookBackendCardDAVPrivate)); - book_meta_backend_class = E_BOOK_META_BACKEND_CLASS (klass); book_meta_backend_class->backend_module_filename = "libebookbackendcarddav.so"; book_meta_backend_class->backend_factory_type_name = "EBookBackendCardDAVFactory"; diff --git a/src/addressbook/backends/file/e-book-backend-file.c b/src/addressbook/backends/file/e-book-backend-file.c index a70e2c237..51fb5a7fa 100644 --- a/src/addressbook/backends/file/e-book-backend-file.c +++ b/src/addressbook/backends/file/e-book-backend-file.c @@ -44,10 +44,6 @@ #include "e-book-backend-file-migrate-bdb.h" #endif -#define E_BOOK_BACKEND_FILE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_FILE, EBookBackendFilePrivate)) - #define d(x) #define E_BOOK_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION" @@ -67,14 +63,6 @@ static void e_book_backend_file_initable_init (GInitableIface *iface); -G_DEFINE_TYPE_WITH_CODE ( - EBookBackendFile, - e_book_backend_file, - E_TYPE_BOOK_BACKEND_SYNC, - G_IMPLEMENT_INTERFACE ( - G_TYPE_INITABLE, - e_book_backend_file_initable_init)) - struct _EBookBackendFilePrivate { gchar *base_directory; gchar *photo_dirname; @@ -88,6 +76,15 @@ struct _EBookBackendFilePrivate { EBookSqlite *sqlitedb; }; +G_DEFINE_TYPE_WITH_CODE ( + EBookBackendFile, + e_book_backend_file, + E_TYPE_BOOK_BACKEND_SYNC, + G_ADD_PRIVATE (EBookBackendFile) + G_IMPLEMENT_INTERFACE ( + G_TYPE_INITABLE, + e_book_backend_file_initable_init)) + /**************************************************************** * File Management helper APIs * ****************************************************************/ @@ -1073,7 +1070,7 @@ book_backend_file_finalize (GObject *object) { EBookBackendFilePrivate *priv; - priv = E_BOOK_BACKEND_FILE_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_FILE (object)->priv; g_free (priv->photo_dirname); g_free (priv->revision); @@ -1808,7 +1805,7 @@ book_backend_file_configure_direct (EBookBackend *backend, { EBookBackendFilePrivate *priv; - priv = E_BOOK_BACKEND_FILE_GET_PRIVATE (backend); + priv = E_BOOK_BACKEND_FILE (backend)->priv; priv->base_directory = g_strdup (config); } @@ -1989,7 +1986,7 @@ book_backend_file_initable_init (GInitable *initable, gchar *dirname, *fullpath; gboolean success = TRUE; - priv = E_BOOK_BACKEND_FILE_GET_PRIVATE (initable); + priv = E_BOOK_BACKEND_FILE (initable)->priv; source = e_backend_get_source (E_BACKEND (initable)); registry = e_book_backend_get_registry (E_BOOK_BACKEND (initable)); @@ -2122,8 +2119,6 @@ e_book_backend_file_class_init (EBookBackendFileClass *class) EBookBackendClass *backend_class; EBookBackendSyncClass *backend_sync_class; - g_type_class_add_private (class, sizeof (EBookBackendFilePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = book_backend_file_dispose; object_class->finalize = book_backend_file_finalize; @@ -2158,7 +2153,7 @@ e_book_backend_file_initable_init (GInitableIface *iface) static void e_book_backend_file_init (EBookBackendFile *backend) { - backend->priv = E_BOOK_BACKEND_FILE_GET_PRIVATE (backend); + backend->priv = e_book_backend_file_get_instance_private (backend); g_rw_lock_init (&(backend->priv->lock)); } diff --git a/src/addressbook/backends/google/e-book-backend-google.c b/src/addressbook/backends/google/e-book-backend-google.c index 071bc028d..378be85b3 100644 --- a/src/addressbook/backends/google/e-book-backend-google.c +++ b/src/addressbook/backends/google/e-book-backend-google.c @@ -47,8 +47,6 @@ /* Local cache data version. Change it to re-download whole book content */ #define EBB_GOOGLE_DATA_VERSION 2 -G_DEFINE_TYPE (EBookBackendGoogle, e_book_backend_google, E_TYPE_BOOK_META_BACKEND) - struct _EBookBackendGooglePrivate { /* For all the group-related members */ GRecMutex groups_lock; @@ -71,6 +69,8 @@ struct _EBookBackendGooglePrivate { GHashTable *preloaded; /* gchar *uid ~> EContact * */ }; +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendGoogle, e_book_backend_google, E_TYPE_BOOK_META_BACKEND) + static void ebb_google_data_book_error_from_gdata_error (GError **error, const GError *gdata_error) @@ -1329,7 +1329,7 @@ ebb_google_finalize (GObject *object) static void e_book_backend_google_init (EBookBackendGoogle *bbgoogle) { - bbgoogle->priv = G_TYPE_INSTANCE_GET_PRIVATE (bbgoogle, E_TYPE_BOOK_BACKEND_GOOGLE, EBookBackendGooglePrivate); + bbgoogle->priv = e_book_backend_google_get_instance_private (bbgoogle); bbgoogle->priv->preloaded = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); g_rec_mutex_init (&bbgoogle->priv->groups_lock); @@ -1349,8 +1349,6 @@ e_book_backend_google_class_init (EBookBackendGoogleClass *klass) EBookBackendClass *book_backend_class; EBookMetaBackendClass *book_meta_backend_class; - g_type_class_add_private (klass, sizeof (EBookBackendGooglePrivate)); - book_meta_backend_class = E_BOOK_META_BACKEND_CLASS (klass); book_meta_backend_class->backend_module_filename = "libebookbackendgoogle.so"; book_meta_backend_class->backend_factory_type_name = "EBookBackendGoogleFactory"; diff --git a/src/addressbook/backends/ldap/e-book-backend-ldap.c b/src/addressbook/backends/ldap/e-book-backend-ldap.c index af37eea9f..05f5dfde4 100644 --- a/src/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/src/addressbook/backends/ldap/e-book-backend-ldap.c @@ -70,10 +70,6 @@ /* this is broken currently, don't enable it */ /*#define ENABLE_SASL_BINDS*/ -#define E_BOOK_BACKEND_LDAP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_LDAP, EBookBackendLDAPPrivate)) - /* interval for our poll_ldap timeout */ #define LDAP_POLL_INTERVAL 20 @@ -113,8 +109,6 @@ typedef struct LDAPOp LDAPOp; #define EC_ERROR_NOT_CONNECTED() e_client_error_create (E_CLIENT_ERROR_OTHER_ERROR, _("Not connected")) #define EC_ERROR_MSG_TYPE(_msg_type) e_client_error_create_fmt (E_CLIENT_ERROR_INVALID_ARG, "Incorrect msg type %d passed to %s", _msg_type, G_STRFUNC) -G_DEFINE_TYPE (EBookBackendLDAP, e_book_backend_ldap, E_TYPE_BOOK_BACKEND) - struct _EBookBackendLDAPPrivate { gboolean connected; @@ -167,6 +161,8 @@ struct _EBookBackendLDAPPrivate { GMutex view_mutex; }; +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendLDAP, e_book_backend_ldap, E_TYPE_BOOK_BACKEND) + typedef void (*LDAPOpHandler)(LDAPOp *op, LDAPMessage *res); typedef void (*LDAPOpDtor)(LDAPOp *op); @@ -4904,7 +4900,7 @@ book_backend_ldap_finalize (GObject *object) { EBookBackendLDAPPrivate *priv; - priv = E_BOOK_BACKEND_LDAP_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_LDAP (object)->priv; g_rec_mutex_lock (&eds_ldap_handler_lock); g_rec_mutex_lock (&priv->op_hash_mutex); @@ -5981,8 +5977,6 @@ e_book_backend_ldap_class_init (EBookBackendLDAPClass *class) EBackendClass *backend_class; EBookBackendClass *book_backend_class; - g_type_class_add_private (class, sizeof (EBookBackendLDAPPrivate)); - #ifndef SUNLDAP /* get client side information (extensions present in the library) */ get_ldap_library_info (); @@ -6014,7 +6008,7 @@ e_book_backend_ldap_class_init (EBookBackendLDAPClass *class) static void e_book_backend_ldap_init (EBookBackendLDAP *backend) { - backend->priv = E_BOOK_BACKEND_LDAP_GET_PRIVATE (backend); + backend->priv = e_book_backend_ldap_get_instance_private (backend); backend->priv->ldap_limit = 100; backend->priv->id_to_op = g_hash_table_new (g_int_hash, g_int_equal); diff --git a/src/addressbook/libebook-contacts/e-contact.c b/src/addressbook/libebook-contacts/e-contact.c index 334882e6e..9b26799f3 100644 --- a/src/addressbook/libebook-contacts/e-contact.c +++ b/src/addressbook/libebook-contacts/e-contact.c @@ -48,16 +48,12 @@ #define d(x) -#define E_CONTACT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CONTACT, EContactPrivate)) - -G_DEFINE_TYPE (EContact, e_contact, E_TYPE_VCARD) - struct _EContactPrivate { gchar *cached_strings[E_CONTACT_FIELD_LAST]; }; +G_DEFINE_TYPE_WITH_PRIVATE (EContact, e_contact, E_TYPE_VCARD) + typedef struct _AttrTypeValue { const gchar *attr_name; const gchar *type_values; /* semicolon-delimited upper-case list of used TYPE values */ @@ -493,7 +489,7 @@ e_contact_finalize (GObject *object) EContactPrivate *priv; gint ii; - priv = E_CONTACT_GET_PRIVATE (object); + priv = E_CONTACT (object)->priv; for (ii = E_CONTACT_FIELD_FIRST; ii < E_CONTACT_FIELD_LAST; ii++) g_free (priv->cached_strings[ii]); @@ -513,8 +509,6 @@ e_contact_class_init (EContactClass *class) #endif gint ii; - g_type_class_add_private (class, sizeof (EContactPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = e_contact_set_property; object_class->get_property = e_contact_get_property; @@ -637,7 +631,7 @@ e_contact_class_init (EContactClass *class) static void e_contact_init (EContact *ec) { - ec->priv = E_CONTACT_GET_PRIVATE (ec); + ec->priv = e_contact_get_instance_private (ec); } static gpointer diff --git a/src/addressbook/libebook-contacts/e-source-backend-summary-setup.c b/src/addressbook/libebook-contacts/e-source-backend-summary-setup.c index 6574c0a3c..4f36fecb8 100644 --- a/src/addressbook/libebook-contacts/e-source-backend-summary-setup.c +++ b/src/addressbook/libebook-contacts/e-source-backend-summary-setup.c @@ -47,11 +47,6 @@ #include "e-source-backend-summary-setup.h" #include "e-book-contacts-enumtypes.h" -#define E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP, \ - ESourceBackendSummarySetupPrivate)) - struct _ESourceBackendSummarySetupPrivate { GMutex property_lock; gchar *summary_fields; @@ -64,7 +59,7 @@ enum { PROP_INDEXED_FIELDS }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceBackendSummarySetup, e_source_backend_summary_setup, E_TYPE_SOURCE_EXTENSION) @@ -174,7 +169,7 @@ source_backend_summary_setup_finalize (GObject *object) { ESourceBackendSummarySetupPrivate *priv; - priv = E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE (object); + priv = E_SOURCE_BACKEND_SUMMARY_SETUP (object)->priv; g_mutex_clear (&priv->property_lock); g_free (priv->summary_fields); @@ -191,9 +186,6 @@ e_source_backend_summary_setup_class_init (ESourceBackendSummarySetupClass *clas GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private ( - class, sizeof (ESourceBackendSummarySetupPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->get_property = source_backend_summary_setup_get_property; object_class->set_property = source_backend_summary_setup_set_property; @@ -235,7 +227,7 @@ e_source_backend_summary_setup_class_init (ESourceBackendSummarySetupClass *clas static void e_source_backend_summary_setup_init (ESourceBackendSummarySetup *extension) { - extension->priv = E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE (extension); + extension->priv = e_source_backend_summary_setup_get_instance_private (extension); g_mutex_init (&extension->priv->property_lock); } diff --git a/src/addressbook/libebook-contacts/e-vcard.c b/src/addressbook/libebook-contacts/e-vcard.c index 779bae336..24dd5a7f3 100644 --- a/src/addressbook/libebook-contacts/e-vcard.c +++ b/src/addressbook/libebook-contacts/e-vcard.c @@ -114,20 +114,11 @@ #define CRLF "\r\n" -#define E_VCARD_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_VCARD, EVCardPrivate)) - -G_DEFINE_TYPE (EVCard, e_vcard, G_TYPE_OBJECT) - static EVCardAttribute *e_vcard_attribute_ref (EVCardAttribute *attr); static void e_vcard_attribute_unref (EVCardAttribute *attr); static EVCardAttributeParam *e_vcard_attribute_param_ref (EVCardAttributeParam *param); static void e_vcard_attribute_param_unref (EVCardAttributeParam *param); -G_DEFINE_BOXED_TYPE (EVCardAttribute, e_vcard_attribute, e_vcard_attribute_ref, e_vcard_attribute_unref) -G_DEFINE_BOXED_TYPE (EVCardAttributeParam, e_vcard_attribute_param, e_vcard_attribute_param_ref, e_vcard_attribute_param_unref) - /* Encoding used in v-card * Note: v-card spec defines additional 7BIT 8BIT and X- encoding */ @@ -159,12 +150,18 @@ struct _EVCardAttributeParam { GList *values; /* GList of gchar *'s */ }; +G_DEFINE_TYPE_WITH_PRIVATE (EVCard, e_vcard, G_TYPE_OBJECT) + +G_DEFINE_BOXED_TYPE (EVCardAttribute, e_vcard_attribute, e_vcard_attribute_ref, e_vcard_attribute_unref) + +G_DEFINE_BOXED_TYPE (EVCardAttributeParam, e_vcard_attribute_param, e_vcard_attribute_param_ref, e_vcard_attribute_param_unref) + static void vcard_finalize (GObject *object) { EVCardPrivate *priv; - priv = E_VCARD_GET_PRIVATE (object); + priv = E_VCARD (object)->priv; /* Directly access priv->attributes and don't call * e_vcard_ensure_attributes(), since it is pointless @@ -183,8 +180,6 @@ e_vcard_class_init (EVCardClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EVCardPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = vcard_finalize; } @@ -192,7 +187,7 @@ e_vcard_class_init (EVCardClass *class) static void e_vcard_init (EVCard *evc) { - evc->priv = E_VCARD_GET_PRIVATE (evc); + evc->priv = e_vcard_get_instance_private (evc); } static EVCardAttribute * diff --git a/src/addressbook/libebook/e-book-client-cursor.c b/src/addressbook/libebook/e-book-client-cursor.c index c6b30ffe0..113ed8c00 100644 --- a/src/addressbook/libebook/e-book-client-cursor.c +++ b/src/addressbook/libebook/e-book-client-cursor.c @@ -461,10 +461,6 @@ #include "e-book-client.h" #include "e-book-client-cursor.h" -#define E_BOOK_CLIENT_CURSOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_CLIENT_CURSOR, EBookClientCursorPrivate)) - /* Forward declarations */ typedef struct _SetSexpContext SetSexpContext; typedef struct _StepContext StepContext; @@ -668,6 +664,7 @@ G_DEFINE_TYPE_WITH_CODE ( EBookClientCursor, e_book_client_cursor, G_TYPE_OBJECT, + G_ADD_PRIVATE (EBookClientCursor) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_book_client_cursor_initable_init)) @@ -923,14 +920,12 @@ e_book_client_cursor_class_init (EBookClientCursorClass *class) G_STRUCT_OFFSET (EBookClientCursorClass, refresh), NULL, NULL, NULL, G_TYPE_NONE, 0); - - g_type_class_add_private (class, sizeof (EBookClientCursorPrivate)); } static void e_book_client_cursor_init (EBookClientCursor *cursor) { - cursor->priv = E_BOOK_CLIENT_CURSOR_GET_PRIVATE (cursor); + cursor->priv = e_book_client_cursor_get_instance_private (cursor); g_mutex_init (&cursor->priv->main_context_lock); g_mutex_init (&cursor->priv->notifications_lock); diff --git a/src/addressbook/libebook/e-book-client-view.c b/src/addressbook/libebook/e-book-client-view.c index dc4796c2d..07648b61a 100644 --- a/src/addressbook/libebook/e-book-client-view.c +++ b/src/addressbook/libebook/e-book-client-view.c @@ -40,10 +40,6 @@ #include "e-book-client-view.h" #include "e-dbus-address-book-view.h" -#define E_BOOK_CLIENT_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_CLIENT_VIEW, EBookClientViewPrivate)) - typedef struct _SignalClosure SignalClosure; struct _EBookClientViewPrivate { @@ -102,6 +98,7 @@ G_DEFINE_TYPE_WITH_CODE ( EBookClientView, e_book_client_view, G_TYPE_OBJECT, + G_ADD_PRIVATE (EBookClientView) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_book_client_view_initable_init)) @@ -786,7 +783,7 @@ book_client_view_dispose (GObject *object) { EBookClientViewPrivate *priv; - priv = E_BOOK_CLIENT_VIEW_GET_PRIVATE (object); + priv = E_BOOK_CLIENT_VIEW (object)->priv; g_clear_object (&priv->client); @@ -840,7 +837,7 @@ book_client_view_finalize (GObject *object) { EBookClientViewPrivate *priv; - priv = E_BOOK_CLIENT_VIEW_GET_PRIVATE (object); + priv = E_BOOK_CLIENT_VIEW (object)->priv; g_free (priv->object_path); @@ -862,7 +859,7 @@ book_client_view_initable_init (GInitable *initable, gulong handler_id; gchar *bus_name; - priv = E_BOOK_CLIENT_VIEW_GET_PRIVATE (initable); + priv = E_BOOK_CLIENT_VIEW (initable)->priv; book_client = priv->client ? g_object_ref (priv->client) : NULL; if (book_client == NULL) { @@ -940,8 +937,6 @@ e_book_client_view_class_init (EBookClientViewClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookClientViewPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = book_client_view_set_property; object_class->get_property = book_client_view_get_property; @@ -1056,7 +1051,7 @@ e_book_client_view_initable_init (GInitableIface *iface) static void e_book_client_view_init (EBookClientView *client_view) { - client_view->priv = E_BOOK_CLIENT_VIEW_GET_PRIVATE (client_view); + client_view->priv = e_book_client_view_get_instance_private (client_view); g_mutex_init (&client_view->priv->main_context_lock); client_view->priv->client = NULL; diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c index fb58e7637..ad90e5eea 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c @@ -46,10 +46,6 @@ #include "e-book-client.h" -#define E_BOOK_CLIENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_CLIENT, EBookClientPrivate)) - /* Set this to a sufficiently large value * to cover most long-running operations. */ #define DBUS_PROXY_TIMEOUT_MS (3 * 60 * 1000) /* 3 minutes */ @@ -121,6 +117,7 @@ G_DEFINE_TYPE_WITH_CODE ( EBookClient, e_book_client, E_TYPE_CLIENT, + G_ADD_PRIVATE (EBookClient) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_book_client_initable_init) @@ -724,7 +721,7 @@ book_client_dispose (GObject *object) { EBookClientPrivate *priv; - priv = E_BOOK_CLIENT_GET_PRIVATE (object); + priv = E_BOOK_CLIENT (object)->priv; if (priv->dbus_proxy_error_handler_id > 0) { g_signal_handler_disconnect ( @@ -764,7 +761,7 @@ book_client_finalize (GObject *object) { EBookClientPrivate *priv; - priv = E_BOOK_CLIENT_GET_PRIVATE (object); + priv = E_BOOK_CLIENT (object)->priv; if (priv->name_watcher_id > 0) g_bus_unwatch_name (priv->name_watcher_id); @@ -840,7 +837,7 @@ book_client_get_dbus_proxy (EClient *client) { EBookClientPrivate *priv; - priv = E_BOOK_CLIENT_GET_PRIVATE (client); + priv = E_BOOK_CLIENT (client)->priv; return G_DBUS_PROXY (priv->dbus_proxy); } @@ -1046,7 +1043,7 @@ book_client_init_in_dbus_thread (GSimpleAsyncResult *simple, gulong handler_id; GError *local_error = NULL; - priv = E_BOOK_CLIENT_GET_PRIVATE (source_object); + priv = E_BOOK_CLIENT (source_object)->priv; client = E_CLIENT (source_object); source = e_client_get_source (client); @@ -1261,8 +1258,6 @@ e_book_client_class_init (EBookClientClass *class) GObjectClass *object_class; EClientClass *client_class; - g_type_class_add_private (class, sizeof (EBookClientPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = book_client_dispose; object_class->finalize = book_client_finalize; @@ -1313,7 +1308,7 @@ e_book_client_init (EBookClient *client) { const gchar *default_locale; - client->priv = E_BOOK_CLIENT_GET_PRIVATE (client); + client->priv = e_book_client_get_instance_private (client); default_locale = setlocale (LC_COLLATE, NULL); client->priv->locale = g_strdup (default_locale); @@ -1491,7 +1486,7 @@ book_client_connect_init_cb (GObject *source_object, source_object = g_async_result_get_source_object (result); closure = g_simple_async_result_get_op_res_gpointer (simple); - priv = E_BOOK_CLIENT_GET_PRIVATE (source_object); + priv = E_BOOK_CLIENT (source_object)->priv; e_dbus_address_book_call_open ( priv->dbus_proxy, @@ -1665,7 +1660,7 @@ connect_direct (EBookClient *client, const gchar *backend_name, *backend_path, *config; gchar *bus_name; - priv = E_BOOK_CLIENT_GET_PRIVATE (client); + priv = E_BOOK_CLIENT (client)->priv; if (registry) g_object_ref (registry); @@ -1777,7 +1772,7 @@ book_client_connect_direct_init_cb (GObject *source_object, source_object = g_async_result_get_source_object (result); closure = g_simple_async_result_get_op_res_gpointer (simple); - priv = E_BOOK_CLIENT_GET_PRIVATE (source_object); + priv = E_BOOK_CLIENT (source_object)->priv; e_dbus_address_book_call_open ( priv->dbus_proxy, diff --git a/src/addressbook/libebook/e-book-view.c b/src/addressbook/libebook/e-book-view.c index 6a9719e54..7fedca25f 100644 --- a/src/addressbook/libebook/e-book-view.c +++ b/src/addressbook/libebook/e-book-view.c @@ -24,12 +24,6 @@ #include "e-book-view-private.h" #include "e-book-enumtypes.h" -G_DEFINE_TYPE (EBookView, e_book_view, G_TYPE_OBJECT); - -#define E_BOOK_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_VIEW, EBookViewPrivate)) - struct _EBookViewPrivate { EBook *book; EBookClientView *client_view; @@ -51,6 +45,8 @@ enum { LAST_SIGNAL }; +G_DEFINE_TYPE_WITH_PRIVATE (EBookView, e_book_view, G_TYPE_OBJECT); + static guint signals[LAST_SIGNAL]; static void @@ -156,7 +152,7 @@ book_view_dispose (GObject *object) { EBookViewPrivate *priv; - priv = E_BOOK_VIEW_GET_PRIVATE (object); + priv = E_BOOK_VIEW (object)->priv; if (priv->book != NULL) { g_object_unref (priv->book); @@ -192,8 +188,6 @@ e_book_view_class_init (EBookViewClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookViewPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = book_view_dispose; @@ -250,7 +244,7 @@ e_book_view_class_init (EBookViewClass *class) static void e_book_view_init (EBookView *book_view) { - book_view->priv = E_BOOK_VIEW_GET_PRIVATE (book_view); + book_view->priv = e_book_view_get_instance_private (book_view); } EBookView * diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c index fd7260d4b..ed23af884 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c @@ -42,10 +42,6 @@ #include "e-error.h" #include "e-book-view-private.h" -#define E_BOOK_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK, EBookPrivate)) - struct _EBookPrivate { EBookClient *client; gulong backend_died_handler_id; @@ -83,6 +79,7 @@ static void e_book_initable_init (GInitableIface *iface); G_DEFINE_TYPE_WITH_CODE ( EBook, e_book, G_TYPE_OBJECT, + G_ADD_PRIVATE (EBook) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, e_book_initable_init)) G_DEFINE_QUARK (e-book-error-quark, e_book_error) @@ -164,7 +161,7 @@ book_dispose (GObject *object) { EBookPrivate *priv; - priv = E_BOOK_GET_PRIVATE (object); + priv = E_BOOK (object)->priv; if (priv->client != NULL) { g_signal_handler_disconnect ( @@ -194,7 +191,7 @@ book_finalize (GObject *object) { EBookPrivate *priv; - priv = E_BOOK_GET_PRIVATE (object); + priv = E_BOOK (object)->priv; g_free (priv->cap); @@ -237,8 +234,6 @@ e_book_class_init (EBookClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = book_set_property; object_class->get_property = book_get_property; @@ -293,7 +288,7 @@ e_book_initable_init (GInitableIface *iface) static void e_book_init (EBook *book) { - book->priv = E_BOOK_GET_PRIVATE (book); + book->priv = e_book_get_instance_private (book); } /** diff --git a/src/addressbook/libebook/e-destination.c b/src/addressbook/libebook/e-destination.c index d862cd18a..352b2fb6b 100644 --- a/src/addressbook/libebook/e-destination.c +++ b/src/addressbook/libebook/e-destination.c @@ -44,12 +44,6 @@ #define d(x) -#define E_DESTINATION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DESTINATION, EDestinationPrivate)) - -G_DEFINE_TYPE (EDestination, e_destination, G_TYPE_OBJECT) - struct _EDestinationPrivate { gchar *raw; @@ -77,6 +71,8 @@ struct _EDestinationPrivate { guint auto_recipient : 1; }; +G_DEFINE_TYPE_WITH_PRIVATE (EDestination, e_destination, G_TYPE_OBJECT) + static gboolean e_destination_from_contact (const EDestination *); static xmlNodePtr e_destination_xml_encode (const EDestination *dest); static gboolean e_destination_xml_decode (EDestination *dest, xmlNodePtr node); @@ -128,7 +124,7 @@ destination_finalize (GObject *object) { EDestinationPrivate *priv; - priv = E_DESTINATION_GET_PRIVATE (object); + priv = E_DESTINATION (object)->priv; e_destination_clear (E_DESTINATION (object)); @@ -143,8 +139,6 @@ e_destination_class_init (EDestinationClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDestinationPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = destination_finalize; @@ -160,7 +154,7 @@ e_destination_class_init (EDestinationClass *class) static void e_destination_init (EDestination *dest) { - dest->priv = E_DESTINATION_GET_PRIVATE (dest); + dest->priv = e_destination_get_instance_private (dest); } /** diff --git a/src/addressbook/libedata-book/e-book-backend-cache.c b/src/addressbook/libedata-book/e-book-backend-cache.c index 410b7cad7..0cad61222 100644 --- a/src/addressbook/libedata-book/e-book-backend-cache.c +++ b/src/addressbook/libedata-book/e-book-backend-cache.c @@ -32,26 +32,21 @@ #include "e-book-backend-cache.h" #include "e-book-backend-sexp.h" -#define E_BOOK_BACKEND_CACHE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCachePrivate)) - struct _EBookBackendCachePrivate { gint placeholder; }; -G_DEFINE_TYPE (EBookBackendCache, e_book_backend_cache, E_TYPE_FILE_CACHE) +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendCache, e_book_backend_cache, E_TYPE_FILE_CACHE) static void e_book_backend_cache_class_init (EBookBackendCacheClass *class) { - g_type_class_add_private (class, sizeof (EBookBackendCachePrivate)); } static void e_book_backend_cache_init (EBookBackendCache *cache) { - cache->priv = E_BOOK_BACKEND_CACHE_GET_PRIVATE (cache); + cache->priv = e_book_backend_cache_get_instance_private (cache); } /** diff --git a/src/addressbook/libedata-book/e-book-backend-sexp.c b/src/addressbook/libedata-book/e-book-backend-sexp.c index 35ac6fde0..f6946e5c1 100644 --- a/src/addressbook/libedata-book/e-book-backend-sexp.c +++ b/src/addressbook/libedata-book/e-book-backend-sexp.c @@ -32,12 +32,6 @@ #include <locale.h> #include <string.h> -#define E_BOOK_BACKEND_SEXP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_SEXP, EBookBackendSExpPrivate)) - -G_DEFINE_TYPE (EBookBackendSExp, e_book_backend_sexp, G_TYPE_OBJECT) - typedef struct _SearchContext SearchContext; typedef gboolean (*CompareFunc) (const gchar *, const gchar *, const gchar *); @@ -52,6 +46,8 @@ struct _SearchContext { EContact *contact; }; +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendSExp, e_book_backend_sexp, G_TYPE_OBJECT) + static gboolean compare_im (EContact *contact, const gchar *str, @@ -1085,7 +1081,7 @@ book_backend_sexp_finalize (GObject *object) { EBookBackendSExpPrivate *priv; - priv = E_BOOK_BACKEND_SEXP_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_SEXP (object)->priv; g_object_unref (priv->search_sexp); g_free (priv->text); @@ -1102,8 +1098,6 @@ e_book_backend_sexp_class_init (EBookBackendSExpClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookBackendSExpPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = book_backend_sexp_finalize; } @@ -1111,7 +1105,7 @@ e_book_backend_sexp_class_init (EBookBackendSExpClass *class) static void e_book_backend_sexp_init (EBookBackendSExp *sexp) { - sexp->priv = E_BOOK_BACKEND_SEXP_GET_PRIVATE (sexp); + sexp->priv = e_book_backend_sexp_get_instance_private (sexp); sexp->priv->search_context = g_new (SearchContext, 1); g_rec_mutex_init (&sexp->priv->search_context_lock); diff --git a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c index 3f59a0daa..c3ab4267e 100644 --- a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c +++ b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c @@ -42,10 +42,6 @@ #include "e-book-backend-sexp.h" -#define E_BOOK_BACKEND_SQLITEDB_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_SQLITEDB, EBookBackendSqliteDBPrivate)) - #define d(x) #if d(1)+0 @@ -112,7 +108,7 @@ struct _EBookBackendSqliteDBPrivate { gchar *locale; /* The current locale */ }; -G_DEFINE_TYPE (EBookBackendSqliteDB, e_book_backend_sqlitedb, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendSqliteDB, e_book_backend_sqlitedb, G_TYPE_OBJECT) static GHashTable *db_connections = NULL; static GMutex dbcon_lock; @@ -217,7 +213,7 @@ e_book_backend_sqlitedb_dispose (GObject *object) { EBookBackendSqliteDBPrivate *priv; - priv = E_BOOK_BACKEND_SQLITEDB_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_SQLITEDB (object)->priv; g_mutex_lock (&dbcon_lock); if (db_connections != NULL) { @@ -244,7 +240,7 @@ e_book_backend_sqlitedb_finalize (GObject *object) { EBookBackendSqliteDBPrivate *priv; - priv = E_BOOK_BACKEND_SQLITEDB_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_SQLITEDB (object)->priv; sqlite3_close (priv->db); @@ -267,8 +263,6 @@ e_book_backend_sqlitedb_class_init (EBookBackendSqliteDBClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookBackendSqliteDBPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = e_book_backend_sqlitedb_dispose; object_class->finalize = e_book_backend_sqlitedb_finalize; @@ -277,7 +271,7 @@ e_book_backend_sqlitedb_class_init (EBookBackendSqliteDBClass *class) static void e_book_backend_sqlitedb_init (EBookBackendSqliteDB *ebsdb) { - ebsdb->priv = E_BOOK_BACKEND_SQLITEDB_GET_PRIVATE (ebsdb); + ebsdb->priv = e_book_backend_sqlitedb_get_instance_private (ebsdb); ebsdb->priv->store_vcard = TRUE; diff --git a/src/addressbook/libedata-book/e-book-backend-summary.c b/src/addressbook/libedata-book/e-book-backend-summary.c index dec60cd23..29907cc35 100644 --- a/src/addressbook/libedata-book/e-book-backend-summary.c +++ b/src/addressbook/libedata-book/e-book-backend-summary.c @@ -37,12 +37,6 @@ #include "e-book-backend-summary.h" -#define E_BOOK_BACKEND_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND_SUMMARY, EBookBackendSummaryPrivate)) - -G_DEFINE_TYPE (EBookBackendSummary, e_book_backend_summary, G_TYPE_OBJECT) - struct _EBookBackendSummaryPrivate { gchar *summary_path; FILE *fp; @@ -102,6 +96,8 @@ typedef struct { guint32 summary_mtime; /* version 2.0 field */ } EBookBackendSummaryHeader; +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendSummary, e_book_backend_summary, G_TYPE_OBJECT) + #define PAS_SUMMARY_MAGIC "PAS-SUMMARY" #define PAS_SUMMARY_MAGIC_LEN 11 @@ -175,7 +171,7 @@ e_book_backend_summary_finalize (GObject *object) { EBookBackendSummaryPrivate *priv; - priv = E_BOOK_BACKEND_SUMMARY_GET_PRIVATE (object); + priv = E_BOOK_BACKEND_SUMMARY (object)->priv; if (priv->fp) fclose (priv->fp); @@ -202,8 +198,6 @@ e_book_backend_summary_class_init (EBookBackendSummaryClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookBackendSummaryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = e_book_backend_summary_finalize; } @@ -211,7 +205,7 @@ e_book_backend_summary_class_init (EBookBackendSummaryClass *class) static void e_book_backend_summary_init (EBookBackendSummary *summary) { - summary->priv = E_BOOK_BACKEND_SUMMARY_GET_PRIVATE (summary); + summary->priv = e_book_backend_summary_get_instance_private (summary); summary->priv->items = g_ptr_array_new (); summary->priv->id_to_item = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/src/addressbook/libedata-book/e-book-backend-sync.c b/src/addressbook/libedata-book/e-book-backend-sync.c index 11b34beca..852b87dab 100644 --- a/src/addressbook/libedata-book/e-book-backend-sync.c +++ b/src/addressbook/libedata-book/e-book-backend-sync.c @@ -42,7 +42,7 @@ struct _EBookBackendSyncPrivate { guint dummy; }; -G_DEFINE_TYPE (EBookBackendSync, e_book_backend_sync, E_TYPE_BOOK_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackendSync, e_book_backend_sync, E_TYPE_BOOK_BACKEND) static void book_backend_sync_open (EBookBackend *backend, @@ -238,8 +238,6 @@ e_book_backend_sync_class_init (EBookBackendSyncClass *klass) { EBookBackendClass *book_backend_class; - g_type_class_add_private (klass, sizeof (EBookBackendSyncPrivate)); - klass->get_contact_list_uids_sync = book_backend_sync_get_contact_list_uids_sync; book_backend_class = E_BOOK_BACKEND_CLASS (klass); @@ -256,7 +254,7 @@ e_book_backend_sync_class_init (EBookBackendSyncClass *klass) static void e_book_backend_sync_init (EBookBackendSync *backend) { - backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSyncPrivate); + backend->priv = e_book_backend_sync_get_instance_private (backend); } /** diff --git a/src/addressbook/libedata-book/e-book-backend.c b/src/addressbook/libedata-book/e-book-backend.c index e63b0994a..d09df57af 100644 --- a/src/addressbook/libedata-book/e-book-backend.c +++ b/src/addressbook/libedata-book/e-book-backend.c @@ -37,10 +37,6 @@ #include "e-data-book.h" #include "e-book-backend.h" -#define E_BOOK_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_BACKEND, EBookBackendPrivate)) - typedef struct _AsyncContext AsyncContext; typedef struct _DispatchNode DispatchNode; @@ -119,7 +115,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE (EBookBackend, e_book_backend, E_TYPE_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (EBookBackend, e_book_backend, E_TYPE_BACKEND) static void async_context_free (AsyncContext *async_context) @@ -501,7 +497,7 @@ book_backend_dispose (GObject *object) { EBookBackendPrivate *priv; - priv = E_BOOK_BACKEND_GET_PRIVATE (object); + priv = E_BOOK_BACKEND (object)->priv; if (priv->auth_source_changed_handler_id > 0) { g_signal_handler_disconnect ( @@ -536,7 +532,7 @@ book_backend_finalize (GObject *object) { EBookBackendPrivate *priv; - priv = E_BOOK_BACKEND_GET_PRIVATE (object); + priv = E_BOOK_BACKEND (object)->priv; g_mutex_clear (&priv->views_mutex); g_mutex_clear (&priv->property_lock); @@ -700,8 +696,6 @@ e_book_backend_class_init (EBookBackendClass *class) GObjectClass *object_class; EBackendClass *backend_class; - g_type_class_add_private (class, sizeof (EBookBackendPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = book_backend_set_property; object_class->get_property = book_backend_get_property; @@ -804,7 +798,7 @@ e_book_backend_class_init (EBookBackendClass *class) static void e_book_backend_init (EBookBackend *backend) { - backend->priv = E_BOOK_BACKEND_GET_PRIVATE (backend); + backend->priv = e_book_backend_get_instance_private (backend); backend->priv->views = NULL; g_mutex_init (&backend->priv->views_mutex); diff --git a/src/addressbook/libedata-book/e-book-cache.c b/src/addressbook/libedata-book/e-book-cache.c index d078d9bac..99ca5e135 100644 --- a/src/addressbook/libedata-book/e-book-cache.c +++ b/src/addressbook/libedata-book/e-book-cache.c @@ -142,6 +142,7 @@ static EBookCacheCursor *e_book_cache_cursor_fake_ref (EBookCacheCursor *cursor) static void e_book_cache_cursor_fake_unref (EBookCacheCursor *cursor); G_DEFINE_TYPE_WITH_CODE (EBookCache, e_book_cache, E_TYPE_CACHE, + G_ADD_PRIVATE (EBookCache) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) G_DEFINE_BOXED_TYPE (EBookCacheSearchData, e_book_cache_search_data, e_book_cache_search_data_copy, e_book_cache_search_data_free) @@ -6359,8 +6360,6 @@ e_book_cache_class_init (EBookCacheClass *klass) GObjectClass *object_class; ECacheClass *cache_class; - g_type_class_add_private (klass, sizeof (EBookCachePrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->get_property = e_book_cache_get_property; object_class->finalize = e_book_cache_finalize; @@ -6416,5 +6415,5 @@ e_book_cache_class_init (EBookCacheClass *klass) static void e_book_cache_init (EBookCache *book_cache) { - book_cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_cache, E_TYPE_BOOK_CACHE, EBookCachePrivate); + book_cache->priv = e_book_cache_get_instance_private (book_cache); } diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c index 3307d6a5f..ea61a9fcc 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -107,7 +107,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_ABSTRACT_TYPE (EBookMetaBackend, e_book_meta_backend, E_TYPE_BOOK_BACKEND_SYNC) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EBookMetaBackend, e_book_meta_backend, E_TYPE_BOOK_BACKEND_SYNC) G_DEFINE_BOXED_TYPE (EBookMetaBackendInfo, e_book_meta_backend_info, e_book_meta_backend_info_copy, e_book_meta_backend_info_free) @@ -2450,8 +2450,6 @@ e_book_meta_backend_class_init (EBookMetaBackendClass *klass) EBookBackendClass *book_backend_class; EBookBackendSyncClass *book_backend_sync_class; - g_type_class_add_private (klass, sizeof (EBookMetaBackendPrivate)); - klass->backend_factory_type_name = NULL; klass->backend_module_filename = NULL; klass->get_changes_sync = ebmb_get_changes_sync; @@ -2539,7 +2537,7 @@ e_book_meta_backend_class_init (EBookMetaBackendClass *klass) static void e_book_meta_backend_init (EBookMetaBackend *meta_backend) { - meta_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (meta_backend, E_TYPE_BOOK_META_BACKEND, EBookMetaBackendPrivate); + meta_backend->priv = e_book_meta_backend_get_instance_private (meta_backend); g_mutex_init (&meta_backend->priv->connect_lock); g_mutex_init (&meta_backend->priv->property_lock); diff --git a/src/addressbook/libedata-book/e-book-sqlite.c b/src/addressbook/libedata-book/e-book-sqlite.c index 952988526..89029febe 100644 --- a/src/addressbook/libedata-book/e-book-sqlite.c +++ b/src/addressbook/libedata-book/e-book-sqlite.c @@ -59,10 +59,6 @@ #include "e-book-backend-sexp.h" -#define E_BOOK_SQLITE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BOOK_SQLITE, EBookSqlitePrivate)) - /****************************************************** * Debugging Macros * ****************************************************** @@ -405,7 +401,9 @@ enum { static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_CODE (EBookSqlite, e_book_sqlite, G_TYPE_OBJECT, + G_ADD_PRIVATE (EBookSqlite) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + G_DEFINE_QUARK (e-book-backend-sqlite-error-quark, e_book_sqlite_error) @@ -6478,8 +6476,6 @@ e_book_sqlite_class_init (EBookSqliteClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBookSqlitePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = e_book_sqlite_dispose; object_class->finalize = e_book_sqlite_finalize; @@ -6525,7 +6521,7 @@ e_book_sqlite_class_init (EBookSqliteClass *class) static void e_book_sqlite_init (EBookSqlite *ebsql) { - ebsql->priv = E_BOOK_SQLITE_GET_PRIVATE (ebsql); + ebsql->priv = e_book_sqlite_get_instance_private (ebsql); g_mutex_init (&ebsql->priv->lock); g_mutex_init (&ebsql->priv->updates_lock); diff --git a/src/addressbook/libedata-book/e-data-book-cursor-cache.c b/src/addressbook/libedata-book/e-data-book-cursor-cache.c index e6c22ceb2..34a8d8cb6 100644 --- a/src/addressbook/libedata-book/e-data-book-cursor-cache.c +++ b/src/addressbook/libedata-book/e-data-book-cursor-cache.c @@ -44,7 +44,7 @@ enum { PROP_CURSOR, }; -G_DEFINE_TYPE (EDataBookCursorCache, e_data_book_cursor_cache, E_TYPE_DATA_BOOK_CURSOR); +G_DEFINE_TYPE_WITH_PRIVATE (EDataBookCursorCache, e_data_book_cursor_cache, E_TYPE_DATA_BOOK_CURSOR); static gboolean edbcc_set_sexp (EDataBookCursor *cursor, @@ -366,14 +366,12 @@ e_data_book_cursor_cache_class_init (EDataBookCursorCacheClass *class) "Cursor", "The EBookCacheCursor pointer", G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_type_class_add_private (class, sizeof (EDataBookCursorCachePrivate)); } static void e_data_book_cursor_cache_init (EDataBookCursorCache *cache_cursor) { - cache_cursor->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache_cursor, E_TYPE_DATA_BOOK_CURSOR_CACHE, EDataBookCursorCachePrivate); + cache_cursor->priv = e_data_book_cursor_cache_get_instance_private (cache_cursor); } /** diff --git a/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c b/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c index 084f907c8..67f7be706 100644 --- a/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c +++ b/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c @@ -32,10 +32,6 @@ #include "e-data-book-cursor-sqlite.h" -#define E_DATA_BOOK_CURSOR_SQLITE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK_CURSOR_SQLITE, EDataBookCursorSqlitePrivate)) - /* GObjectClass */ static void e_data_book_cursor_sqlite_dispose (GObject *object); static void e_data_book_cursor_sqlite_finalize (GObject *object); @@ -85,7 +81,7 @@ enum { PROP_CURSOR, }; -G_DEFINE_TYPE (EDataBookCursorSqlite, e_data_book_cursor_sqlite, E_TYPE_DATA_BOOK_CURSOR); +G_DEFINE_TYPE_WITH_PRIVATE (EDataBookCursorSqlite, e_data_book_cursor_sqlite, E_TYPE_DATA_BOOK_CURSOR); /************************************************ * GObjectClass * @@ -134,14 +130,12 @@ e_data_book_cursor_sqlite_class_init (EDataBookCursorSqliteClass *class) "cursor", "Cursor", "The EbSqlCursor pointer", G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_type_class_add_private (class, sizeof (EDataBookCursorSqlitePrivate)); } static void e_data_book_cursor_sqlite_init (EDataBookCursorSqlite *cursor) { - cursor->priv = E_DATA_BOOK_CURSOR_SQLITE_GET_PRIVATE (cursor); + cursor->priv = e_data_book_cursor_sqlite_get_instance_private (cursor); } static void diff --git a/src/addressbook/libedata-book/e-data-book-cursor.c b/src/addressbook/libedata-book/e-data-book-cursor.c index 9b230c420..ee22b9ae3 100644 --- a/src/addressbook/libedata-book/e-data-book-cursor.c +++ b/src/addressbook/libedata-book/e-data-book-cursor.c @@ -222,10 +222,6 @@ /* Private D-Bus class. */ #include <e-dbus-address-book-cursor.h> -#define E_DATA_BOOK_CURSOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK_CURSOR, EDataBookCursorPrivate)) - /* GObjectClass */ static void e_data_book_cursor_constructed (GObject *object); static void e_data_book_cursor_dispose (GObject *object); @@ -288,7 +284,7 @@ enum { PROP_POSITION, }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( EDataBookCursor, e_data_book_cursor, G_TYPE_OBJECT); @@ -335,14 +331,12 @@ e_data_book_cursor_class_init (EDataBookCursorClass *class) "The current position of this cursor", 0, G_MAXINT, 0, G_PARAM_READABLE)); - - g_type_class_add_private (class, sizeof (EDataBookCursorPrivate)); } static void e_data_book_cursor_init (EDataBookCursor *cursor) { - cursor->priv = E_DATA_BOOK_CURSOR_GET_PRIVATE (cursor); + cursor->priv = e_data_book_cursor_get_instance_private (cursor); } static void diff --git a/src/addressbook/libedata-book/e-data-book-direct.c b/src/addressbook/libedata-book/e-data-book-direct.c index 776fb4fd3..cd70766d5 100644 --- a/src/addressbook/libedata-book/e-data-book-direct.c +++ b/src/addressbook/libedata-book/e-data-book-direct.c @@ -38,11 +38,6 @@ #include <e-dbus-direct-book.h> #include "e-data-book-direct.h" -#define E_DATA_BOOK_DIRECT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK_DIRECT, EDataBookDirectPrivate)) - -G_DEFINE_TYPE (EDataBookDirect, e_data_book_direct, G_TYPE_OBJECT); #define THRESHOLD_ITEMS 32 /* how many items can be hold in a cache, before propagated to UI */ #define THRESHOLD_SECONDS 2 /* how long to wait until notifications are propagated to UI; in seconds */ @@ -50,6 +45,8 @@ struct _EDataBookDirectPrivate { EDBusDirectBook *gdbus_object; }; +G_DEFINE_TYPE_WITH_PRIVATE (EDataBookDirect, e_data_book_direct, G_TYPE_OBJECT); + /* GObjectClass */ static void e_data_book_direct_dispose (GObject *object) @@ -68,7 +65,7 @@ e_data_book_direct_dispose (GObject *object) static void e_data_book_direct_init (EDataBookDirect *direct) { - direct->priv = E_DATA_BOOK_DIRECT_GET_PRIVATE (direct); + direct->priv = e_data_book_direct_get_instance_private (direct); direct->priv->gdbus_object = e_dbus_direct_book_skeleton_new (); } @@ -77,8 +74,6 @@ e_data_book_direct_class_init (EDataBookDirectClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - g_type_class_add_private (class, sizeof (EDataBookDirectPrivate)); - object_class->dispose = e_data_book_direct_dispose; } diff --git a/src/addressbook/libedata-book/e-data-book-factory.c b/src/addressbook/libedata-book/e-data-book-factory.c index 35850f2bb..f362f89df 100644 --- a/src/addressbook/libedata-book/e-data-book-factory.c +++ b/src/addressbook/libedata-book/e-data-book-factory.c @@ -43,10 +43,6 @@ #define d(x) -#define E_DATA_BOOK_FACTORY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryPrivate)) - struct _EDataBookFactoryPrivate { EDBusAddressBookFactory *dbus_factory; @@ -62,6 +58,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataBookFactory, e_data_book_factory, E_TYPE_DATA_FACTORY, + G_ADD_PRIVATE (EDataBookFactory) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_book_factory_initable_init)) @@ -313,8 +310,6 @@ e_data_book_factory_class_init (EDataBookFactoryClass *class) g_file_test (subprocess_book_path_env, G_FILE_TEST_IS_EXECUTABLE)) overwrite_subprocess_book_path = g_strdup (subprocess_book_path_env); - g_type_class_add_private (class, sizeof (EDataBookFactoryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = data_book_factory_constructed; object_class->dispose = data_book_factory_dispose; @@ -343,7 +338,7 @@ e_data_book_factory_initable_init (GInitableIface *iface) static void e_data_book_factory_init (EDataBookFactory *factory) { - factory->priv = E_DATA_BOOK_FACTORY_GET_PRIVATE (factory); + factory->priv = e_data_book_factory_get_instance_private (factory); factory->priv->dbus_factory = e_dbus_address_book_factory_skeleton_new (); diff --git a/src/addressbook/libedata-book/e-data-book-view.c b/src/addressbook/libedata-book/e-data-book-view.c index 3ab4ccd0a..965f99f7e 100644 --- a/src/addressbook/libedata-book/e-data-book-view.c +++ b/src/addressbook/libedata-book/e-data-book-view.c @@ -42,10 +42,6 @@ #include "e-dbus-address-book-view.h" -#define E_DATA_BOOK_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK_VIEW, EDataBookViewPrivate)) - /* how many items can be hold in a cache, before propagated to UI */ #define THRESHOLD_ITEMS 32 @@ -94,6 +90,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataBookView, e_data_book_view, G_TYPE_OBJECT, + G_ADD_PRIVATE (EDataBookView) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_book_view_initable_init)) @@ -501,7 +498,7 @@ data_book_view_dispose (GObject *object) { EDataBookViewPrivate *priv; - priv = E_DATA_BOOK_VIEW_GET_PRIVATE (object); + priv = E_DATA_BOOK_VIEW (object)->priv; g_mutex_lock (&priv->pending_mutex); @@ -527,7 +524,7 @@ data_book_view_finalize (GObject *object) { EDataBookViewPrivate *priv; - priv = E_DATA_BOOK_VIEW_GET_PRIVATE (object); + priv = E_DATA_BOOK_VIEW (object)->priv; g_free (priv->object_path); @@ -571,8 +568,6 @@ e_data_book_view_class_init (EDataBookViewClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDataBookViewPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = data_book_view_set_property; object_class->get_property = data_book_view_get_property; @@ -639,7 +634,7 @@ e_data_book_view_initable_init (GInitableIface *iface) static void e_data_book_view_init (EDataBookView *view) { - view->priv = E_DATA_BOOK_VIEW_GET_PRIVATE (view); + view->priv = e_data_book_view_get_instance_private (view); g_weak_ref_init (&view->priv->backend_weakref, NULL); diff --git a/src/addressbook/libedata-book/e-data-book.c b/src/addressbook/libedata-book/e-data-book.c index b7287aff0..825514229 100644 --- a/src/addressbook/libedata-book/e-data-book.c +++ b/src/addressbook/libedata-book/e-data-book.c @@ -44,10 +44,6 @@ #include "e-book-backend-sexp.h" #include "e-book-backend-factory.h" -#define E_DATA_BOOK_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_BOOK, EDataBookPrivate)) - typedef struct _AsyncContext AsyncContext; struct _EDataBookPrivate { @@ -85,6 +81,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataBook, e_data_book, G_TYPE_OBJECT, + G_ADD_PRIVATE (EDataBook) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_book_initable_init)) @@ -1675,7 +1672,7 @@ data_book_dispose (GObject *object) { EDataBookPrivate *priv; - priv = E_DATA_BOOK_GET_PRIVATE (object); + priv = E_DATA_BOOK (object)->priv; g_weak_ref_set (&priv->backend, NULL); @@ -1705,7 +1702,7 @@ data_book_finalize (GObject *object) { EDataBookPrivate *priv; - priv = E_DATA_BOOK_GET_PRIVATE (object); + priv = E_DATA_BOOK (object)->priv; g_free (priv->object_path); @@ -1846,8 +1843,6 @@ e_data_book_class_init (EDataBookClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDataBookPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = data_book_set_property; object_class->get_property = data_book_get_property; @@ -1905,7 +1900,7 @@ e_data_book_init (EDataBook *data_book) { EDBusAddressBook *dbus_interface; - data_book->priv = E_DATA_BOOK_GET_PRIVATE (data_book); + data_book->priv = e_data_book_get_instance_private (data_book); dbus_interface = e_dbus_address_book_skeleton_new (); data_book->priv->dbus_interface = dbus_interface; diff --git a/src/addressbook/libedata-book/e-subprocess-book-factory.c b/src/addressbook/libedata-book/e-subprocess-book-factory.c index 80b5ffedf..87597983f 100644 --- a/src/addressbook/libedata-book/e-subprocess-book-factory.c +++ b/src/addressbook/libedata-book/e-subprocess-book-factory.c @@ -35,10 +35,6 @@ #include <e-dbus-subprocess-backend.h> -#define E_SUBPROCESS_BOOK_FACTORY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SUBPROCESS_BOOK_FACTORY, ESubprocessBookFactoryPrivate)) - struct _ESubprocessBookFactoryPrivate { ESystemLocaleWatcher *locale_watcher; gulong notify_locale_id; @@ -52,6 +48,7 @@ G_DEFINE_TYPE_WITH_CODE ( ESubprocessBookFactory, e_subprocess_book_factory, E_TYPE_SUBPROCESS_FACTORY, + G_ADD_PRIVATE (ESubprocessBookFactory) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_subprocess_book_factory_initable_init)) @@ -204,8 +201,6 @@ e_subprocess_book_factory_class_init (ESubprocessBookFactoryClass *class) GObjectClass *object_class; ESubprocessFactoryClass *subprocess_factory_class; - g_type_class_add_private (class, sizeof (ESubprocessBookFactoryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = subprocess_book_factory_constructed; object_class->dispose = subprocess_book_factory_dispose; @@ -223,7 +218,7 @@ e_subprocess_book_factory_initable_init (GInitableIface *iface) static void e_subprocess_book_factory_init (ESubprocessBookFactory *subprocess_factory) { - subprocess_factory->priv = E_SUBPROCESS_BOOK_FACTORY_GET_PRIVATE (subprocess_factory); + subprocess_factory->priv = e_subprocess_book_factory_get_instance_private (subprocess_factory); } ESubprocessBookFactory * diff --git a/src/addressbook/libedata-book/e-system-locale-watcher.c b/src/addressbook/libedata-book/e-system-locale-watcher.c index c8f9b1fa8..99746be33 100644 --- a/src/addressbook/libedata-book/e-system-locale-watcher.c +++ b/src/addressbook/libedata-book/e-system-locale-watcher.c @@ -42,7 +42,7 @@ struct _ESystemLocaleWatcherPrivate { gchar *locale; }; -G_DEFINE_TYPE (ESystemLocaleWatcher, e_system_locale_watcher, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (ESystemLocaleWatcher, e_system_locale_watcher, G_TYPE_OBJECT) enum { PROP_0, @@ -280,8 +280,6 @@ e_system_locale_watcher_class_init (ESystemLocaleWatcherClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (ESystemLocaleWatcherPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->get_property = system_locale_watcher_get_property; object_class->constructed = system_locale_watcher_constructed; @@ -311,7 +309,7 @@ e_system_locale_watcher_class_init (ESystemLocaleWatcherClass *klass) static void e_system_locale_watcher_init (ESystemLocaleWatcher *watcher) { - watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_SYSTEM_LOCALE_WATCHER, ESystemLocaleWatcherPrivate); + watcher->priv = e_system_locale_watcher_get_instance_private (watcher); g_mutex_init (&watcher->priv->lock); diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c b/src/calendar/backends/caldav/e-cal-backend-caldav.c index 6628d60dd..4f6abe9fd 100644 --- a/src/calendar/backends/caldav/e-cal-backend-caldav.c +++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c @@ -57,7 +57,7 @@ struct _ECalBackendCalDAVPrivate { gboolean is_icloud; }; -G_DEFINE_TYPE (ECalBackendCalDAV, e_cal_backend_caldav, E_TYPE_CAL_META_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (ECalBackendCalDAV, e_cal_backend_caldav, E_TYPE_CAL_META_BACKEND) static EWebDAVSession * ecb_caldav_ref_session (ECalBackendCalDAV *cbdav) @@ -2240,7 +2240,7 @@ e_cal_backend_caldav_finalize (GObject *object) static void e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) { - cbdav->priv = G_TYPE_INSTANCE_GET_PRIVATE (cbdav, E_TYPE_CAL_BACKEND_CALDAV, ECalBackendCalDAVPrivate); + cbdav->priv = e_cal_backend_caldav_get_instance_private (cbdav); g_mutex_init (&cbdav->priv->webdav_lock); } @@ -2253,8 +2253,6 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *klass) ECalBackendSyncClass *cal_backend_sync_class; ECalMetaBackendClass *cal_meta_backend_class; - g_type_class_add_private (klass, sizeof (ECalBackendCalDAVPrivate)); - cal_meta_backend_class = E_CAL_META_BACKEND_CLASS (klass); cal_meta_backend_class->connect_sync = ecb_caldav_connect_sync; cal_meta_backend_class->disconnect_sync = ecb_caldav_disconnect_sync; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c index 93ea4e753..54552d939 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c @@ -32,18 +32,9 @@ #include <libebook/libebook.h> #include <libedataserver/libedataserver.h> -#define E_CAL_BACKEND_CONTACTS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND_CONTACTS, ECalBackendContactsPrivate)) - #define EC_ERROR(_code) e_client_error_create (_code, NULL) #define ECC_ERROR(_code) e_cal_client_error_create (_code, NULL) -G_DEFINE_TYPE ( - ECalBackendContacts, - e_cal_backend_contacts, - E_TYPE_CAL_BACKEND_SYNC) - typedef enum { CAL_DAYS, @@ -92,6 +83,11 @@ typedef struct _ContactRecord { ECalComponent *comp_birthday, *comp_anniversary; } ContactRecord; +G_DEFINE_TYPE_WITH_PRIVATE ( + ECalBackendContacts, + e_cal_backend_contacts, + E_TYPE_CAL_BACKEND_SYNC) + #define d(x) #define ANNIVERSARY_UID_EXT "-anniversary" @@ -1311,7 +1307,7 @@ e_cal_backend_contacts_finalize (GObject *object) { ECalBackendContactsPrivate *priv; - priv = E_CAL_BACKEND_CONTACTS_GET_PRIVATE (object); + priv = E_CAL_BACKEND_CONTACTS (object)->priv; if (priv->update_alarms_id) { g_source_remove (priv->update_alarms_id); @@ -1374,7 +1370,7 @@ e_cal_backend_contacts_constructed (GObject *object) static void e_cal_backend_contacts_init (ECalBackendContacts *cbc) { - cbc->priv = E_CAL_BACKEND_CONTACTS_GET_PRIVATE (cbc); + cbc->priv = e_cal_backend_contacts_get_instance_private (cbc); g_rec_mutex_init (&cbc->priv->rec_mutex); g_rec_mutex_init (&cbc->priv->tracked_contacts_lock); @@ -1424,8 +1420,6 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class) ECalBackendClass *backend_class; ECalBackendSyncClass *sync_class; - g_type_class_add_private (class, sizeof (ECalBackendContactsPrivate)); - object_class = (GObjectClass *) class; backend_class = (ECalBackendClass *) class; sync_class = (ECalBackendSyncClass *) class; diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c index 7acdd3378..0c89f2cef 100644 --- a/src/calendar/backends/file/e-cal-backend-file.c +++ b/src/calendar/backends/file/e-cal-backend-file.c @@ -38,10 +38,6 @@ #define O_BINARY 0 #endif -#define E_CAL_BACKEND_FILE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND_FILE, ECalBackendFilePrivate)) - #define EC_ERROR(_code) e_client_error_create (_code, NULL) #define EC_ERROR_EX(_code, _msg) e_client_error_create (_code, _msg) #define EC_ERROR_NO_URI() e_client_error_create (E_CLIENT_ERROR_OTHER_ERROR, _("Cannot get URI")) @@ -122,6 +118,7 @@ G_DEFINE_TYPE_WITH_CODE ( ECalBackendFile, e_cal_backend_file, E_TYPE_CAL_BACKEND_SYNC, + G_ADD_PRIVATE (ECalBackendFile) G_IMPLEMENT_INTERFACE ( E_TYPE_TIMEZONE_CACHE, e_cal_backend_file_timezone_cache_init)) @@ -344,7 +341,7 @@ e_cal_backend_file_finalize (GObject *object) { ECalBackendFilePrivate *priv; - priv = E_CAL_BACKEND_FILE_GET_PRIVATE (object); + priv = E_CAL_BACKEND_FILE (object)->priv; /* Clean up */ @@ -3765,7 +3762,7 @@ cal_backend_file_add_cached_timezone (ETimezoneCache *cache, const gchar *tzid; gboolean timezone_added = FALSE; - priv = E_CAL_BACKEND_FILE_GET_PRIVATE (cache); + priv = E_CAL_BACKEND_FILE (cache)->priv; g_rec_mutex_lock (&priv->idle_save_rmutex); @@ -3797,7 +3794,7 @@ cal_backend_file_get_cached_timezone (ETimezoneCache *cache, ECalBackendFilePrivate *priv; ICalTimezone *zone; - priv = E_CAL_BACKEND_FILE_GET_PRIVATE (cache); + priv = E_CAL_BACKEND_FILE (cache)->priv; g_rec_mutex_lock (&priv->idle_save_rmutex); zone = g_hash_table_lookup (priv->cached_timezones, tzid); @@ -3834,8 +3831,6 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class) ECalBackendClass *backend_class; ECalBackendSyncClass *sync_class; - g_type_class_add_private (class, sizeof (ECalBackendFilePrivate)); - object_class = (GObjectClass *) class; backend_class = (ECalBackendClass *) class; sync_class = (ECalBackendSyncClass *) class; @@ -3876,7 +3871,7 @@ e_cal_backend_file_timezone_cache_init (ETimezoneCacheInterface *iface) static void e_cal_backend_file_init (ECalBackendFile *cbfile) { - cbfile->priv = E_CAL_BACKEND_FILE_GET_PRIVATE (cbfile); + cbfile->priv = e_cal_backend_file_get_instance_private (cbfile); cbfile->priv->file_name = g_strdup ("calendar.ics"); diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c index 86dbff83c..cb48f8bae 100644 --- a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c +++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c @@ -48,7 +48,7 @@ struct _ECalBackendGTasksPrivate { gboolean bad_request_for_timed_query; }; -G_DEFINE_TYPE (ECalBackendGTasks, e_cal_backend_gtasks, E_TYPE_CAL_META_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (ECalBackendGTasks, e_cal_backend_gtasks, E_TYPE_CAL_META_BACKEND) static gboolean ecb_gtasks_check_data_version (ECalCache *cal_cache) @@ -1073,7 +1073,7 @@ ecb_gtasks_dup_component_revision (ECalCache *cal_cache, static void e_cal_backend_gtasks_init (ECalBackendGTasks *cbgtasks) { - cbgtasks->priv = G_TYPE_INSTANCE_GET_PRIVATE (cbgtasks, E_TYPE_CAL_BACKEND_GTASKS, ECalBackendGTasksPrivate); + cbgtasks->priv = e_cal_backend_gtasks_get_instance_private (cbgtasks); cbgtasks->priv->preloaded = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); cbgtasks->priv->bad_request_for_timed_query = FALSE; @@ -1138,8 +1138,6 @@ e_cal_backend_gtasks_class_init (ECalBackendGTasksClass *klass) ECalBackendClass *cal_backend_class; ECalMetaBackendClass *cal_meta_backend_class; - g_type_class_add_private (klass, sizeof (ECalBackendGTasksPrivate)); - cal_meta_backend_class = E_CAL_META_BACKEND_CLASS (klass); cal_meta_backend_class->connect_sync = ecb_gtasks_connect_sync; cal_meta_backend_class->disconnect_sync = ecb_gtasks_disconnect_sync; diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c index 0383ff58b..85622c67d 100644 --- a/src/calendar/backends/http/e-cal-backend-http.c +++ b/src/calendar/backends/http/e-cal-backend-http.c @@ -33,8 +33,6 @@ #define EC_ERROR_EX(_code, _msg) e_client_error_create (_code, _msg) #define ECC_ERROR(_code) e_cal_client_error_create (_code, NULL) -G_DEFINE_TYPE (ECalBackendHttp, e_cal_backend_http, E_TYPE_CAL_META_BACKEND) - struct _ECalBackendHttpPrivate { ESoupSession *session; @@ -44,6 +42,8 @@ struct _ECalBackendHttpPrivate { GHashTable *components; /* gchar *uid ~> ICalComponent * */ }; +G_DEFINE_TYPE_WITH_PRIVATE (ECalBackendHttp, e_cal_backend_http, E_TYPE_CAL_META_BACKEND) + static gchar * ecb_http_webcal_to_http_method (const gchar *webcal_str, gboolean secure) @@ -657,7 +657,7 @@ e_cal_backend_http_finalize (GObject *object) static void e_cal_backend_http_init (ECalBackendHttp *cbhttp) { - cbhttp->priv = G_TYPE_INSTANCE_GET_PRIVATE (cbhttp, E_TYPE_CAL_BACKEND_HTTP, ECalBackendHttpPrivate); + cbhttp->priv = e_cal_backend_http_get_instance_private (cbhttp); g_rec_mutex_init (&cbhttp->priv->conn_lock); @@ -671,8 +671,6 @@ e_cal_backend_http_class_init (ECalBackendHttpClass *klass) ECalBackendSyncClass *cal_backend_sync_class; ECalMetaBackendClass *cal_meta_backend_class; - g_type_class_add_private (klass, sizeof (ECalBackendHttpPrivate)); - cal_meta_backend_class = E_CAL_META_BACKEND_CLASS (klass); cal_meta_backend_class->connect_sync = ecb_http_connect_sync; cal_meta_backend_class->disconnect_sync = ecb_http_disconnect_sync; diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c b/src/calendar/backends/weather/e-cal-backend-weather.c index 8c4208db9..0470e3f4c 100644 --- a/src/calendar/backends/weather/e-cal-backend-weather.c +++ b/src/calendar/backends/weather/e-cal-backend-weather.c @@ -29,16 +29,10 @@ #define WEATHER_UID_EXT "-weather" -#define E_CAL_BACKEND_WEATHER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND_WEATHER, ECalBackendWeatherPrivate)) - #define EC_ERROR(_code) e_client_error_create (_code, NULL) #define EC_ERROR_EX(_code, _msg) e_client_error_create (_code, _msg) #define ECC_ERROR(_code) e_cal_client_error_create (_code, NULL) -G_DEFINE_TYPE (ECalBackendWeather, e_cal_backend_weather, E_TYPE_CAL_BACKEND_SYNC) - static gboolean reload_cb (gpointer user_data); static gboolean begin_retrieval_cb (ECalBackendWeather *cbw); static ECalComponent * @@ -78,6 +72,8 @@ struct _ECalBackendWeatherPrivate { gchar *last_used_location; }; +G_DEFINE_TYPE_WITH_PRIVATE (ECalBackendWeather, e_cal_backend_weather, E_TYPE_CAL_BACKEND_SYNC) + static gboolean reload_cb (gpointer user_data) { @@ -1005,7 +1001,7 @@ e_cal_backend_weather_dispose (GObject *object) { ECalBackendWeatherPrivate *priv; - priv = E_CAL_BACKEND_WEATHER_GET_PRIVATE (object); + priv = E_CAL_BACKEND_WEATHER (object)->priv; if (priv->reload_timeout_id) { g_source_remove (priv->reload_timeout_id); @@ -1039,7 +1035,7 @@ e_cal_backend_weather_finalize (GObject *object) { ECalBackendWeatherPrivate *priv; - priv = E_CAL_BACKEND_WEATHER_GET_PRIVATE (object); + priv = E_CAL_BACKEND_WEATHER (object)->priv; g_clear_object (&priv->cache); g_mutex_clear (&priv->last_used_mutex); @@ -1052,7 +1048,7 @@ e_cal_backend_weather_finalize (GObject *object) static void e_cal_backend_weather_init (ECalBackendWeather *cbw) { - cbw->priv = E_CAL_BACKEND_WEATHER_GET_PRIVATE (cbw); + cbw->priv = e_cal_backend_weather_get_instance_private (cbw); g_mutex_init (&cbw->priv->last_used_mutex); @@ -1069,8 +1065,6 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class) ECalBackendClass *backend_class; ECalBackendSyncClass *sync_class; - g_type_class_add_private (class, sizeof (ECalBackendWeatherPrivate)); - object_class = (GObjectClass *) class; backend_class = (ECalBackendClass *) class; sync_class = (ECalBackendSyncClass *) class; diff --git a/src/calendar/backends/weather/e-weather-source.c b/src/calendar/backends/weather/e-weather-source.c index 8aada0196..9ab74faa0 100644 --- a/src/calendar/backends/weather/e-weather-source.c +++ b/src/calendar/backends/weather/e-weather-source.c @@ -23,10 +23,6 @@ #include "e-weather-source.h" -#define E_WEATHER_SOURCE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_WEATHER_SOURCE, EWeatherSourcePrivate)) - struct _EWeatherSourcePrivate { GWeatherLocation *location; GWeatherInfo *info; @@ -35,14 +31,14 @@ struct _EWeatherSourcePrivate { gpointer finished_data; }; -G_DEFINE_TYPE (EWeatherSource, e_weather_source, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EWeatherSource, e_weather_source, G_TYPE_OBJECT) static void weather_source_dispose (GObject *object) { EWeatherSourcePrivate *priv; - priv = E_WEATHER_SOURCE_GET_PRIVATE (object); + priv = E_WEATHER_SOURCE (object)->priv; if (priv->location != NULL) { gweather_location_unref (priv->location); @@ -60,8 +56,6 @@ e_weather_source_class_init (EWeatherSourceClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EWeatherSourcePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = weather_source_dispose; } @@ -69,7 +63,7 @@ e_weather_source_class_init (EWeatherSourceClass *class) static void e_weather_source_init (EWeatherSource *source) { - source->priv = E_WEATHER_SOURCE_GET_PRIVATE (source); + source->priv = e_weather_source_get_instance_private (source); } static GWeatherLocation * diff --git a/src/calendar/libecal/e-cal-client-view.c b/src/calendar/libecal/e-cal-client-view.c index 9da88897f..23b2860b8 100644 --- a/src/calendar/libecal/e-cal-client-view.c +++ b/src/calendar/libecal/e-cal-client-view.c @@ -40,10 +40,6 @@ #include "e-dbus-calendar-view.h" -#define E_CAL_CLIENT_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_CLIENT_VIEW, ECalClientViewPrivate)) - typedef struct _SignalClosure SignalClosure; struct _ECalClientViewPrivate { @@ -97,6 +93,7 @@ G_DEFINE_TYPE_WITH_CODE ( ECalClientView, e_cal_client_view, G_TYPE_OBJECT, + G_ADD_PRIVATE (ECalClientView) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_cal_client_view_initable_init)) @@ -597,7 +594,7 @@ cal_client_view_dispose (GObject *object) { ECalClientViewPrivate *priv; - priv = E_CAL_CLIENT_VIEW_GET_PRIVATE (object); + priv = E_CAL_CLIENT_VIEW (object)->priv; g_clear_object (&priv->client); @@ -646,7 +643,7 @@ cal_client_view_finalize (GObject *object) { ECalClientViewPrivate *priv; - priv = E_CAL_CLIENT_VIEW_GET_PRIVATE (object); + priv = E_CAL_CLIENT_VIEW (object)->priv; g_free (priv->object_path); @@ -668,7 +665,7 @@ cal_client_view_initable_init (GInitable *initable, gulong handler_id; gchar *bus_name; - priv = E_CAL_CLIENT_VIEW_GET_PRIVATE (initable); + priv = E_CAL_CLIENT_VIEW (initable)->priv; cal_client = priv->client ? g_object_ref (priv->client) : NULL; if (cal_client == NULL) { @@ -740,8 +737,6 @@ e_cal_client_view_class_init (ECalClientViewClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ECalClientViewPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = cal_client_view_set_property; object_class->get_property = cal_client_view_get_property; @@ -875,7 +870,7 @@ e_cal_client_view_initable_init (GInitableIface *iface) static void e_cal_client_view_init (ECalClientView *client_view) { - client_view->priv = E_CAL_CLIENT_VIEW_GET_PRIVATE (client_view); + client_view->priv = e_cal_client_view_get_instance_private (client_view); g_mutex_init (&client_view->priv->main_context_lock); client_view->priv->client = NULL; diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c index 4cf3b14ba..2e359ec60 100644 --- a/src/calendar/libecal/e-cal-client.c +++ b/src/calendar/libecal/e-cal-client.c @@ -45,10 +45,6 @@ #include "e-cal-enums.h" #include "e-timezone-cache.h" -#define E_CAL_CLIENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_CLIENT, ECalClientPrivate)) - /* Set this to a sufficiently large value * to cover most long-running operations. */ #define DBUS_PROXY_TIMEOUT_MS (3 * 60 * 1000) /* 3 minutes */ @@ -138,6 +134,7 @@ G_DEFINE_TYPE_WITH_CODE ( ECalClient, e_cal_client, E_TYPE_CLIENT, + G_ADD_PRIVATE (ECalClient) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_cal_client_initable_init) @@ -866,7 +863,7 @@ cal_client_dispose (GObject *object) { ECalClientPrivate *priv; - priv = E_CAL_CLIENT_GET_PRIVATE (object); + priv = E_CAL_CLIENT (object)->priv; if (priv->dbus_proxy_error_handler_id > 0) { g_signal_handler_disconnect ( @@ -908,7 +905,7 @@ cal_client_finalize (GObject *object) { ECalClientPrivate *priv; - priv = E_CAL_CLIENT_GET_PRIVATE (object); + priv = E_CAL_CLIENT (object)->priv; if (priv->name_watcher_id > 0) g_bus_unwatch_name (priv->name_watcher_id); @@ -991,7 +988,7 @@ cal_client_get_dbus_proxy (EClient *client) { ECalClientPrivate *priv; - priv = E_CAL_CLIENT_GET_PRIVATE (client); + priv = E_CAL_CLIENT (client)->priv; return G_DBUS_PROXY (priv->dbus_proxy); } @@ -1191,7 +1188,7 @@ cal_client_init_in_dbus_thread (GSimpleAsyncResult *simple, gulong handler_id; GError *local_error = NULL; - priv = E_CAL_CLIENT_GET_PRIVATE (source_object); + priv = E_CAL_CLIENT (source_object)->priv; client = E_CLIENT (source_object); source = e_client_get_source (client); @@ -1404,7 +1401,7 @@ cal_client_add_cached_timezone (ETimezoneCache *cache, ECalClientPrivate *priv; const gchar *tzid; - priv = E_CAL_CLIENT_GET_PRIVATE (cache); + priv = E_CAL_CLIENT (cache)->priv; /* XXX Apparently this function can sometimes return NULL. * I'm not sure when or why that happens, but we can't @@ -1465,7 +1462,7 @@ cal_client_get_cached_timezone (ETimezoneCache *cache, ICalProperty *prop; const gchar *builtin_tzid; - priv = E_CAL_CLIENT_GET_PRIVATE (cache); + priv = E_CAL_CLIENT (cache)->priv; if (g_str_equal (tzid, "UTC")) return i_cal_timezone_get_utc_timezone (); @@ -1534,7 +1531,7 @@ cal_client_list_cached_timezones (ETimezoneCache *cache) ECalClientPrivate *priv; GList *list; - priv = E_CAL_CLIENT_GET_PRIVATE (cache); + priv = E_CAL_CLIENT (cache)->priv; g_mutex_lock (&priv->zone_cache_lock); @@ -1551,8 +1548,6 @@ e_cal_client_class_init (ECalClientClass *class) GObjectClass *object_class; EClientClass *client_class; - g_type_class_add_private (class, sizeof (ECalClientPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = cal_client_set_property; object_class->get_property = cal_client_get_property; @@ -1630,7 +1625,7 @@ e_cal_client_init (ECalClient *client) zone_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - client->priv = E_CAL_CLIENT_GET_PRIVATE (client); + client->priv = e_cal_client_get_instance_private (client); client->priv->source_type = E_CAL_CLIENT_SOURCE_TYPE_LAST; client->priv->default_zone = i_cal_timezone_get_utc_timezone (); g_mutex_init (&client->priv->zone_cache_lock); @@ -1816,7 +1811,7 @@ cal_client_connect_init_cb (GObject *source_object, source_object = g_async_result_get_source_object (result); closure = g_simple_async_result_get_op_res_gpointer (simple); - priv = E_CAL_CLIENT_GET_PRIVATE (source_object); + priv = E_CAL_CLIENT (source_object)->priv; e_dbus_calendar_call_open ( priv->dbus_proxy, diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c index baf5ddaff..edff43f94 100644 --- a/src/calendar/libecal/e-cal-component.c +++ b/src/calendar/libecal/e-cal-component.c @@ -45,8 +45,6 @@ #define getppid() 0 #endif -G_DEFINE_TYPE (ECalComponent, e_cal_component, G_TYPE_OBJECT) - struct _ECalComponentPrivate { /* The icalcomponent we wrap */ ICalComponent *icalcomp; @@ -57,6 +55,8 @@ struct _ECalComponentPrivate { guint need_sequence_inc : 1; }; +G_DEFINE_TYPE_WITH_PRIVATE (ECalComponent, e_cal_component, G_TYPE_OBJECT) + /* Frees the internal icalcomponent only if it does not have a parent. If it * does, it means we don't own it and we shouldn't free it. */ @@ -248,8 +248,6 @@ e_cal_component_class_init (ECalComponentClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ECalComponentPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = cal_component_finalize; } @@ -258,7 +256,7 @@ e_cal_component_class_init (ECalComponentClass *class) static void e_cal_component_init (ECalComponent *comp) { - comp->priv = G_TYPE_INSTANCE_GET_PRIVATE (comp, E_TYPE_CAL_COMPONENT, ECalComponentPrivate); + comp->priv = e_cal_component_get_instance_private (comp); comp->priv->icalcomp = NULL; } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c index 919d297f4..3075e46c8 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c @@ -95,7 +95,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE (EReminderWatcher, e_reminder_watcher, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EReminderWatcher, e_reminder_watcher, G_TYPE_OBJECT) G_DEFINE_BOXED_TYPE (EReminderData, e_reminder_data, e_reminder_data_copy, e_reminder_data_free) @@ -2188,8 +2188,6 @@ e_reminder_watcher_class_init (EReminderWatcherClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (EReminderWatcherPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->set_property = e_reminder_watcher_set_property; object_class->get_property = e_reminder_watcher_get_property; @@ -2351,7 +2349,7 @@ e_reminder_watcher_init (EReminderWatcher *watcher) if (!zone) zone = i_cal_timezone_get_utc_timezone (); - watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); + watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); diff --git a/src/calendar/libedata-cal/e-cal-backend-intervaltree.c b/src/calendar/libedata-cal/e-cal-backend-intervaltree.c index 2a5b16fa7..d7849d3c2 100644 --- a/src/calendar/libedata-cal/e-cal-backend-intervaltree.c +++ b/src/calendar/libedata-cal/e-cal-backend-intervaltree.c @@ -43,12 +43,6 @@ #define DIRECTION_GO_LEFT 0 #define DIRECTION_GO_RIGHT 1 -G_DEFINE_TYPE (EIntervalTree, e_intervaltree, G_TYPE_OBJECT) - -#define E_INTERVALTREE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_INTERVALTREE, EIntervalTreePrivate)) - typedef struct _EIntervalNode EIntervalNode; static EIntervalNode * @@ -82,6 +76,8 @@ struct _EIntervalTreePrivate { GRecMutex mutex; }; +G_DEFINE_TYPE_WITH_PRIVATE (EIntervalTree, e_intervaltree, G_TYPE_OBJECT) + static inline gint get_direction (EIntervalNode *x, time_t z_start, @@ -412,7 +408,7 @@ intervaltree_finalize (GObject *object) { EIntervalTreePrivate *priv; - priv = E_INTERVALTREE_GET_PRIVATE (object); + priv = E_INTERVALTREE (object)->priv; g_free (priv->root); g_free (priv->nil); @@ -431,8 +427,6 @@ e_intervaltree_class_init (EIntervalTreeClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EIntervalTreePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = intervaltree_finalize; } @@ -442,7 +436,7 @@ e_intervaltree_init (EIntervalTree *tree) { EIntervalNode *root, *nil; - tree->priv = E_INTERVALTREE_GET_PRIVATE (tree); + tree->priv = e_intervaltree_get_instance_private (tree); tree->priv->nil = nil = g_new (EIntervalNode, 1); nil->parent = nil->left = nil->right = nil; diff --git a/src/calendar/libedata-cal/e-cal-backend-sexp.c b/src/calendar/libedata-cal/e-cal-backend-sexp.c index 5ce1e11c6..20aa13e64 100644 --- a/src/calendar/libedata-cal/e-cal-backend-sexp.c +++ b/src/calendar/libedata-cal/e-cal-backend-sexp.c @@ -31,12 +31,6 @@ #include "e-cal-backend-sexp.h" -#define E_CAL_BACKEND_SEXP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND_SEXP, ECalBackendSExpPrivate)) - -G_DEFINE_TYPE (ECalBackendSExp, e_cal_backend_sexp, G_TYPE_OBJECT) - typedef struct _SearchContext SearchContext; struct _ECalBackendSExpPrivate { @@ -57,6 +51,8 @@ struct _SearchContext { time_t expr_range_end; }; +G_DEFINE_TYPE_WITH_PRIVATE (ECalBackendSExp, e_cal_backend_sexp, G_TYPE_OBJECT) + static ESExpResult *func_is_completed (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data); /* (uid? UID) @@ -1148,7 +1144,7 @@ cal_backend_sexp_finalize (GObject *object) { ECalBackendSExpPrivate *priv; - priv = E_CAL_BACKEND_SEXP_GET_PRIVATE (object); + priv = E_CAL_BACKEND_SEXP (object)->priv; g_object_unref (priv->search_sexp); g_free (priv->text); @@ -1164,8 +1160,6 @@ e_cal_backend_sexp_class_init (ECalBackendSExpClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ECalBackendSExpPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = cal_backend_sexp_finalize; } @@ -1173,7 +1167,7 @@ e_cal_backend_sexp_class_init (ECalBackendSExpClass *class) static void e_cal_backend_sexp_init (ECalBackendSExp *sexp) { - sexp->priv = E_CAL_BACKEND_SEXP_GET_PRIVATE (sexp); + sexp->priv = e_cal_backend_sexp_get_instance_private (sexp); sexp->priv->search_context = g_new (SearchContext, 1); g_rec_mutex_init (&sexp->priv->search_context_lock); diff --git a/src/calendar/libedata-cal/e-cal-backend-sync.c b/src/calendar/libedata-cal/e-cal-backend-sync.c index d35e24b33..05d2846a9 100644 --- a/src/calendar/libedata-cal/e-cal-backend-sync.c +++ b/src/calendar/libedata-cal/e-cal-backend-sync.c @@ -33,10 +33,6 @@ #include "e-cal-backend-sync.h" -#define E_CAL_BACKEND_SYNC_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND_SYNC, ECalBackendSyncPrivate)) - G_DEFINE_TYPE (ECalBackendSync, e_cal_backend_sync, E_TYPE_CAL_BACKEND) /** diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c index 4fc950c3e..ec543e0f5 100644 --- a/src/calendar/libedata-cal/e-cal-backend.c +++ b/src/calendar/libedata-cal/e-cal-backend.c @@ -30,10 +30,6 @@ #include "e-cal-backend.h" -#define E_CAL_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CAL_BACKEND, ECalBackendPrivate)) - typedef struct _AsyncContext AsyncContext; typedef struct _DispatchNode DispatchNode; typedef struct _SignalClosure SignalClosure; @@ -140,6 +136,7 @@ G_DEFINE_TYPE_WITH_CODE ( ECalBackend, e_cal_backend, E_TYPE_BACKEND, + G_ADD_PRIVATE (ECalBackend) G_IMPLEMENT_INTERFACE ( E_TYPE_TIMEZONE_CACHE, e_cal_backend_timezone_cache_init)) @@ -635,7 +632,7 @@ cal_backend_dispose (GObject *object) { ECalBackendPrivate *priv; - priv = E_CAL_BACKEND_GET_PRIVATE (object); + priv = E_CAL_BACKEND (object)->priv; if (priv->auth_source_changed_handler_id > 0) { g_signal_handler_disconnect ( @@ -670,7 +667,7 @@ cal_backend_finalize (GObject *object) { ECalBackendPrivate *priv; - priv = E_CAL_BACKEND_GET_PRIVATE (object); + priv = E_CAL_BACKEND (object)->priv; g_mutex_clear (&priv->views_mutex); g_mutex_clear (&priv->property_lock); @@ -798,7 +795,7 @@ cal_backend_add_cached_timezone (ETimezoneCache *cache, ECalBackendPrivate *priv; const gchar *tzid; - priv = E_CAL_BACKEND_GET_PRIVATE (cache); + priv = E_CAL_BACKEND (cache)->priv; /* XXX Apparently this function can sometimes return NULL. * I'm not sure when or why that happens, but we can't @@ -859,7 +856,7 @@ cal_backend_get_cached_timezone (ETimezoneCache *cache, ICalProperty *prop; const gchar *builtin_tzid; - priv = E_CAL_BACKEND_GET_PRIVATE (cache); + priv = E_CAL_BACKEND (cache)->priv; if (g_str_equal (tzid, "UTC")) return i_cal_timezone_get_utc_timezone (); @@ -926,7 +923,7 @@ cal_backend_list_cached_timezones (ETimezoneCache *cache) ECalBackendPrivate *priv; GList *list; - priv = E_CAL_BACKEND_GET_PRIVATE (cache); + priv = E_CAL_BACKEND (cache)->priv; g_mutex_lock (&priv->zone_cache_lock); @@ -943,8 +940,6 @@ e_cal_backend_class_init (ECalBackendClass *class) GObjectClass *object_class; EBackendClass *backend_class; - g_type_class_add_private (class, sizeof (ECalBackendPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = cal_backend_set_property; object_class->get_property = cal_backend_get_property; @@ -1077,7 +1072,7 @@ e_cal_backend_init (ECalBackend *backend) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - backend->priv = E_CAL_BACKEND_GET_PRIVATE (backend); + backend->priv = e_cal_backend_get_instance_private (backend); g_mutex_init (&backend->priv->views_mutex); g_mutex_init (&backend->priv->property_lock); diff --git a/src/calendar/libedata-cal/e-cal-cache.c b/src/calendar/libedata-cal/e-cal-cache.c index d853294f3..b2f95ebf3 100644 --- a/src/calendar/libedata-cal/e-cal-cache.c +++ b/src/calendar/libedata-cal/e-cal-cache.c @@ -93,6 +93,7 @@ void _e_cal_cache_remove_loaded_timezones (ECalCache *cal_cache); static void ecc_timezone_cache_init (ETimezoneCacheInterface *iface); G_DEFINE_TYPE_WITH_CODE (ECalCache, e_cal_cache, E_TYPE_CACHE, + G_ADD_PRIVATE (ECalCache) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) G_IMPLEMENT_INTERFACE (E_TYPE_TIMEZONE_CACHE, ecc_timezone_cache_init)) @@ -4508,8 +4509,6 @@ e_cal_cache_class_init (ECalCacheClass *klass) GObjectClass *object_class; ECacheClass *cache_class; - g_type_class_add_private (klass, sizeof (ECalCachePrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->finalize = e_cal_cache_finalize; @@ -4572,7 +4571,7 @@ ecc_timezone_cache_init (ETimezoneCacheInterface *iface) static void e_cal_cache_init (ECalCache *cal_cache) { - cal_cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_cache, E_TYPE_CAL_CACHE, ECalCachePrivate); + cal_cache->priv = e_cal_cache_get_instance_private (cal_cache); cal_cache->priv->loaded_timezones = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, cal_cache_free_zone); cal_cache->priv->modified_timezones = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, cal_cache_free_zone); diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c index 68c57ecaa..acf9d87af 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -112,6 +112,7 @@ static GList * (* ecmb_timezone_cache_parent_list_timezones) (ETimezoneCache *c static void e_cal_meta_backend_timezone_cache_init (ETimezoneCacheInterface *iface); G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ECalMetaBackend, e_cal_meta_backend, E_TYPE_CAL_BACKEND_SYNC, + G_ADD_PRIVATE (ECalMetaBackend) G_IMPLEMENT_INTERFACE (E_TYPE_TIMEZONE_CACHE, e_cal_meta_backend_timezone_cache_init)) G_DEFINE_BOXED_TYPE (ECalMetaBackendInfo, e_cal_meta_backend_info, e_cal_meta_backend_info_copy, e_cal_meta_backend_info_free) @@ -3391,8 +3392,6 @@ e_cal_meta_backend_class_init (ECalMetaBackendClass *klass) ECalBackendClass *cal_backend_class; ECalBackendSyncClass *cal_backend_sync_class; - g_type_class_add_private (klass, sizeof (ECalMetaBackendPrivate)); - klass->get_changes_sync = ecmb_get_changes_sync; klass->search_sync = ecmb_search_sync; klass->search_components_sync = ecmb_search_components_sync; @@ -3478,7 +3477,7 @@ e_cal_meta_backend_class_init (ECalMetaBackendClass *klass) static void e_cal_meta_backend_init (ECalMetaBackend *meta_backend) { - meta_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (meta_backend, E_TYPE_CAL_META_BACKEND, ECalMetaBackendPrivate); + meta_backend->priv = e_cal_meta_backend_get_instance_private (meta_backend); g_mutex_init (&meta_backend->priv->connect_lock); g_mutex_init (&meta_backend->priv->property_lock); diff --git a/src/calendar/libedata-cal/e-data-cal-factory.c b/src/calendar/libedata-cal/e-data-cal-factory.c index efb0d745d..575723007 100644 --- a/src/calendar/libedata-cal/e-data-cal-factory.c +++ b/src/calendar/libedata-cal/e-data-cal-factory.c @@ -51,10 +51,6 @@ #define d(x) -#define E_DATA_CAL_FACTORY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_CAL_FACTORY, EDataCalFactoryPrivate)) - struct _EDataCalFactoryPrivate { EDBusCalendarFactory *dbus_factory; }; @@ -69,6 +65,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataCalFactory, e_data_cal_factory, E_TYPE_DATA_FACTORY, + G_ADD_PRIVATE (EDataCalFactory) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_cal_factory_initable_init)) @@ -272,8 +269,6 @@ e_data_cal_factory_class_init (EDataCalFactoryClass *class) g_file_test (subprocess_cal_path_env, G_FILE_TEST_IS_EXECUTABLE)) overwrite_subprocess_cal_path = g_strdup (subprocess_cal_path_env); - g_type_class_add_private (class, sizeof (EDataCalFactoryPrivate)); - dbus_server_class = E_DBUS_SERVER_CLASS (class); dbus_server_class->bus_name = CALENDAR_DBUS_SERVICE_NAME; dbus_server_class->module_directory = modules_directory; @@ -338,7 +333,7 @@ data_cal_factory_handle_open_memo_list_cb (EDBusCalendarFactory *dbus_interface, static void e_data_cal_factory_init (EDataCalFactory *factory) { - factory->priv = E_DATA_CAL_FACTORY_GET_PRIVATE (factory); + factory->priv = e_data_cal_factory_get_instance_private (factory); factory->priv->dbus_factory = e_dbus_calendar_factory_skeleton_new (); diff --git a/src/calendar/libedata-cal/e-data-cal-view.c b/src/calendar/libedata-cal/e-data-cal-view.c index 6452b5d31..93bd68308 100644 --- a/src/calendar/libedata-cal/e-data-cal-view.c +++ b/src/calendar/libedata-cal/e-data-cal-view.c @@ -41,10 +41,6 @@ #include "e-data-cal-view.h" #include "e-dbus-calendar-view.h" -#define E_DATA_CAL_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_CAL_VIEW, EDataCalViewPrivate)) - /* how many items can be hold in a cache, before propagated to UI */ #define THRESHOLD_ITEMS 32 @@ -97,6 +93,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataCalView, e_data_cal_view, G_TYPE_OBJECT, + G_ADD_PRIVATE (EDataCalView) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_cal_view_initable_init)) @@ -438,7 +435,7 @@ data_cal_view_dispose (GObject *object) { EDataCalViewPrivate *priv; - priv = E_DATA_CAL_VIEW_GET_PRIVATE (object); + priv = E_DATA_CAL_VIEW (object)->priv; g_mutex_lock (&priv->pending_mutex); @@ -464,7 +461,7 @@ data_cal_view_finalize (GObject *object) { EDataCalViewPrivate *priv; - priv = E_DATA_CAL_VIEW_GET_PRIVATE (object); + priv = E_DATA_CAL_VIEW (object)->priv; g_free (priv->object_path); @@ -509,8 +506,6 @@ e_data_cal_view_class_init (EDataCalViewClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDataCalViewPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = data_cal_view_set_property; object_class->get_property = data_cal_view_get_property; @@ -577,7 +572,7 @@ e_data_cal_view_initable_init (GInitableIface *iface) static void e_data_cal_view_init (EDataCalView *view) { - view->priv = E_DATA_CAL_VIEW_GET_PRIVATE (view); + view->priv = e_data_cal_view_get_instance_private (view); view->priv->flags = E_CAL_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL; diff --git a/src/calendar/libedata-cal/e-data-cal.c b/src/calendar/libedata-cal/e-data-cal.c index 2459bb66c..c68e135b6 100644 --- a/src/calendar/libedata-cal/e-data-cal.c +++ b/src/calendar/libedata-cal/e-data-cal.c @@ -38,10 +38,6 @@ #include "e-cal-backend.h" #include "e-cal-backend-sexp.h" -#define E_DATA_CAL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_CAL, EDataCalPrivate)) - typedef struct _AsyncContext AsyncContext; struct _EDataCalPrivate { @@ -76,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataCal, e_data_cal, G_TYPE_OBJECT, + G_ADD_PRIVATE (EDataCal) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_cal_initable_init)) @@ -2284,7 +2281,7 @@ data_cal_dispose (GObject *object) { EDataCalPrivate *priv; - priv = E_DATA_CAL_GET_PRIVATE (object); + priv = E_DATA_CAL (object)->priv; g_weak_ref_set (&priv->backend, NULL); @@ -2304,7 +2301,7 @@ data_cal_finalize (GObject *object) { EDataCalPrivate *priv; - priv = E_DATA_CAL_GET_PRIVATE (object); + priv = E_DATA_CAL (object)->priv; g_free (priv->object_path); @@ -2409,8 +2406,6 @@ e_data_cal_class_init (EDataCalClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDataCalPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = data_cal_set_property; object_class->get_property = data_cal_get_property; @@ -2468,7 +2463,7 @@ e_data_cal_init (EDataCal *data_cal) { EDBusCalendar *dbus_interface; - data_cal->priv = E_DATA_CAL_GET_PRIVATE (data_cal); + data_cal->priv = e_data_cal_get_instance_private (data_cal); dbus_interface = e_dbus_calendar_skeleton_new (); data_cal->priv->dbus_interface = dbus_interface; diff --git a/src/camel/camel-address.c b/src/camel/camel-address.c index 9aadff7ca..4d6847518 100644 --- a/src/camel/camel-address.c +++ b/src/camel/camel-address.c @@ -22,18 +22,17 @@ struct _CamelAddressPrivate { guint dummy; }; -G_DEFINE_TYPE (CamelAddress, camel_address, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelAddress, camel_address, G_TYPE_OBJECT) static void camel_address_class_init (CamelAddressClass *class) { - g_type_class_add_private (class, sizeof (CamelAddressPrivate)); } static void camel_address_init (CamelAddress *address) { - address->priv = G_TYPE_INSTANCE_GET_PRIVATE (address, CAMEL_TYPE_ADDRESS, CamelAddressPrivate); + address->priv = camel_address_get_instance_private (address); } /** diff --git a/src/camel/camel-block-file.c b/src/camel/camel-block-file.c index 765d1789d..07d96a805 100644 --- a/src/camel/camel-block-file.c +++ b/src/camel/camel-block-file.c @@ -81,7 +81,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, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelBlockFile, camel_block_file, G_TYPE_OBJECT) static gint block_file_validate_root (CamelBlockFile *bs) @@ -198,8 +198,6 @@ camel_block_file_class_init (CamelBlockFileClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelBlockFilePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = block_file_finalize; @@ -216,7 +214,7 @@ block_hash_func (gconstpointer v) static void camel_block_file_init (CamelBlockFile *bs) { - bs->priv = G_TYPE_INSTANCE_GET_PRIVATE (bs, CAMEL_TYPE_BLOCK_FILE, CamelBlockFilePrivate); + bs->priv = camel_block_file_get_instance_private (bs); bs->priv->fd = -1; bs->priv->block_size = CAMEL_BLOCK_SIZE; @@ -958,7 +956,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, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelKeyFile, camel_key_file, G_TYPE_OBJECT) static void key_file_finalize (GObject *object) @@ -993,8 +991,6 @@ camel_key_file_class_init (CamelKeyFileClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelKeyFilePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = key_file_finalize; } @@ -1002,7 +998,7 @@ camel_key_file_class_init (CamelKeyFileClass *class) static void camel_key_file_init (CamelKeyFile *kf) { - kf->priv = G_TYPE_INSTANCE_GET_PRIVATE (kf, CAMEL_TYPE_KEY_FILE, CamelKeyFilePrivate); + kf->priv = camel_key_file_get_instance_private (kf); kf->priv->base = kf; g_mutex_init (&kf->priv->lock); diff --git a/src/camel/camel-certdb.c b/src/camel/camel-certdb.c index 4e240f186..8079b671d 100644 --- a/src/camel/camel-certdb.c +++ b/src/camel/camel-certdb.c @@ -35,10 +35,6 @@ #define CAMEL_CERTDB_VERSION 0x100 -#define CAMEL_CERTDB_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_CERTDB, CamelCertDBPrivate)) - struct _CamelCertDBPrivate { gchar *filename; guint32 version; @@ -52,7 +48,8 @@ struct _CamelCertDBPrivate { GMutex io_lock; /* load/save lock, for access to saved_count, etc */ }; -G_DEFINE_TYPE (CamelCertDB, camel_certdb, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelCertDB, camel_certdb, G_TYPE_OBJECT) + G_DEFINE_BOXED_TYPE (CamelCert, camel_cert, camel_cert_ref, @@ -131,7 +128,7 @@ certdb_finalize (GObject *object) { CamelCertDBPrivate *priv; - priv = CAMEL_CERTDB_GET_PRIVATE (object); + priv = CAMEL_CERTDB (object)->priv; if (priv->dirty) camel_certdb_save (CAMEL_CERTDB (object)); @@ -232,8 +229,6 @@ camel_certdb_class_init (CamelCertDBClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelCertDBPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = certdb_finalize; @@ -246,7 +241,7 @@ camel_certdb_class_init (CamelCertDBClass *class) static void camel_certdb_init (CamelCertDB *certdb) { - certdb->priv = CAMEL_CERTDB_GET_PRIVATE (certdb); + certdb->priv = camel_certdb_get_instance_private (certdb); certdb->priv->version = CAMEL_CERTDB_VERSION; diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c index dcdc3eed0..78ef41b8f 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c @@ -38,10 +38,6 @@ #include "camel-mime-filter-canon.h" #include "camel-stream-filter.h" -#define CAMEL_CIPHER_CONTEXT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_CIPHER_CONTEXT, CamelCipherContextPrivate)) - #define CIPHER_LOCK(ctx) \ g_mutex_lock (&((CamelCipherContext *) ctx)->priv->lock) #define CIPHER_UNLOCK(ctx) \ @@ -71,7 +67,7 @@ enum { PROP_SESSION }; -G_DEFINE_TYPE (CamelCipherContext, camel_cipher_context, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelCipherContext, camel_cipher_context, G_TYPE_OBJECT) G_DEFINE_BOXED_TYPE (CamelCipherValidity, camel_cipher_validity, @@ -150,7 +146,7 @@ cipher_context_dispose (GObject *object) { CamelCipherContextPrivate *priv; - priv = CAMEL_CIPHER_CONTEXT_GET_PRIVATE (object); + priv = CAMEL_CIPHER_CONTEXT (object)->priv; if (priv->session != NULL) { g_object_unref (priv->session); @@ -166,7 +162,7 @@ cipher_context_finalize (GObject *object) { CamelCipherContextPrivate *priv; - priv = CAMEL_CIPHER_CONTEXT_GET_PRIVATE (object); + priv = CAMEL_CIPHER_CONTEXT (object)->priv; g_mutex_clear (&priv->lock); @@ -252,8 +248,6 @@ camel_cipher_context_class_init (CamelCipherContextClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelCipherContextPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = cipher_context_set_property; object_class->get_property = cipher_context_get_property; @@ -283,7 +277,7 @@ camel_cipher_context_class_init (CamelCipherContextClass *class) static void camel_cipher_context_init (CamelCipherContext *context) { - context->priv = CAMEL_CIPHER_CONTEXT_GET_PRIVATE (context); + context->priv = camel_cipher_context_get_instance_private (context); g_mutex_init (&context->priv->lock); } diff --git a/src/camel/camel-data-cache.c b/src/camel/camel-data-cache.c index 1d00ff5a9..fe0212d52 100644 --- a/src/camel/camel-data-cache.c +++ b/src/camel/camel-data-cache.c @@ -37,10 +37,6 @@ #define d(x) -#define CAMEL_DATA_CACHE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_DATA_CACHE, CamelDataCachePrivate)) - /* how many 'bits' of hash are used to key the toplevel directory */ #define CAMEL_DATA_CACHE_BITS (6) #define CAMEL_DATA_CACHE_MASK ((1 << CAMEL_DATA_CACHE_BITS)-1) @@ -67,7 +63,7 @@ enum { PROP_EXPIRE_ENABLED }; -G_DEFINE_TYPE (CamelDataCache, camel_data_cache, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelDataCache, camel_data_cache, G_TYPE_OBJECT) static void data_cache_set_property (GObject *object, @@ -120,7 +116,7 @@ data_cache_finalize (GObject *object) { CamelDataCachePrivate *priv; - priv = CAMEL_DATA_CACHE_GET_PRIVATE (object); + priv = CAMEL_DATA_CACHE (object)->priv; camel_object_bag_destroy (priv->busy_bag); g_free (priv->path); @@ -134,8 +130,6 @@ camel_data_cache_class_init (CamelDataCacheClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelDataCachePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = data_cache_set_property; object_class->get_property = data_cache_get_property; @@ -176,7 +170,7 @@ camel_data_cache_init (CamelDataCache *data_cache) (CamelCopyFunc) g_strdup, (GFreeFunc) g_free); - data_cache->priv = CAMEL_DATA_CACHE_GET_PRIVATE (data_cache); + data_cache->priv = camel_data_cache_get_instance_private (data_cache); data_cache->priv->busy_bag = busy_bag; data_cache->priv->expire_enabled = TRUE; data_cache->priv->expire_age = -1; diff --git a/src/camel/camel-data-wrapper.c b/src/camel/camel-data-wrapper.c index 68fcee383..924cd30d1 100644 --- a/src/camel/camel-data-wrapper.c +++ b/src/camel/camel-data-wrapper.c @@ -33,10 +33,6 @@ #define d(x) -#define CAMEL_DATA_WRAPPER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_DATA_WRAPPER, CamelDataWrapperPrivate)) - typedef struct _AsyncContext AsyncContext; struct _CamelDataWrapperPrivate { @@ -56,7 +52,7 @@ struct _AsyncContext { GOutputStream *output_stream; }; -G_DEFINE_TYPE (CamelDataWrapper, camel_data_wrapper, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelDataWrapper, camel_data_wrapper, G_TYPE_OBJECT) static void async_context_free (AsyncContext *async_context) @@ -87,7 +83,7 @@ data_wrapper_finalize (GObject *object) { CamelDataWrapperPrivate *priv; - priv = CAMEL_DATA_WRAPPER_GET_PRIVATE (object); + priv = CAMEL_DATA_WRAPPER (object)->priv; g_mutex_clear (&priv->stream_lock); g_byte_array_free (priv->byte_array, TRUE); @@ -421,8 +417,6 @@ camel_data_wrapper_class_init (CamelDataWrapperClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelDataWrapperPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = data_wrapper_dispose; object_class->finalize = data_wrapper_finalize; @@ -444,7 +438,7 @@ camel_data_wrapper_class_init (CamelDataWrapperClass *class) static void camel_data_wrapper_init (CamelDataWrapper *data_wrapper) { - data_wrapper->priv = CAMEL_DATA_WRAPPER_GET_PRIVATE (data_wrapper); + data_wrapper->priv = camel_data_wrapper_get_instance_private (data_wrapper); g_mutex_init (&data_wrapper->priv->stream_lock); data_wrapper->priv->byte_array = g_byte_array_new (); diff --git a/src/camel/camel-db.c b/src/camel/camel-db.c index 98f56dee2..3e550944b 100644 --- a/src/camel/camel-db.c +++ b/src/camel/camel-db.c @@ -497,7 +497,7 @@ struct _CamelDBPrivate { gboolean is_foldersdb; }; -G_DEFINE_TYPE (CamelDB, camel_db, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelDB, camel_db, G_TYPE_OBJECT) static void camel_db_finalize (GObject *object) @@ -520,8 +520,6 @@ camel_db_class_init (CamelDBClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelDBPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = camel_db_finalize; } @@ -529,7 +527,7 @@ camel_db_class_init (CamelDBClass *class) static void camel_db_init (CamelDB *cdb) { - cdb->priv = G_TYPE_INSTANCE_GET_PRIVATE (cdb, CAMEL_TYPE_DB, CamelDBPrivate); + cdb->priv = camel_db_get_instance_private (cdb); g_rw_lock_init (&cdb->priv->rwlock); g_mutex_init (&cdb->priv->transaction_lock); diff --git a/src/camel/camel-filter-driver.c b/src/camel/camel-filter-driver.c index fcc4a9692..56d8b5e99 100644 --- a/src/camel/camel-filter-driver.c +++ b/src/camel/camel-filter-driver.c @@ -52,10 +52,6 @@ /* an invalid pointer */ #define FOLDER_INVALID ((gpointer)~0) -#define CAMEL_FILTER_DRIVER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_FILTER_DRIVER, CamelFilterDriverPrivate)) - /* type of status for a log report */ enum filter_log_t { FILTER_LOG_NONE, @@ -183,7 +179,7 @@ static struct { { "only-once", (CamelSExpFunc) do_only_once, 0 } }; -G_DEFINE_TYPE (CamelFilterDriver, camel_filter_driver, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelFilterDriver, camel_filter_driver, G_TYPE_OBJECT) typedef struct _MessageTransferData { GPtrArray *copy_uids; @@ -337,7 +333,7 @@ filter_driver_dispose (GObject *object) { CamelFilterDriverPrivate *priv; - priv = CAMEL_FILTER_DRIVER_GET_PRIVATE (object); + priv = CAMEL_FILTER_DRIVER (object)->priv; if (priv->transfers) { g_hash_table_destroy (priv->transfers); @@ -368,7 +364,7 @@ filter_driver_finalize (GObject *object) CamelFilterDriverPrivate *priv; struct _filter_rule *node; - priv = CAMEL_FILTER_DRIVER_GET_PRIVATE (object); + priv = CAMEL_FILTER_DRIVER (object)->priv; /* close all folders that were opened for appending */ close_folders (CAMEL_FILTER_DRIVER (object), FALSE, NULL); @@ -398,8 +394,6 @@ camel_filter_driver_class_init (CamelFilterDriverClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelFilterDriverPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = filter_driver_dispose; object_class->finalize = filter_driver_finalize; @@ -410,7 +404,7 @@ camel_filter_driver_init (CamelFilterDriver *filter_driver) { gint ii; - filter_driver->priv = CAMEL_FILTER_DRIVER_GET_PRIVATE (filter_driver); + filter_driver->priv = camel_filter_driver_get_instance_private (filter_driver); g_queue_init (&filter_driver->priv->rules); diff --git a/src/camel/camel-filter-input-stream.c b/src/camel/camel-filter-input-stream.c index 2563ed029..a7511d7b0 100644 --- a/src/camel/camel-filter-input-stream.c +++ b/src/camel/camel-filter-input-stream.c @@ -32,10 +32,6 @@ #include <string.h> -#define CAMEL_FILTER_INPUT_STREAM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_FILTER_INPUT_STREAM, CamelFilterInputStreamPrivate)) - #define READ_PAD (128) /* bytes padded before buffer */ #define READ_SIZE (4096) @@ -54,7 +50,7 @@ enum { PROP_FILTER }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelFilterInputStream, camel_filter_input_stream, G_TYPE_FILTER_INPUT_STREAM) @@ -109,7 +105,7 @@ filter_input_stream_dispose (GObject *object) { CamelFilterInputStreamPrivate *priv; - priv = CAMEL_FILTER_INPUT_STREAM_GET_PRIVATE (object); + priv = CAMEL_FILTER_INPUT_STREAM (object)->priv; g_clear_object (&priv->filter); @@ -131,7 +127,7 @@ filter_input_stream_read (GInputStream *stream, gssize n_bytes_read; gsize presize = READ_PAD; - priv = CAMEL_FILTER_INPUT_STREAM_GET_PRIVATE (stream); + priv = CAMEL_FILTER_INPUT_STREAM (stream)->priv; filter = camel_filter_input_stream_get_filter ( CAMEL_FILTER_INPUT_STREAM (stream)); @@ -182,9 +178,6 @@ camel_filter_input_stream_class_init (CamelFilterInputStreamClass *class) GObjectClass *object_class; GInputStreamClass *stream_class; - g_type_class_add_private ( - class, sizeof (CamelFilterInputStreamPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = filter_input_stream_set_property; object_class->get_property = filter_input_stream_get_property; @@ -209,8 +202,7 @@ camel_filter_input_stream_class_init (CamelFilterInputStreamClass *class) static void camel_filter_input_stream_init (CamelFilterInputStream *filter_stream) { - filter_stream->priv = - CAMEL_FILTER_INPUT_STREAM_GET_PRIVATE (filter_stream); + filter_stream->priv = camel_filter_input_stream_get_instance_private (filter_stream); filter_stream->priv->buffer = filter_stream->priv->real_buffer + READ_PAD; diff --git a/src/camel/camel-filter-output-stream.c b/src/camel/camel-filter-output-stream.c index 32ac3012f..23b0e3b5a 100644 --- a/src/camel/camel-filter-output-stream.c +++ b/src/camel/camel-filter-output-stream.c @@ -32,10 +32,6 @@ #include <string.h> -#define CAMEL_FILTER_OUTPUT_STREAM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_FILTER_OUTPUT_STREAM, CamelFilterOutputStreamPrivate)) - #define READ_PAD (128) /* bytes padded before buffer */ #define READ_SIZE (4096) @@ -48,7 +44,7 @@ enum { PROP_FILTER }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelFilterOutputStream, camel_filter_output_stream, G_TYPE_FILTER_OUTPUT_STREAM) @@ -103,7 +99,7 @@ filter_output_stream_dispose (GObject *object) { CamelFilterOutputStreamPrivate *priv; - priv = CAMEL_FILTER_OUTPUT_STREAM_GET_PRIVATE (object); + priv = CAMEL_FILTER_OUTPUT_STREAM (object)->priv; /* XXX GOutputStream calls flush() one last time during * dispose(), so chain up before clearing our filter. */ @@ -204,9 +200,6 @@ camel_filter_output_stream_class_init (CamelFilterOutputStreamClass *class) GObjectClass *object_class; GOutputStreamClass *stream_class; - g_type_class_add_private ( - class, sizeof (CamelFilterOutputStreamPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = filter_output_stream_set_property; object_class->get_property = filter_output_stream_get_property; @@ -232,8 +225,7 @@ camel_filter_output_stream_class_init (CamelFilterOutputStreamClass *class) static void camel_filter_output_stream_init (CamelFilterOutputStream *filter_stream) { - filter_stream->priv = - CAMEL_FILTER_OUTPUT_STREAM_GET_PRIVATE (filter_stream); + filter_stream->priv = camel_filter_output_stream_get_instance_private (filter_stream); } /** diff --git a/src/camel/camel-folder-search.c b/src/camel/camel-folder-search.c index 3dee2ac7b..33741fd4e 100644 --- a/src/camel/camel-folder-search.c +++ b/src/camel/camel-folder-search.c @@ -59,10 +59,6 @@ #define r(x) #define dd(x) if (camel_debug("search")) x -#define CAMEL_FOLDER_SEARCH_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_FOLDER_SEARCH, CamelFolderSearchPrivate)) - struct _CamelFolderSearchPrivate { CamelSExp *sexp; /* s-exp evaluator */ gchar *last_search; /* last searched expression */ @@ -235,7 +231,7 @@ static struct { CAMEL_FOLDER_SEARCH_ALWAYS_ENTER }, }; -G_DEFINE_TYPE (CamelFolderSearch, camel_folder_search, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelFolderSearch, camel_folder_search, G_TYPE_OBJECT) /* this is just to OR results together */ struct IterData { @@ -1798,8 +1794,6 @@ camel_folder_search_class_init (CamelFolderSearchClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelFolderSearchPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = folder_search_dispose; object_class->finalize = folder_search_finalize; @@ -1835,7 +1829,7 @@ camel_folder_search_class_init (CamelFolderSearchClass *class) static void camel_folder_search_init (CamelFolderSearch *search) { - search->priv = CAMEL_FOLDER_SEARCH_GET_PRIVATE (search); + search->priv = camel_folder_search_get_instance_private (search); search->priv->sexp = camel_sexp_new (); search->priv->only_cached_messages = FALSE; } diff --git a/src/camel/camel-folder-summary.c b/src/camel/camel-folder-summary.c index 10c7caff0..d9ad04dcd 100644 --- a/src/camel/camel-folder-summary.c +++ b/src/camel/camel-folder-summary.c @@ -146,7 +146,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE (CamelFolderSummary, camel_folder_summary, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelFolderSummary, camel_folder_summary, G_TYPE_OBJECT) /* Private function */ void _camel_message_info_unset_summary (CamelMessageInfo *mi); @@ -628,8 +628,6 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelFolderSummaryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = folder_summary_set_property; object_class->get_property = folder_summary_get_property; @@ -775,7 +773,7 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class) static void camel_folder_summary_init (CamelFolderSummary *summary) { - summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (summary, CAMEL_TYPE_FOLDER_SUMMARY, CamelFolderSummaryPrivate); + summary->priv = camel_folder_summary_get_instance_private (summary); summary->priv->version = CAMEL_FOLDER_SUMMARY_VERSION; summary->priv->flags = 0; diff --git a/src/camel/camel-folder.c b/src/camel/camel-folder.c index c017bc365..eb393827d 100644 --- a/src/camel/camel-folder.c +++ b/src/camel/camel-folder.c @@ -39,10 +39,6 @@ #include "camel-vtrash-folder.h" #include "camel-string-utils.h" -#define CAMEL_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_FOLDER, CamelFolderPrivate)) - #define d(x) #define w(x) @@ -130,7 +126,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_ABSTRACT_TYPE (CamelFolder, camel_folder, CAMEL_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelFolder, camel_folder, CAMEL_TYPE_OBJECT) G_DEFINE_BOXED_TYPE (CamelFolderQuotaInfo, camel_folder_quota_info, @@ -701,7 +697,7 @@ folder_finalize (GObject *object) { CamelFolderPrivate *priv; - priv = CAMEL_FOLDER_GET_PRIVATE (object); + priv = CAMEL_FOLDER (object)->priv; g_mutex_clear (&priv->property_lock); @@ -1236,8 +1232,6 @@ camel_folder_class_init (CamelFolderClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = folder_set_property; object_class->get_property = folder_get_property; @@ -1426,7 +1420,7 @@ camel_folder_class_init (CamelFolderClass *class) static void camel_folder_init (CamelFolder *folder) { - folder->priv = CAMEL_FOLDER_GET_PRIVATE (folder); + folder->priv = camel_folder_get_instance_private (folder); folder->priv->frozen = 0; folder->priv->changed_frozen = camel_folder_change_info_new (); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c index 5d8ded781..13ae071a5 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -77,10 +77,6 @@ static gint logid; } \ } G_STMT_END -#define CAMEL_GPG_CONTEXT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_GPG_CONTEXT, CamelGpgContextPrivate)) - struct _CamelGpgContextPrivate { gboolean always_trust; gboolean prefer_inline; @@ -92,7 +88,7 @@ enum { PROP_PREFER_INLINE }; -G_DEFINE_TYPE (CamelGpgContext, camel_gpg_context, CAMEL_TYPE_CIPHER_CONTEXT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelGpgContext, camel_gpg_context, CAMEL_TYPE_CIPHER_CONTEXT) static const gchar *gpg_ctx_get_executable_name (void); @@ -2865,8 +2861,6 @@ camel_gpg_context_class_init (CamelGpgContextClass *class) GObjectClass *object_class; CamelCipherContextClass *cipher_context_class; - g_type_class_add_private (class, sizeof (CamelGpgContextPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = gpg_context_set_property; object_class->get_property = gpg_context_get_property; @@ -2910,7 +2904,7 @@ camel_gpg_context_class_init (CamelGpgContextClass *class) static void camel_gpg_context_init (CamelGpgContext *context) { - context->priv = CAMEL_GPG_CONTEXT_GET_PRIVATE (context); + context->priv = camel_gpg_context_get_instance_private (context); } /** diff --git a/src/camel/camel-index.c b/src/camel/camel-index.c index 98cc3cf78..b7b2708ba 100644 --- a/src/camel/camel-index.c +++ b/src/camel/camel-index.c @@ -35,10 +35,6 @@ #define CAMEL_INDEX_VERSION (0x01) -#define CAMEL_INDEX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_INDEX, CamelIndexPrivate)) - struct _CamelIndexPrivate { gpointer dummy; }; @@ -47,7 +43,7 @@ struct _CamelIndexPrivate { /* CamelIndex */ /* ********************************************************************** */ -G_DEFINE_TYPE (CamelIndex, camel_index, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelIndex, camel_index, G_TYPE_OBJECT) static void index_finalize (GObject *object) @@ -65,8 +61,6 @@ camel_index_class_init (CamelIndexClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIndexPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = index_finalize; } @@ -74,7 +68,7 @@ camel_index_class_init (CamelIndexClass *class) static void camel_index_init (CamelIndex *index) { - index->priv = CAMEL_INDEX_GET_PRIVATE (index); + index->priv = camel_index_get_instance_private (index); index->version = CAMEL_INDEX_VERSION; } diff --git a/src/camel/camel-internet-address.c b/src/camel/camel-internet-address.c index f920e31f0..e91f8b306 100644 --- a/src/camel/camel-internet-address.c +++ b/src/camel/camel-internet-address.c @@ -34,7 +34,7 @@ struct _address { gchar *address; }; -G_DEFINE_TYPE (CamelInternetAddress, camel_internet_address, CAMEL_TYPE_ADDRESS) +G_DEFINE_TYPE_WITH_PRIVATE (CamelInternetAddress, camel_internet_address, CAMEL_TYPE_ADDRESS) static gint internet_address_length (CamelAddress *paddr) @@ -257,8 +257,6 @@ camel_internet_address_class_init (CamelInternetAddressClass *class) CamelAddressClass *address_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelInternetAddressPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = internet_address_finalize; @@ -275,7 +273,7 @@ camel_internet_address_class_init (CamelInternetAddressClass *class) static void camel_internet_address_init (CamelInternetAddress *internet_address) { - internet_address->priv = G_TYPE_INSTANCE_GET_PRIVATE (internet_address, CAMEL_TYPE_INTERNET_ADDRESS, CamelInternetAddressPrivate); + internet_address->priv = camel_internet_address_get_instance_private (internet_address); internet_address->priv->addresses = g_ptr_array_new (); } diff --git a/src/camel/camel-local-settings.c b/src/camel/camel-local-settings.c index f10174d68..2114a09f6 100644 --- a/src/camel/camel-local-settings.c +++ b/src/camel/camel-local-settings.c @@ -19,10 +19,6 @@ #include <string.h> -#define CAMEL_LOCAL_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_LOCAL_SETTINGS, CamelLocalSettingsPrivate)) - struct _CamelLocalSettingsPrivate { GMutex property_lock; gchar *path; @@ -37,7 +33,7 @@ enum { PROP_PATH }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelLocalSettings, camel_local_settings, CAMEL_TYPE_STORE_SETTINGS) @@ -108,7 +104,7 @@ local_settings_finalize (GObject *object) { CamelLocalSettingsPrivate *priv; - priv = CAMEL_LOCAL_SETTINGS_GET_PRIVATE (object); + priv = CAMEL_LOCAL_SETTINGS (object)->priv; g_mutex_clear (&priv->property_lock); @@ -123,8 +119,6 @@ camel_local_settings_class_init (CamelLocalSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelLocalSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = local_settings_set_property; object_class->get_property = local_settings_get_property; @@ -173,7 +167,7 @@ camel_local_settings_class_init (CamelLocalSettingsClass *class) static void camel_local_settings_init (CamelLocalSettings *settings) { - settings->priv = CAMEL_LOCAL_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_local_settings_get_instance_private (settings); g_mutex_init (&settings->priv->property_lock); } diff --git a/src/camel/camel-medium.c b/src/camel/camel-medium.c index 170db5bca..9973cedfe 100644 --- a/src/camel/camel-medium.c +++ b/src/camel/camel-medium.c @@ -28,10 +28,6 @@ #define d(x) -#define CAMEL_MEDIUM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MEDIUM, CamelMediumPrivate)) - struct _CamelMediumPrivate { /* The content of the medium, as opposed to our parent * CamelDataWrapper, which wraps both the headers and @@ -44,7 +40,7 @@ enum { PROP_CONTENT }; -G_DEFINE_ABSTRACT_TYPE (CamelMedium, camel_medium, CAMEL_TYPE_DATA_WRAPPER) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelMedium, camel_medium, CAMEL_TYPE_DATA_WRAPPER) static void medium_set_property (GObject *object, @@ -85,7 +81,7 @@ medium_dispose (GObject *object) { CamelMediumPrivate *priv; - priv = CAMEL_MEDIUM_GET_PRIVATE (object); + priv = CAMEL_MEDIUM (object)->priv; if (priv->content != NULL) { g_object_unref (priv->content); @@ -137,8 +133,6 @@ camel_medium_class_init (CamelMediumClass *class) GObjectClass *object_class; CamelDataWrapperClass *data_wrapper_class; - g_type_class_add_private (class, sizeof (CamelMediumPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = medium_set_property; object_class->get_property = medium_get_property; @@ -165,7 +159,7 @@ camel_medium_class_init (CamelMediumClass *class) static void camel_medium_init (CamelMedium *medium) { - medium->priv = CAMEL_MEDIUM_GET_PRIVATE (medium); + medium->priv = camel_medium_get_instance_private (medium); } /** diff --git a/src/camel/camel-message-info-base.c b/src/camel/camel-message-info-base.c index dae6d7b0b..e19224ab1 100644 --- a/src/camel/camel-message-info-base.c +++ b/src/camel/camel-message-info-base.c @@ -41,7 +41,7 @@ struct _CamelMessageInfoBasePrivate { CamelNameValueArray *headers; }; -G_DEFINE_TYPE (CamelMessageInfoBase, camel_message_info_base, CAMEL_TYPE_MESSAGE_INFO) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMessageInfoBase, camel_message_info_base, CAMEL_TYPE_MESSAGE_INFO) static guint32 message_info_base_get_flags (const CamelMessageInfo *mi) @@ -826,8 +826,6 @@ camel_message_info_base_class_init (CamelMessageInfoBaseClass *class) CamelMessageInfoClass *mi_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMessageInfoBasePrivate)); - mi_class = CAMEL_MESSAGE_INFO_CLASS (class); mi_class->get_flags = message_info_base_get_flags; mi_class->set_flags = message_info_base_set_flags; @@ -871,5 +869,5 @@ camel_message_info_base_class_init (CamelMessageInfoBaseClass *class) static void camel_message_info_base_init (CamelMessageInfoBase *bmi) { - bmi->priv = G_TYPE_INSTANCE_GET_PRIVATE (bmi, CAMEL_TYPE_MESSAGE_INFO_BASE, CamelMessageInfoBasePrivate); + bmi->priv = camel_message_info_base_get_instance_private (bmi); } diff --git a/src/camel/camel-message-info.c b/src/camel/camel-message-info.c index 202c7ffff..5db87171a 100644 --- a/src/camel/camel-message-info.c +++ b/src/camel/camel-message-info.c @@ -66,7 +66,7 @@ enum { PROP_HEADERS }; -G_DEFINE_ABSTRACT_TYPE (CamelMessageInfo, camel_message_info, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelMessageInfo, camel_message_info, G_TYPE_OBJECT) static CamelMessageInfo * message_info_clone (const CamelMessageInfo *mi, @@ -588,8 +588,6 @@ camel_message_info_class_init (CamelMessageInfoClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMessageInfoPrivate)); - class->clone = message_info_clone; class->load = message_info_load; class->save = message_info_save; @@ -980,7 +978,7 @@ camel_message_info_class_init (CamelMessageInfoClass *class) static void camel_message_info_init (CamelMessageInfo *mi) { - mi->priv = G_TYPE_INSTANCE_GET_PRIVATE (mi, CAMEL_TYPE_MESSAGE_INFO, CamelMessageInfoPrivate); + mi->priv = camel_message_info_get_instance_private (mi); mi->priv->summary_wrg = camel_weak_ref_group_new (); g_rec_mutex_init (&mi->priv->property_lock); diff --git a/src/camel/camel-mime-filter-basic.c b/src/camel/camel-mime-filter-basic.c index 2d7716b4c..b13276264 100644 --- a/src/camel/camel-mime-filter-basic.c +++ b/src/camel/camel-mime-filter-basic.c @@ -22,10 +22,6 @@ #include "camel-mime-filter-basic.h" #include "camel-mime-utils.h" -#define CAMEL_MIME_FILTER_BASIC_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_BASIC, CamelMimeFilterBasicPrivate)) - struct _CamelMimeFilterBasicPrivate { CamelMimeFilterBasicType type; guchar uubuf[60]; @@ -33,7 +29,7 @@ struct _CamelMimeFilterBasicPrivate { gint save; }; -G_DEFINE_TYPE (CamelMimeFilterBasic, camel_mime_filter_basic, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterBasic, camel_mime_filter_basic, CAMEL_TYPE_MIME_FILTER) /* here we do all of the basic mime filtering */ static void @@ -48,7 +44,7 @@ mime_filter_basic_filter (CamelMimeFilter *mime_filter, CamelMimeFilterBasicPrivate *priv; gsize newlen; - priv = CAMEL_MIME_FILTER_BASIC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BASIC (mime_filter)->priv; switch (priv->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: @@ -184,7 +180,7 @@ mime_filter_basic_complete (CamelMimeFilter *mime_filter, CamelMimeFilterBasicPrivate *priv; gsize newlen = 0; - priv = CAMEL_MIME_FILTER_BASIC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BASIC (mime_filter)->priv; switch (priv->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: @@ -288,7 +284,7 @@ mime_filter_basic_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterBasicPrivate *priv; - priv = CAMEL_MIME_FILTER_BASIC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BASIC (mime_filter)->priv; switch (priv->type) { case CAMEL_MIME_FILTER_BASIC_QP_ENC: @@ -305,8 +301,6 @@ camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterBasicPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_basic_filter; mime_filter_class->complete = mime_filter_basic_complete; @@ -316,7 +310,7 @@ camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *class) static void camel_mime_filter_basic_init (CamelMimeFilterBasic *filter) { - filter->priv = CAMEL_MIME_FILTER_BASIC_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_basic_get_instance_private (filter); } /** diff --git a/src/camel/camel-mime-filter-bestenc.c b/src/camel/camel-mime-filter-bestenc.c index 1a377ed15..62b8cafd2 100644 --- a/src/camel/camel-mime-filter-bestenc.c +++ b/src/camel/camel-mime-filter-bestenc.c @@ -23,10 +23,6 @@ #include "camel-mime-filter-bestenc.h" -#define CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_BESTENC, CamelMimeFilterBestencPrivate)) - struct _CamelMimeFilterBestencPrivate { guint flags; /* our creation flags */ @@ -50,7 +46,7 @@ struct _CamelMimeFilterBestencPrivate { CamelCharset charset; /* used to determine the best charset to use */ }; -G_DEFINE_TYPE (CamelMimeFilterBestenc, camel_mime_filter_bestenc, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterBestenc, camel_mime_filter_bestenc, CAMEL_TYPE_MIME_FILTER) static void mime_filter_bestenc_filter (CamelMimeFilter *mime_filter, @@ -64,7 +60,7 @@ mime_filter_bestenc_filter (CamelMimeFilter *mime_filter, CamelMimeFilterBestencPrivate *priv; register guchar *p, *pend; - priv = CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BESTENC (mime_filter)->priv; if (len == 0) goto donothing; @@ -165,7 +161,7 @@ mime_filter_bestenc_complete (CamelMimeFilter *mime_filter, { CamelMimeFilterBestencPrivate *priv; - priv = CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BESTENC (mime_filter)->priv; mime_filter_bestenc_filter ( mime_filter, in, len, prespace, out, outlen, outprespace); @@ -180,7 +176,7 @@ mime_filter_bestenc_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterBestencPrivate *priv; - priv = CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_BESTENC (mime_filter)->priv; priv->count0 = 0; priv->count8 = 0; @@ -200,8 +196,6 @@ camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterBestencPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_bestenc_filter; mime_filter_class->complete = mime_filter_bestenc_complete; @@ -211,7 +205,7 @@ camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *class) static void camel_mime_filter_bestenc_init (CamelMimeFilterBestenc *filter) { - filter->priv = CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_bestenc_get_instance_private (filter); mime_filter_bestenc_reset (CAMEL_MIME_FILTER (filter)); } @@ -253,7 +247,7 @@ camel_mime_filter_bestenc_get_best_encoding (CamelMimeFilterBestenc *filter, CamelTransferEncoding bestenc; gint istext; - priv = CAMEL_MIME_FILTER_BESTENC_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_BESTENC (filter)->priv; istext = (required & CAMEL_BESTENC_TEXT) ? 1 : 0; required = required & ~CAMEL_BESTENC_TEXT; diff --git a/src/camel/camel-mime-filter-canon.c b/src/camel/camel-mime-filter-canon.c index d5a6e84fe..0a5241291 100644 --- a/src/camel/camel-mime-filter-canon.c +++ b/src/camel/camel-mime-filter-canon.c @@ -27,15 +27,11 @@ #include "camel-mime-filter-canon.h" -#define CAMEL_MIME_FILTER_CANON_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_CANON, CamelMimeFilterCanonPrivate)) - struct _CamelMimeFilterCanonPrivate { guint32 flags; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelMimeFilterCanon, camel_mime_filter_canon, CAMEL_TYPE_MIME_FILTER) @@ -57,7 +53,7 @@ mime_filter_canon_run (CamelMimeFilter *mime_filter, register gchar *o; gint lf = 0; - priv = CAMEL_MIME_FILTER_CANON_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CANON (mime_filter)->priv; /* first, work out how much space we need */ inptr = (guchar *) in; @@ -181,8 +177,6 @@ camel_mime_filter_canon_class_init (CamelMimeFilterCanonClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterCanonPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_canon_filter; mime_filter_class->complete = mime_filter_canon_complete; @@ -192,7 +186,7 @@ camel_mime_filter_canon_class_init (CamelMimeFilterCanonClass *class) static void camel_mime_filter_canon_init (CamelMimeFilterCanon *filter) { - filter->priv = CAMEL_MIME_FILTER_CANON_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_canon_get_instance_private (filter); } /** diff --git a/src/camel/camel-mime-filter-charset.c b/src/camel/camel-mime-filter-charset.c index 62a729255..45d26f3b9 100644 --- a/src/camel/camel-mime-filter-charset.c +++ b/src/camel/camel-mime-filter-charset.c @@ -26,10 +26,6 @@ #include "camel-iconv.h" #include "camel-mime-filter-charset.h" -#define CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_CHARSET, CamelMimeFilterCharsetPrivate)) - #define d(x) #define w(x) @@ -39,14 +35,14 @@ struct _CamelMimeFilterCharsetPrivate { gchar *to; }; -G_DEFINE_TYPE (CamelMimeFilterCharset, camel_mime_filter_charset, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterCharset, camel_mime_filter_charset, CAMEL_TYPE_MIME_FILTER) static void mime_filter_charset_finalize (GObject *object) { CamelMimeFilterCharsetPrivate *priv; - priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_CHARSET (object)->priv; g_free (priv->from); g_free (priv->to); @@ -74,7 +70,7 @@ mime_filter_charset_complete (CamelMimeFilter *mime_filter, const gchar *inbuf; gchar *outbuf; - priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CHARSET (mime_filter)->priv; if (priv->ic == (iconv_t) -1) goto noop; @@ -165,7 +161,7 @@ mime_filter_charset_filter (CamelMimeFilter *mime_filter, const gchar *inbuf; gchar *outbuf; - priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CHARSET (mime_filter)->priv; if (priv->ic == (iconv_t) -1) goto noop; @@ -228,7 +224,7 @@ mime_filter_charset_reset (CamelMimeFilter *mime_filter) gchar *buffer; gsize outlen = 16; - priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CHARSET (mime_filter)->priv; /* what happens with the output bytes if this resets the state? */ if (priv->ic != (iconv_t) -1) { @@ -243,8 +239,6 @@ camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterCharsetPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = mime_filter_charset_finalize; @@ -257,7 +251,7 @@ camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *class) static void camel_mime_filter_charset_init (CamelMimeFilterCharset *filter) { - filter->priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_charset_get_instance_private (filter); filter->priv->ic = (iconv_t) -1; } @@ -279,7 +273,7 @@ camel_mime_filter_charset_new (const gchar *from_charset, CamelMimeFilterCharsetPrivate *priv; new = g_object_new (CAMEL_TYPE_MIME_FILTER_CHARSET, NULL); - priv = CAMEL_MIME_FILTER_CHARSET_GET_PRIVATE (new); + priv = CAMEL_MIME_FILTER_CHARSET (new)->priv; priv->ic = camel_iconv_open (to_charset, from_charset); if (priv->ic == (iconv_t) -1) { diff --git a/src/camel/camel-mime-filter-crlf.c b/src/camel/camel-mime-filter-crlf.c index 8acde98be..5f942d7f2 100644 --- a/src/camel/camel-mime-filter-crlf.c +++ b/src/camel/camel-mime-filter-crlf.c @@ -20,10 +20,6 @@ #include "camel-mime-filter-crlf.h" -#define CAMEL_MIME_FILTER_CRLF_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_CRLF, CamelMimeFilterCRLFPrivate)) - struct _CamelMimeFilterCRLFPrivate { CamelMimeFilterCRLFDirection direction; CamelMimeFilterCRLFMode mode; @@ -32,7 +28,7 @@ struct _CamelMimeFilterCRLFPrivate { gboolean saw_dot; }; -G_DEFINE_TYPE (CamelMimeFilterCRLF, camel_mime_filter_crlf, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterCRLF, camel_mime_filter_crlf, CAMEL_TYPE_MIME_FILTER) static void mime_filter_crlf_filter (CamelMimeFilter *mime_filter, @@ -49,7 +45,7 @@ mime_filter_crlf_filter (CamelMimeFilter *mime_filter, gboolean do_dots; gchar *outptr; - priv = CAMEL_MIME_FILTER_CRLF_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CRLF (mime_filter)->priv; do_dots = priv->mode == CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS; @@ -145,7 +141,7 @@ mime_filter_crlf_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterCRLFPrivate *priv; - priv = CAMEL_MIME_FILTER_CRLF_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_CRLF (mime_filter)->priv; priv->saw_cr = FALSE; priv->saw_lf = TRUE; @@ -157,8 +153,6 @@ camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterCRLFPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_crlf_filter; mime_filter_class->complete = mime_filter_crlf_complete; @@ -168,7 +162,7 @@ camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *class) static void camel_mime_filter_crlf_init (CamelMimeFilterCRLF *filter) { - filter->priv = CAMEL_MIME_FILTER_CRLF_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_crlf_get_instance_private (filter); filter->priv->saw_cr = FALSE; filter->priv->saw_lf = TRUE; @@ -192,7 +186,7 @@ camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFPrivate *priv; filter = g_object_new (CAMEL_TYPE_MIME_FILTER_CRLF, NULL); - priv = CAMEL_MIME_FILTER_CRLF_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_CRLF (filter)->priv; priv->direction = direction; priv->mode = mode; diff --git a/src/camel/camel-mime-filter-enriched.c b/src/camel/camel-mime-filter-enriched.c index d09b0f98d..37a703c24 100644 --- a/src/camel/camel-mime-filter-enriched.c +++ b/src/camel/camel-mime-filter-enriched.c @@ -26,10 +26,6 @@ #include "camel-mime-filter-enriched.h" #include "camel-string-utils.h" -#define CAMEL_MIME_FILTER_ENRICHED_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_ENRICHED, CamelMimeFilterEnrichedPrivate)) - struct _CamelMimeFilterEnrichedPrivate { guint32 flags; gint nofill; @@ -95,7 +91,7 @@ static struct { static GHashTable *enriched_hash = NULL; -G_DEFINE_TYPE (CamelMimeFilterEnriched, camel_mime_filter_enriched, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterEnriched, camel_mime_filter_enriched, CAMEL_TYPE_MIME_FILTER) #if 0 static gboolean @@ -229,7 +225,7 @@ enriched_to_html (CamelMimeFilter *mime_filter, register const gchar *inptr; register gchar *outptr; - priv = CAMEL_MIME_FILTER_ENRICHED_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_ENRICHED (mime_filter)->priv; camel_mime_filter_set_size (mime_filter, inlen * 2 + 6, FALSE); @@ -524,7 +520,7 @@ mime_filter_enriched_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterEnrichedPrivate *priv; - priv = CAMEL_MIME_FILTER_ENRICHED_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_ENRICHED (mime_filter)->priv; priv->nofill = 0; } @@ -535,8 +531,6 @@ camel_mime_filter_enriched_class_init (CamelMimeFilterEnrichedClass *class) CamelMimeFilterClass *mime_filter_class; gint i; - g_type_class_add_private (class, sizeof (CamelMimeFilterEnrichedPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_enriched_filter; mime_filter_class->complete = mime_filter_enriched_complete; @@ -554,7 +548,7 @@ camel_mime_filter_enriched_class_init (CamelMimeFilterEnrichedClass *class) static void camel_mime_filter_enriched_init (CamelMimeFilterEnriched *filter) { - filter->priv = CAMEL_MIME_FILTER_ENRICHED_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_enriched_get_instance_private (filter); } /** @@ -573,7 +567,7 @@ camel_mime_filter_enriched_new (guint32 flags) CamelMimeFilterEnrichedPrivate *priv; new = g_object_new (CAMEL_TYPE_MIME_FILTER_ENRICHED, NULL); - priv = CAMEL_MIME_FILTER_ENRICHED_GET_PRIVATE (new); + priv = CAMEL_MIME_FILTER_ENRICHED (new)->priv; priv->flags = flags; diff --git a/src/camel/camel-mime-filter-from.c b/src/camel/camel-mime-filter-from.c index fa99700f1..240aed179 100644 --- a/src/camel/camel-mime-filter-from.c +++ b/src/camel/camel-mime-filter-from.c @@ -23,10 +23,6 @@ #include "camel-mime-filter-from.h" -#define CAMEL_MIME_FILTER_FROM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_FROM, CamelMimeFilterFromPrivate)) - #define d(x) struct _CamelMimeFilterFromPrivate { @@ -38,7 +34,7 @@ struct fromnode { const gchar *pointer; }; -G_DEFINE_TYPE (CamelMimeFilterFrom, camel_mime_filter_from, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterFrom, camel_mime_filter_from, CAMEL_TYPE_MIME_FILTER) /* Yes, it is complicated ... */ static void @@ -57,7 +53,7 @@ mime_filter_from_filter (CamelMimeFilter *mime_filter, struct fromnode *head = NULL, *tail = (struct fromnode *) &head, *node; gchar *outptr; - priv = CAMEL_MIME_FILTER_FROM_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_FROM (mime_filter)->priv; inptr = in; inend = inptr + len; @@ -150,8 +146,6 @@ camel_mime_filter_from_class_init (CamelMimeFilterFromClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterFromPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_from_filter; mime_filter_class->complete = mime_filter_from_complete; @@ -160,7 +154,7 @@ camel_mime_filter_from_class_init (CamelMimeFilterFromClass *class) static void camel_mime_filter_from_init (CamelMimeFilterFrom *filter) { - filter->priv = CAMEL_MIME_FILTER_FROM_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_from_get_instance_private (filter); } /** diff --git a/src/camel/camel-mime-filter-gzip.c b/src/camel/camel-mime-filter-gzip.c index 8e8c9e1fe..3469b3003 100644 --- a/src/camel/camel-mime-filter-gzip.c +++ b/src/camel/camel-mime-filter-gzip.c @@ -26,10 +26,6 @@ #include "camel-mime-filter-gzip.h" -#define CAMEL_MIME_FILTER_GZIP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_GZIP, CamelMimeFilterGZipPrivate)) - /* rfc1952 */ enum { @@ -90,7 +86,7 @@ struct _CamelMimeFilterGZipPrivate { guint32 isize; }; -G_DEFINE_TYPE (CamelMimeFilterGZip, camel_mime_filter_gzip, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterGZip, camel_mime_filter_gzip, CAMEL_TYPE_MIME_FILTER) static void gzip_filter (CamelMimeFilter *mime_filter, @@ -105,7 +101,7 @@ gzip_filter (CamelMimeFilter *mime_filter, CamelMimeFilterGZipPrivate *priv; gint retval; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_GZIP (mime_filter)->priv; if (!priv->state.zip.wrote_hdr) { priv->hdr.v.id1 = 31; @@ -197,7 +193,7 @@ gunzip_filter (CamelMimeFilter *mime_filter, guint16 need, val; gint retval; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_GZIP (mime_filter)->priv; if (!priv->state.unzip.got_hdr) { if (len < 10) { @@ -342,7 +338,7 @@ mime_filter_gzip_finalize (GObject *object) { CamelMimeFilterGZipPrivate *priv; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_GZIP (object)->priv; if (priv->mode == CAMEL_MIME_FILTER_GZIP_MODE_ZIP) deflateEnd (priv->stream); @@ -366,7 +362,7 @@ mime_filter_gzip_filter (CamelMimeFilter *mime_filter, { CamelMimeFilterGZipPrivate *priv; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_GZIP (mime_filter)->priv; if (priv->mode == CAMEL_MIME_FILTER_GZIP_MODE_ZIP) gzip_filter ( @@ -389,7 +385,7 @@ mime_filter_gzip_complete (CamelMimeFilter *mime_filter, { CamelMimeFilterGZipPrivate *priv; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_GZIP (mime_filter)->priv; if (priv->mode == CAMEL_MIME_FILTER_GZIP_MODE_ZIP) gzip_filter ( @@ -407,7 +403,7 @@ mime_filter_gzip_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterGZipPrivate *priv; - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_GZIP (mime_filter)->priv; memset (&priv->state, 0, sizeof (priv->state)); @@ -426,8 +422,6 @@ camel_mime_filter_gzip_class_init (CamelMimeFilterGZipClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterGZipPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = mime_filter_gzip_finalize; @@ -440,7 +434,7 @@ camel_mime_filter_gzip_class_init (CamelMimeFilterGZipClass *class) static void camel_mime_filter_gzip_init (CamelMimeFilterGZip *mime_filter) { - mime_filter->priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (mime_filter); + mime_filter->priv = camel_mime_filter_gzip_get_instance_private (mime_filter); mime_filter->priv->stream = g_new0 (z_stream, 1); mime_filter->priv->crc32 = crc32 (0, Z_NULL, 0); } @@ -463,7 +457,7 @@ camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, gint retval; new = g_object_new (CAMEL_TYPE_MIME_FILTER_GZIP, NULL); - priv = CAMEL_MIME_FILTER_GZIP_GET_PRIVATE (new); + priv = CAMEL_MIME_FILTER_GZIP (new)->priv; priv->mode = mode; priv->level = level; diff --git a/src/camel/camel-mime-filter-html.c b/src/camel/camel-mime-filter-html.c index 8bf93770e..15b880aec 100644 --- a/src/camel/camel-mime-filter-html.c +++ b/src/camel/camel-mime-filter-html.c @@ -31,15 +31,11 @@ #define d(x) -#define CAMEL_MIME_FILTER_HTML_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_HTML, CamelMimeFilterHTMLPrivate)) - struct _CamelMimeFilterHTMLPrivate { CamelHTMLParser *ctxt; }; -G_DEFINE_TYPE (CamelMimeFilterHTML, camel_mime_filter_html, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterHTML, camel_mime_filter_html, CAMEL_TYPE_MIME_FILTER) /* ********************************************************************** */ @@ -80,7 +76,7 @@ mime_filter_html_run (CamelMimeFilter *mime_filter, CamelHTMLParserState state; gchar *outp; - priv = CAMEL_MIME_FILTER_HTML_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_HTML (mime_filter)->priv; d (printf ("converting html:\n%.*s\n", (gint) inlen, in)); @@ -122,7 +118,7 @@ mime_filter_html_dispose (GObject *object) { CamelMimeFilterHTMLPrivate *priv; - priv = CAMEL_MIME_FILTER_HTML_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_HTML (object)->priv; if (priv->ctxt != NULL) { g_object_unref (priv->ctxt); @@ -166,7 +162,7 @@ mime_filter_html_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterHTMLPrivate *priv; - priv = CAMEL_MIME_FILTER_HTML_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_HTML (mime_filter)->priv; g_object_unref (priv->ctxt); priv->ctxt = camel_html_parser_new (); @@ -178,8 +174,6 @@ camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterHTMLPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = mime_filter_html_dispose; @@ -192,7 +186,7 @@ camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *class) static void camel_mime_filter_html_init (CamelMimeFilterHTML *mime_filter) { - mime_filter->priv = CAMEL_MIME_FILTER_HTML_GET_PRIVATE (mime_filter); + mime_filter->priv = camel_mime_filter_html_get_instance_private (mime_filter); mime_filter->priv->ctxt = camel_html_parser_new (); } diff --git a/src/camel/camel-mime-filter-index.c b/src/camel/camel-mime-filter-index.c index 2801fc578..4b823efa0 100644 --- a/src/camel/camel-mime-filter-index.c +++ b/src/camel/camel-mime-filter-index.c @@ -19,23 +19,19 @@ #include "camel-mime-filter-index.h" #include "camel-text-index.h" -#define CAMEL_MIME_FILTER_INDEX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_INDEX, CamelMimeFilterIndexPrivate)) - struct _CamelMimeFilterIndexPrivate { CamelIndex *index; CamelIndexName *name; }; -G_DEFINE_TYPE (CamelMimeFilterIndex, camel_mime_filter_index, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterIndex, camel_mime_filter_index, CAMEL_TYPE_MIME_FILTER) static void mime_filter_index_dispose (GObject *object) { CamelMimeFilterIndexPrivate *priv; - priv = CAMEL_MIME_FILTER_INDEX_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_INDEX (object)->priv; if (priv->name != NULL) { g_object_unref (priv->name); @@ -62,7 +58,7 @@ mime_filter_index_filter (CamelMimeFilter *mime_filter, { CamelMimeFilterIndexPrivate *priv; - priv = CAMEL_MIME_FILTER_INDEX_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_INDEX (mime_filter)->priv; if (priv->index == NULL || priv->name == NULL) { goto donothing; @@ -87,7 +83,7 @@ mime_filter_index_complete (CamelMimeFilter *mime_filter, { CamelMimeFilterIndexPrivate *priv; - priv = CAMEL_MIME_FILTER_INDEX_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_INDEX (mime_filter)->priv; if (priv->index == NULL || priv->name == NULL) { goto donothing; @@ -108,8 +104,6 @@ camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterIndexPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = mime_filter_index_dispose; @@ -121,7 +115,7 @@ camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *class) static void camel_mime_filter_index_init (CamelMimeFilterIndex *filter) { - filter->priv = CAMEL_MIME_FILTER_INDEX_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_index_get_instance_private (filter); } /** @@ -140,7 +134,7 @@ camel_mime_filter_index_new (CamelIndex *index) new = g_object_new (CAMEL_TYPE_MIME_FILTER_INDEX, NULL); - priv = CAMEL_MIME_FILTER_INDEX_GET_PRIVATE (new); + priv = CAMEL_MIME_FILTER_INDEX (new)->priv; if (index != NULL) priv->index = g_object_ref (index); diff --git a/src/camel/camel-mime-filter-linewrap.c b/src/camel/camel-mime-filter-linewrap.c index 790b9fbb5..d10dc954b 100644 --- a/src/camel/camel-mime-filter-linewrap.c +++ b/src/camel/camel-mime-filter-linewrap.c @@ -23,10 +23,6 @@ #include "camel-mime-filter-linewrap.h" -#define CAMEL_MIME_FILTER_LINEWRAP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_LINEWRAP, CamelMimeFilterLinewrapPrivate)) - struct _CamelMimeFilterLinewrapPrivate { guint wrap_len; guint max_len; @@ -35,7 +31,7 @@ struct _CamelMimeFilterLinewrapPrivate { guint32 flags; }; -G_DEFINE_TYPE (CamelMimeFilterLinewrap, camel_mime_filter_linewrap, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterLinewrap, camel_mime_filter_linewrap, CAMEL_TYPE_MIME_FILTER) static void mime_filter_linewrap_filter (CamelMimeFilter *mime_filter, @@ -51,7 +47,7 @@ mime_filter_linewrap_filter (CamelMimeFilter *mime_filter, const gchar *inend, *p; gint nchars; - priv = CAMEL_MIME_FILTER_LINEWRAP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_LINEWRAP (mime_filter)->priv; nchars = priv->nchars; @@ -154,7 +150,7 @@ mime_filter_linewrap_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterLinewrapPrivate *priv; - priv = CAMEL_MIME_FILTER_LINEWRAP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_LINEWRAP (mime_filter)->priv; priv->nchars = 0; } @@ -164,8 +160,6 @@ camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterLinewrapPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_linewrap_filter; mime_filter_class->complete = mime_filter_linewrap_complete; @@ -175,7 +169,7 @@ camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *class) static void camel_mime_filter_linewrap_init (CamelMimeFilterLinewrap *filter) { - filter->priv = CAMEL_MIME_FILTER_LINEWRAP_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_linewrap_get_instance_private (filter); } CamelMimeFilter * @@ -188,7 +182,7 @@ camel_mime_filter_linewrap_new (guint preferred_len, CamelMimeFilterLinewrapPrivate *priv; filter = g_object_new (CAMEL_TYPE_MIME_FILTER_LINEWRAP, NULL); - priv = CAMEL_MIME_FILTER_LINEWRAP_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_LINEWRAP (filter)->priv; priv->indent = indent_char; priv->wrap_len = preferred_len; diff --git a/src/camel/camel-mime-filter-pgp.c b/src/camel/camel-mime-filter-pgp.c index ac29e26ed..562965933 100644 --- a/src/camel/camel-mime-filter-pgp.c +++ b/src/camel/camel-mime-filter-pgp.c @@ -29,10 +29,6 @@ #include "camel-mime-filter-pgp.h" #include "camel-mime-utils.h" -#define CAMEL_MIME_FILTER_PGP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_PGP, CamelMimeFilterPgpPrivate)) - #define BEGIN_PGP_SIGNED_MESSAGE "-----BEGIN PGP SIGNED MESSAGE-----" #define BEGIN_PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----" #define END_PGP_SIGNATURE "-----END PGP SIGNATURE-----" @@ -52,7 +48,7 @@ enum { PGP_FOOTER }; -G_DEFINE_TYPE (CamelMimeFilterPgp, camel_mime_filter_pgp, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterPgp, camel_mime_filter_pgp, CAMEL_TYPE_MIME_FILTER) static void mime_filter_pgp_run (CamelMimeFilter *mime_filter, @@ -71,7 +67,7 @@ mime_filter_pgp_run (CamelMimeFilter *mime_filter, gboolean blank; gsize len; - priv = CAMEL_MIME_FILTER_PGP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_PGP (mime_filter)->priv; /* only need as much space as the input, we're stripping chars */ camel_mime_filter_set_size (mime_filter, inlen, FALSE); @@ -183,7 +179,7 @@ mime_filter_pgp_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterPgpPrivate *priv; - priv = CAMEL_MIME_FILTER_PGP_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_PGP (mime_filter)->priv; priv->state = PGP_PREFACE; } @@ -193,8 +189,6 @@ camel_mime_filter_pgp_class_init (CamelMimeFilterPgpClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterPgpPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_pgp_filter; mime_filter_class->complete = mime_filter_pgp_complete; @@ -204,7 +198,7 @@ camel_mime_filter_pgp_class_init (CamelMimeFilterPgpClass *class) static void camel_mime_filter_pgp_init (CamelMimeFilterPgp *filter) { - filter->priv = CAMEL_MIME_FILTER_PGP_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_pgp_get_instance_private (filter); } CamelMimeFilter * diff --git a/src/camel/camel-mime-filter-progress.c b/src/camel/camel-mime-filter-progress.c index 08921f328..16f853d14 100644 --- a/src/camel/camel-mime-filter-progress.c +++ b/src/camel/camel-mime-filter-progress.c @@ -25,10 +25,6 @@ #include "camel-mime-filter-progress.h" #include "camel-operation.h" -#define CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_PROGRESS, CamelMimeFilterProgressPrivate)) - #define d(x) #define w(x) @@ -38,14 +34,14 @@ struct _CamelMimeFilterProgressPrivate { gsize count; }; -G_DEFINE_TYPE (CamelMimeFilterProgress, camel_mime_filter_progress, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterProgress, camel_mime_filter_progress, CAMEL_TYPE_MIME_FILTER) static void mime_filter_progress_dispose (GObject *object) { CamelMimeFilterProgressPrivate *priv; - priv = CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_PROGRESS (object)->priv; if (priv->cancellable != NULL) { g_object_unref (priv->cancellable); @@ -68,7 +64,7 @@ mime_filter_progress_filter (CamelMimeFilter *mime_filter, CamelMimeFilterProgressPrivate *priv; gdouble percent; - priv = CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_PROGRESS (mime_filter)->priv; priv->count += len; if (priv->count < priv->total) @@ -102,7 +98,7 @@ mime_filter_progress_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterProgressPrivate *priv; - priv = CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_PROGRESS (mime_filter)->priv; priv->count = 0; } @@ -113,8 +109,6 @@ camel_mime_filter_progress_class_init (CamelMimeFilterProgressClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterProgressPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = mime_filter_progress_dispose; @@ -127,7 +121,7 @@ camel_mime_filter_progress_class_init (CamelMimeFilterProgressClass *class) static void camel_mime_filter_progress_init (CamelMimeFilterProgress *filter) { - filter->priv = CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_progress_get_instance_private (filter); } /** @@ -152,7 +146,7 @@ camel_mime_filter_progress_new (GCancellable *cancellable, CamelMimeFilterProgressPrivate *priv; filter = g_object_new (CAMEL_TYPE_MIME_FILTER_PROGRESS, NULL); - priv = CAMEL_MIME_FILTER_PROGRESS_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_PROGRESS (filter)->priv; if (CAMEL_IS_OPERATION (cancellable)) priv->cancellable = g_object_ref (cancellable); diff --git a/src/camel/camel-mime-filter-tohtml.c b/src/camel/camel-mime-filter-tohtml.c index cbdfbb6ad..7fce56238 100644 --- a/src/camel/camel-mime-filter-tohtml.c +++ b/src/camel/camel-mime-filter-tohtml.c @@ -26,10 +26,6 @@ #include "camel-url-scanner.h" #include "camel-utf8.h" -#define CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_TOHTML, CamelMimeFilterToHTMLPrivate)) - struct _CamelMimeFilterToHTMLPrivate { CamelUrlScanner *scanner; @@ -80,7 +76,7 @@ static struct { { CONVERT_ADDRSPEC, { "@", "mailto:", camel_url_addrspec_start, camel_url_addrspec_end } }, }; -G_DEFINE_TYPE (CamelMimeFilterToHTML, camel_mime_filter_tohtml, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterToHTML, camel_mime_filter_tohtml, CAMEL_TYPE_MIME_FILTER) static gchar * check_size (CamelMimeFilter *mime_filter, @@ -173,7 +169,7 @@ writeln (CamelMimeFilter *mime_filter, const guchar *inptr, *inend, *inbegin; gchar *in_utf8 = NULL; - priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_TOHTML (mime_filter)->priv; if (!g_utf8_validate (in_anycharset, inend_char - in_anycharset, NULL)) { in_utf8 = camel_utf8_make_valid_len (in_anycharset, inend_char - in_anycharset); @@ -278,7 +274,7 @@ html_convert (CamelMimeFilter *mime_filter, const gchar *inend; gint depth; - priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_TOHTML (mime_filter)->priv; if (inlen == 0) { if (!priv->pre_open && priv->blockquote_depth == 0) { @@ -504,7 +500,7 @@ mime_filter_tohtml_finalize (GObject *object) { CamelMimeFilterToHTMLPrivate *priv; - priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_TOHTML (object)->priv; camel_url_scanner_free (priv->scanner); @@ -545,7 +541,7 @@ mime_filter_tohtml_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterToHTMLPrivate *priv; - priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_TOHTML (mime_filter)->priv; priv->column = 0; priv->pre_open = FALSE; @@ -557,8 +553,6 @@ camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *class) GObjectClass *object_class; CamelMimeFilterClass *filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterToHTMLPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = mime_filter_tohtml_finalize; @@ -571,7 +565,7 @@ camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *class) static void camel_mime_filter_tohtml_init (CamelMimeFilterToHTML *filter) { - filter->priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_tohtml_get_instance_private (filter); filter->priv->scanner = camel_url_scanner_new (); } @@ -594,7 +588,7 @@ camel_mime_filter_tohtml_new (CamelMimeFilterToHTMLFlags flags, gint i; filter = g_object_new (CAMEL_TYPE_MIME_FILTER_TOHTML, NULL); - priv = CAMEL_MIME_FILTER_TOHTML_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_TOHTML (filter)->priv; priv->flags = flags; priv->color = color; diff --git a/src/camel/camel-mime-filter-windows.c b/src/camel/camel-mime-filter-windows.c index d2358a11a..9163f92e8 100644 --- a/src/camel/camel-mime-filter-windows.c +++ b/src/camel/camel-mime-filter-windows.c @@ -26,10 +26,6 @@ #include "camel-charset-map.h" #include "camel-mime-filter-windows.h" -#define CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_WINDOWS, CamelMimeFilterWindowsPrivate)) - #define d(x) #define w(x) @@ -38,14 +34,14 @@ struct _CamelMimeFilterWindowsPrivate { gchar *claimed_charset; }; -G_DEFINE_TYPE (CamelMimeFilterWindows, camel_mime_filter_windows, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterWindows, camel_mime_filter_windows, CAMEL_TYPE_MIME_FILTER) static void mime_filter_windows_finalize (GObject *object) { CamelMimeFilterWindowsPrivate *priv; - priv = CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE (object); + priv = CAMEL_MIME_FILTER_WINDOWS (object)->priv; g_free (priv->claimed_charset); @@ -66,7 +62,7 @@ mime_filter_windows_filter (CamelMimeFilter *mime_filter, register guchar *inptr; guchar *inend; - priv = CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_WINDOWS (mime_filter)->priv; if (!priv->is_windows) { inptr = (guchar *) in; @@ -110,7 +106,7 @@ mime_filter_windows_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterWindowsPrivate *priv; - priv = CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_WINDOWS (mime_filter)->priv; priv->is_windows = FALSE; } @@ -121,8 +117,6 @@ camel_mime_filter_windows_class_init (CamelMimeFilterWindowsClass *class) GObjectClass *object_class; CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterWindowsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = mime_filter_windows_finalize; @@ -135,7 +129,7 @@ camel_mime_filter_windows_class_init (CamelMimeFilterWindowsClass *class) static void camel_mime_filter_windows_init (CamelMimeFilterWindows *filter) { - filter->priv = CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_windows_get_instance_private (filter); } /** @@ -156,7 +150,7 @@ camel_mime_filter_windows_new (const gchar *claimed_charset) g_return_val_if_fail (claimed_charset != NULL, NULL); filter = g_object_new (CAMEL_TYPE_MIME_FILTER_WINDOWS, NULL); - priv = CAMEL_MIME_FILTER_WINDOWS_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_WINDOWS (filter)->priv; priv->claimed_charset = g_strdup (claimed_charset); diff --git a/src/camel/camel-mime-filter-yenc.c b/src/camel/camel-mime-filter-yenc.c index 4c16508fa..2f658f306 100644 --- a/src/camel/camel-mime-filter-yenc.c +++ b/src/camel/camel-mime-filter-yenc.c @@ -23,10 +23,6 @@ #include "camel-mime-filter-yenc.h" -#define CAMEL_MIME_FILTER_YENC_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER_YENC, CamelMimeFilterYencPrivate)) - struct _CamelMimeFilterYencPrivate { CamelMimeFilterYencDirection direction; @@ -38,7 +34,7 @@ struct _CamelMimeFilterYencPrivate { guint32 crc; }; -G_DEFINE_TYPE (CamelMimeFilterYenc, camel_mime_filter_yenc, CAMEL_TYPE_MIME_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeFilterYenc, camel_mime_filter_yenc, CAMEL_TYPE_MIME_FILTER) /* here we do all of the basic yEnc filtering */ static void @@ -53,7 +49,7 @@ mime_filter_yenc_filter (CamelMimeFilter *mime_filter, CamelMimeFilterYencPrivate *priv; gsize newlen = 0; - priv = CAMEL_MIME_FILTER_YENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_YENC (mime_filter)->priv; switch (priv->direction) { case CAMEL_MIME_FILTER_YENC_DIRECTION_ENCODE: @@ -162,7 +158,7 @@ mime_filter_yenc_complete (CamelMimeFilter *mime_filter, CamelMimeFilterYencPrivate *priv; gsize newlen = 0; - priv = CAMEL_MIME_FILTER_YENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_YENC (mime_filter)->priv; switch (priv->direction) { case CAMEL_MIME_FILTER_YENC_DIRECTION_ENCODE: @@ -204,7 +200,7 @@ mime_filter_yenc_reset (CamelMimeFilter *mime_filter) { CamelMimeFilterYencPrivate *priv; - priv = CAMEL_MIME_FILTER_YENC_GET_PRIVATE (mime_filter); + priv = CAMEL_MIME_FILTER_YENC (mime_filter)->priv; switch (priv->direction) { case CAMEL_MIME_FILTER_YENC_DIRECTION_ENCODE: @@ -224,8 +220,6 @@ camel_mime_filter_yenc_class_init (CamelMimeFilterYencClass *class) { CamelMimeFilterClass *mime_filter_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterYencPrivate)); - mime_filter_class = CAMEL_MIME_FILTER_CLASS (class); mime_filter_class->filter = mime_filter_yenc_filter; mime_filter_class->complete = mime_filter_yenc_complete; @@ -235,7 +229,7 @@ camel_mime_filter_yenc_class_init (CamelMimeFilterYencClass *class) static void camel_mime_filter_yenc_init (CamelMimeFilterYenc *filter) { - filter->priv = CAMEL_MIME_FILTER_YENC_GET_PRIVATE (filter); + filter->priv = camel_mime_filter_yenc_get_instance_private (filter); filter->priv->part = 0; filter->priv->pcrc = CAMEL_MIME_YENCODE_CRC_INIT; @@ -257,7 +251,7 @@ camel_mime_filter_yenc_new (CamelMimeFilterYencDirection direction) CamelMimeFilterYencPrivate *priv; filter = g_object_new (CAMEL_TYPE_MIME_FILTER_YENC, NULL); - priv = CAMEL_MIME_FILTER_YENC_GET_PRIVATE (filter); + priv = CAMEL_MIME_FILTER_YENC (filter)->priv; priv->direction = direction; diff --git a/src/camel/camel-mime-filter.c b/src/camel/camel-mime-filter.c index 2b4918c5b..2b6c57914 100644 --- a/src/camel/camel-mime-filter.c +++ b/src/camel/camel-mime-filter.c @@ -27,10 +27,6 @@ #include <mcheck.h> #endif -#define CAMEL_MIME_FILTER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_FILTER, CamelMimeFilterPrivate)) - struct _CamelMimeFilterPrivate { gchar *inbuf; gsize inlen; @@ -48,7 +44,7 @@ typedef void (*FilterMethod) (CamelMimeFilter *filter, #define PRE_HEAD (64) #define BACK_HEAD (64) -G_DEFINE_ABSTRACT_TYPE (CamelMimeFilter, camel_mime_filter, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelMimeFilter, camel_mime_filter, G_TYPE_OBJECT) static void mime_filter_finalize (GObject *object) @@ -82,8 +78,6 @@ camel_mime_filter_class_init (CamelMimeFilterClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMimeFilterPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = mime_filter_finalize; @@ -93,7 +87,7 @@ camel_mime_filter_class_init (CamelMimeFilterClass *class) static void camel_mime_filter_init (CamelMimeFilter *mime_filter) { - mime_filter->priv = CAMEL_MIME_FILTER_GET_PRIVATE (mime_filter); + mime_filter->priv = camel_mime_filter_get_instance_private (mime_filter); mime_filter->outreal = NULL; mime_filter->outbuf = NULL; @@ -161,7 +155,7 @@ filter_run (CamelMimeFilter *f, struct _CamelMimeFilterPrivate *p; gint newlen; - p = CAMEL_MIME_FILTER_GET_PRIVATE (f); + p = CAMEL_MIME_FILTER (f)->priv; newlen = len + prespace + f->backlen; if (p->inlen < newlen) { diff --git a/src/camel/camel-mime-message.c b/src/camel/camel-mime-message.c index 3f55197cd..ae951bb7c 100644 --- a/src/camel/camel-mime-message.c +++ b/src/camel/camel-mime-message.c @@ -95,7 +95,7 @@ static const gchar *recipient_names[] = { static GHashTable *header_name_table; -G_DEFINE_TYPE (CamelMimeMessage, camel_mime_message, CAMEL_TYPE_MIME_PART) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimeMessage, camel_mime_message, CAMEL_TYPE_MIME_PART) /* FIXME: check format of fields. */ static gboolean @@ -374,8 +374,6 @@ camel_mime_message_class_init (CamelMimeMessageClass *class) CamelMediumClass *medium_class; gint ii; - g_type_class_add_private (class, sizeof (CamelMimeMessagePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = mime_message_dispose; object_class->finalize = mime_message_finalize; @@ -408,7 +406,7 @@ camel_mime_message_init (CamelMimeMessage *mime_message) { gint ii; - mime_message->priv = G_TYPE_INSTANCE_GET_PRIVATE (mime_message, CAMEL_TYPE_MIME_MESSAGE, CamelMimeMessagePrivate); + mime_message->priv = camel_mime_message_get_instance_private (mime_message); mime_message->priv->recipients = g_hash_table_new ( camel_strcase_hash, camel_strcase_equal); diff --git a/src/camel/camel-mime-part.c b/src/camel/camel-mime-part.c index ad40c8a83..c5b4ad52c 100644 --- a/src/camel/camel-mime-part.c +++ b/src/camel/camel-mime-part.c @@ -45,10 +45,6 @@ #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ -#define CAMEL_MIME_PART_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MIME_PART, CamelMimePartPrivate)) - typedef struct _AsyncContext AsyncContext; struct _CamelMimePartPrivate { @@ -92,7 +88,7 @@ typedef enum { static GHashTable *header_name_table; static GHashTable *header_formatted_table; -G_DEFINE_TYPE (CamelMimePart, camel_mime_part, CAMEL_TYPE_MEDIUM) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMimePart, camel_mime_part, CAMEL_TYPE_MEDIUM) static void async_context_free (AsyncContext *async_context) @@ -446,7 +442,7 @@ mime_part_finalize (GObject *object) { CamelMimePartPrivate *priv; - priv = CAMEL_MIME_PART_GET_PRIVATE (object); + priv = CAMEL_MIME_PART (object)->priv; g_free (priv->description); g_free (priv->content_id); @@ -1015,8 +1011,6 @@ camel_mime_part_class_init (CamelMimePartClass *class) CamelMediumClass *medium_class; CamelDataWrapperClass *data_wrapper_class; - g_type_class_add_private (class, sizeof (CamelMimePartPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = mime_part_set_property; object_class->get_property = mime_part_get_property; @@ -1091,7 +1085,7 @@ camel_mime_part_init (CamelMimePart *mime_part) { CamelDataWrapper *data_wrapper; - mime_part->priv = CAMEL_MIME_PART_GET_PRIVATE (mime_part); + mime_part->priv = camel_mime_part_get_instance_private (mime_part); mime_part->priv->encoding = CAMEL_TRANSFER_ENCODING_DEFAULT; mime_part->priv->headers = camel_name_value_array_new (); diff --git a/src/camel/camel-multipart-signed.c b/src/camel/camel-multipart-signed.c index 6167e1db4..216847843 100644 --- a/src/camel/camel-multipart-signed.c +++ b/src/camel/camel-multipart-signed.c @@ -38,10 +38,6 @@ #include "camel-stream-filter.h" #include "camel-stream-mem.h" -#define CAMEL_MULTIPART_SIGNED_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MULTIPART_SIGNED, CamelMultipartSignedPrivate)) - struct _CamelMultipartSignedPrivate { /* These are the client visible parts, * decoded forms of our data wrapper content. */ @@ -61,7 +57,7 @@ struct _CamelMultipartSignedPrivate { goffset start2, end2; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelMultipartSigned, camel_multipart_signed, CAMEL_TYPE_MULTIPART) @@ -226,7 +222,7 @@ multipart_signed_dispose (GObject *object) { CamelMultipartSignedPrivate *priv; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (object); + priv = CAMEL_MULTIPART_SIGNED (object)->priv; g_clear_object (&priv->content); g_clear_object (&priv->signature); @@ -252,7 +248,7 @@ multipart_signed_write_to_stream_sync (CamelDataWrapper *data_wrapper, gssize count; gchar *content; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART_SIGNED (data_wrapper)->priv; byte_array = camel_data_wrapper_get_byte_array (data_wrapper); @@ -367,7 +363,7 @@ multipart_signed_construct_from_stream_sync (CamelDataWrapper *data_wrapper, CamelDataWrapperClass *parent_class; gboolean success; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART_SIGNED (data_wrapper)->priv; /* Chain up to parent's construct_from_stream_sync() method. */ parent_class = CAMEL_DATA_WRAPPER_CLASS ( @@ -403,7 +399,7 @@ multipart_signed_write_to_output_stream_sync (CamelDataWrapper *data_wrapper, gchar *content; gboolean success; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART_SIGNED (data_wrapper)->priv; byte_array = camel_data_wrapper_get_byte_array (data_wrapper); @@ -534,7 +530,7 @@ multipart_signed_construct_from_input_stream_sync (CamelDataWrapper *data_wrappe { CamelMultipartSignedPrivate *priv; gboolean success; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART_SIGNED (data_wrapper)->priv; /* Chain up to parent's construct_from_input_stream_sync() method. */ success = CAMEL_DATA_WRAPPER_CLASS ( @@ -668,7 +664,7 @@ multipart_signed_construct_from_parser (CamelMultipart *multipart, gchar *buf; gsize len; - priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (multipart); + priv = CAMEL_MULTIPART_SIGNED (multipart)->priv; /* we *must not* be in multipart state, otherwise the mime parser will * parse the headers which is a no no @#$@# stupid multipart/signed spec */ @@ -707,8 +703,6 @@ camel_multipart_signed_class_init (CamelMultipartSignedClass *class) CamelDataWrapperClass *data_wrapper_class; CamelMultipartClass *multipart_class; - g_type_class_add_private (class, sizeof (CamelMultipartSignedPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = multipart_signed_dispose; @@ -730,7 +724,7 @@ camel_multipart_signed_class_init (CamelMultipartSignedClass *class) static void camel_multipart_signed_init (CamelMultipartSigned *multipart) { - multipart->priv = CAMEL_MULTIPART_SIGNED_GET_PRIVATE (multipart); + multipart->priv = camel_multipart_signed_get_instance_private (multipart); camel_data_wrapper_set_mime_type ( CAMEL_DATA_WRAPPER (multipart), "multipart/signed"); diff --git a/src/camel/camel-multipart.c b/src/camel/camel-multipart.c index c59b8db15..ae60d31c3 100644 --- a/src/camel/camel-multipart.c +++ b/src/camel/camel-multipart.c @@ -29,24 +29,20 @@ #include "camel-multipart.h" #include "camel-stream-mem.h" -#define CAMEL_MULTIPART_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MULTIPART, CamelMultipartPrivate)) - struct _CamelMultipartPrivate { GPtrArray *parts; gchar *preface; gchar *postface; }; -G_DEFINE_TYPE (CamelMultipart, camel_multipart, CAMEL_TYPE_DATA_WRAPPER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMultipart, camel_multipart, CAMEL_TYPE_DATA_WRAPPER) static void multipart_dispose (GObject *object) { CamelMultipartPrivate *priv; - priv = CAMEL_MULTIPART_GET_PRIVATE (object); + priv = CAMEL_MULTIPART (object)->priv; g_ptr_array_set_size (priv->parts, 0); @@ -59,7 +55,7 @@ multipart_finalize (GObject *object) { CamelMultipartPrivate *priv; - priv = CAMEL_MULTIPART_GET_PRIVATE (object); + priv = CAMEL_MULTIPART (object)->priv; g_ptr_array_unref (priv->parts); @@ -77,7 +73,7 @@ multipart_is_offline (CamelDataWrapper *data_wrapper) CamelDataWrapper *part; guint ii; - priv = CAMEL_MULTIPART_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART (data_wrapper)->priv; /* Chain up to parent's is_offline() method. */ if (CAMEL_DATA_WRAPPER_CLASS (camel_multipart_parent_class)->is_offline (data_wrapper)) @@ -106,7 +102,7 @@ multipart_write_to_stream_sync (CamelDataWrapper *data_wrapper, gssize count; guint ii; - priv = CAMEL_MULTIPART_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART (data_wrapper)->priv; /* get the bundary text */ boundary = camel_multipart_get_boundary ( @@ -188,7 +184,7 @@ multipart_write_to_output_stream_sync (CamelDataWrapper *data_wrapper, gboolean success; guint ii; - priv = CAMEL_MULTIPART_GET_PRIVATE (data_wrapper); + priv = CAMEL_MULTIPART (data_wrapper)->priv; /* get the bundary text */ boundary = camel_multipart_get_boundary ( @@ -384,8 +380,6 @@ camel_multipart_class_init (CamelMultipartClass *class) GObjectClass *object_class; CamelDataWrapperClass *data_wrapper_class; - g_type_class_add_private (class, sizeof (CamelMultipartPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = multipart_dispose; object_class->finalize = multipart_finalize; @@ -408,7 +402,7 @@ camel_multipart_class_init (CamelMultipartClass *class) static void camel_multipart_init (CamelMultipart *multipart) { - multipart->priv = CAMEL_MULTIPART_GET_PRIVATE (multipart); + multipart->priv = camel_multipart_get_instance_private (multipart); multipart->priv->parts = g_ptr_array_new_with_free_func (g_object_unref); diff --git a/src/camel/camel-nntp-address.c b/src/camel/camel-nntp-address.c index fa58129aa..ae0723052 100644 --- a/src/camel/camel-nntp-address.c +++ b/src/camel/camel-nntp-address.c @@ -28,7 +28,7 @@ struct _CamelNNTPAddressPrivate { GPtrArray *addresses; }; -G_DEFINE_TYPE (CamelNNTPAddress, camel_nntp_address, CAMEL_TYPE_ADDRESS) +G_DEFINE_TYPE_WITH_PRIVATE (CamelNNTPAddress, camel_nntp_address, CAMEL_TYPE_ADDRESS) static gint nntp_address_length (CamelAddress *paddr) @@ -134,8 +134,6 @@ camel_nntp_address_class_init (CamelNNTPAddressClass *class) CamelAddressClass *address_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelNNTPAddressPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = nntp_address_finalize; @@ -152,7 +150,7 @@ camel_nntp_address_class_init (CamelNNTPAddressClass *class) static void camel_nntp_address_init (CamelNNTPAddress *nntp_address) { - nntp_address->priv = G_TYPE_INSTANCE_GET_PRIVATE (nntp_address, CAMEL_TYPE_NNTP_ADDRESS, CamelNNTPAddressPrivate); + nntp_address->priv = camel_nntp_address_get_instance_private (nntp_address); nntp_address->priv->addresses = g_ptr_array_new (); } diff --git a/src/camel/camel-null-output-stream.c b/src/camel/camel-null-output-stream.c index 37b034c1b..3d119c84f 100644 --- a/src/camel/camel-null-output-stream.c +++ b/src/camel/camel-null-output-stream.c @@ -29,17 +29,13 @@ #include "camel-null-output-stream.h" -#define CAMEL_NULL_OUTPUT_STREAM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_NULL_OUTPUT_STREAM, CamelNullOutputStreamPrivate)) - struct _CamelNullOutputStreamPrivate { gsize bytes_written; gboolean ends_with_crlf; gboolean ends_with_cr; /* Just for cases when the CRLF is split into two writes, CR and LF */ }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelNullOutputStream, camel_null_output_stream, G_TYPE_OUTPUT_STREAM) @@ -54,7 +50,7 @@ null_output_stream_write (GOutputStream *stream, CamelNullOutputStreamPrivate *priv; const guchar *data = buffer; - priv = CAMEL_NULL_OUTPUT_STREAM_GET_PRIVATE (stream); + priv = CAMEL_NULL_OUTPUT_STREAM (stream)->priv; priv->bytes_written += count; @@ -74,9 +70,6 @@ camel_null_output_stream_class_init (CamelNullOutputStreamClass *class) { GOutputStreamClass *stream_class; - g_type_class_add_private ( - class, sizeof (CamelNullOutputStreamPrivate)); - stream_class = G_OUTPUT_STREAM_CLASS (class); stream_class->write_fn = null_output_stream_write; } @@ -84,7 +77,7 @@ camel_null_output_stream_class_init (CamelNullOutputStreamClass *class) static void camel_null_output_stream_init (CamelNullOutputStream *null_stream) { - null_stream->priv = CAMEL_NULL_OUTPUT_STREAM_GET_PRIVATE (null_stream); + null_stream->priv = camel_null_output_stream_get_instance_private (null_stream); null_stream->priv->ends_with_crlf = FALSE; null_stream->priv->ends_with_cr = FALSE; } diff --git a/src/camel/camel-object.c b/src/camel/camel-object.c index 6dbae762f..09f7dda58 100644 --- a/src/camel/camel-object.c +++ b/src/camel/camel-object.c @@ -32,10 +32,6 @@ #define d(x) -#define CAMEL_OBJECT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_OBJECT, CamelObjectPrivate)) - struct _CamelObjectPrivate { gchar *state_filename; }; @@ -45,7 +41,7 @@ enum { PROP_STATE_FILENAME }; -G_DEFINE_ABSTRACT_TYPE (CamelObject, camel_object, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelObject, camel_object, G_TYPE_OBJECT) /* State file for CamelObject data. * Any later versions should only append data. @@ -129,7 +125,7 @@ object_finalize (GObject *object) { CamelObjectPrivate *priv; - priv = CAMEL_OBJECT_GET_PRIVATE (object); + priv = CAMEL_OBJECT (object)->priv; g_free (priv->state_filename); @@ -387,8 +383,6 @@ camel_object_class_init (CamelObjectClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelObjectPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = object_set_property; object_class->get_property = object_get_property; @@ -420,7 +414,7 @@ camel_object_class_init (CamelObjectClass *class) static void camel_object_init (CamelObject *object) { - object->priv = CAMEL_OBJECT_GET_PRIVATE (object); + object->priv = camel_object_get_instance_private (object); } G_DEFINE_QUARK (camel-error-quark, camel_error) diff --git a/src/camel/camel-offline-folder.c b/src/camel/camel-offline-folder.c index b0c95c6a6..abaf7bd6a 100644 --- a/src/camel/camel-offline-folder.c +++ b/src/camel/camel-offline-folder.c @@ -31,10 +31,6 @@ #include "camel-string-utils.h" #include "camel-utils.h" -#define CAMEL_OFFLINE_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_OFFLINE_FOLDER, CamelOfflineFolderPrivate)) - typedef struct _AsyncContext AsyncContext; typedef struct _OfflineDownsyncData OfflineDownsyncData; @@ -65,7 +61,7 @@ enum { PROP_OFFLINE_SYNC = 0x2400 }; -G_DEFINE_TYPE (CamelOfflineFolder, camel_offline_folder, CAMEL_TYPE_FOLDER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelOfflineFolder, camel_offline_folder, CAMEL_TYPE_FOLDER) static void async_context_free (AsyncContext *async_context) @@ -627,8 +623,6 @@ camel_offline_folder_class_init (CamelOfflineFolderClass *class) GObjectClass *object_class; CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelOfflineFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = offline_folder_set_property; object_class->get_property = offline_folder_get_property; @@ -657,7 +651,7 @@ camel_offline_folder_class_init (CamelOfflineFolderClass *class) static void camel_offline_folder_init (CamelOfflineFolder *folder) { - folder->priv = CAMEL_OFFLINE_FOLDER_GET_PRIVATE (folder); + folder->priv = camel_offline_folder_get_instance_private (folder); g_mutex_init (&folder->priv->store_changes_lock); g_mutex_init (&folder->priv->ongoing_downloads_lock); diff --git a/src/camel/camel-offline-settings.c b/src/camel/camel-offline-settings.c index 098629035..ab41ffcb2 100644 --- a/src/camel/camel-offline-settings.c +++ b/src/camel/camel-offline-settings.c @@ -22,10 +22,6 @@ #include "camel-offline-settings.h" -#define CAMEL_OFFLINE_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_OFFLINE_SETTINGS, CamelOfflineSettingsPrivate)) - struct _CamelOfflineSettingsPrivate { gboolean stay_synchronized; gint store_changes_interval; @@ -43,7 +39,7 @@ enum { PROP_LIMIT_VALUE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelOfflineSettings, camel_offline_settings, CAMEL_TYPE_STORE_SETTINGS) @@ -140,8 +136,6 @@ camel_offline_settings_class_init (CamelOfflineSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelOfflineSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = offline_settings_set_property; object_class->get_property = offline_settings_get_property; @@ -220,7 +214,7 @@ camel_offline_settings_class_init (CamelOfflineSettingsClass *class) static void camel_offline_settings_init (CamelOfflineSettings *settings) { - settings->priv = CAMEL_OFFLINE_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_offline_settings_get_instance_private (settings); } /** diff --git a/src/camel/camel-offline-store.c b/src/camel/camel-offline-store.c index 09f8b54cc..d58c3e2de 100644 --- a/src/camel/camel-offline-store.c +++ b/src/camel/camel-offline-store.c @@ -29,10 +29,6 @@ #include "camel-offline-store.h" #include "camel-session.h" -#define CAMEL_OFFLINE_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStorePrivate)) - struct _CamelOfflineStorePrivate { /* XXX The online flag stores whether the user has selected online or * offline mode, but fetching the flag through the "get" function @@ -48,7 +44,7 @@ enum { PROP_ONLINE }; -G_DEFINE_TYPE (CamelOfflineStore, camel_offline_store, CAMEL_TYPE_STORE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelOfflineStore, camel_offline_store, CAMEL_TYPE_STORE) static void offline_store_downsync_folders_sync (CamelStore *store, @@ -120,7 +116,7 @@ offline_store_constructed (GObject *object) CamelOfflineStorePrivate *priv; CamelSession *session; - priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (object); + priv = CAMEL_OFFLINE_STORE (object)->priv; /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (camel_offline_store_parent_class)->constructed (object); @@ -169,8 +165,6 @@ camel_offline_store_class_init (CamelOfflineStoreClass *class) GObjectClass *object_class; CamelServiceClass *service_class; - g_type_class_add_private (class, sizeof (CamelOfflineStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = offline_store_constructed; object_class->get_property = offline_store_get_property; @@ -193,7 +187,7 @@ camel_offline_store_class_init (CamelOfflineStoreClass *class) static void camel_offline_store_init (CamelOfflineStore *store) { - store->priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (store); + store->priv = camel_offline_store_get_instance_private (store); } /** diff --git a/src/camel/camel-operation.c b/src/camel/camel-operation.c index f0c9d830d..3e174d103 100644 --- a/src/camel/camel-operation.c +++ b/src/camel/camel-operation.c @@ -26,10 +26,6 @@ #include "camel-msgport.h" #include "camel-operation.h" -#define CAMEL_OPERATION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_OPERATION, CamelOperationPrivate)) - #define PROGRESS_DELAY 250 /* milliseconds */ #define TRANSIENT_DELAY 250 /* milliseconds */ #define POP_MESSAGE_DELAY 1 /* seconds */ @@ -66,7 +62,7 @@ static GQueue operation_list = G_QUEUE_INIT; static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE (CamelOperation, camel_operation, G_TYPE_CANCELLABLE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelOperation, camel_operation, G_TYPE_CANCELLABLE) static StatusNode * status_node_new (void) @@ -152,7 +148,7 @@ operation_dispose (GObject *object) { CamelOperationPrivate *priv; - priv = CAMEL_OPERATION_GET_PRIVATE (object); + priv = CAMEL_OPERATION (object)->priv; LOCK (); @@ -183,8 +179,6 @@ camel_operation_class_init (CamelOperationClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelOperationPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = operation_dispose; @@ -228,7 +222,7 @@ camel_operation_class_init (CamelOperationClass *class) static void camel_operation_init (CamelOperation *operation) { - operation->priv = CAMEL_OPERATION_GET_PRIVATE (operation); + operation->priv = camel_operation_get_instance_private (operation); g_queue_init (&operation->priv->status_stack); operation->priv->proxying = NULL; @@ -290,7 +284,7 @@ camel_operation_new_proxy (GCancellable *cancellable) if (!G_IS_CANCELLABLE (cancellable)) return operation; - priv = CAMEL_OPERATION_GET_PRIVATE (operation); + priv = CAMEL_OPERATION (operation)->priv; g_return_val_if_fail (priv != NULL, operation); priv->proxying = g_object_ref (cancellable); diff --git a/src/camel/camel-partition-table.c b/src/camel/camel-partition-table.c index 1e5659b93..ad3415416 100644 --- a/src/camel/camel-partition-table.c +++ b/src/camel/camel-partition-table.c @@ -43,10 +43,6 @@ #define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock) \ (g_mutex_unlock (&(kf)->priv->lock)) -#define CAMEL_PARTITION_TABLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTablePrivate)) - struct _CamelPartitionTablePrivate { GMutex lock; /* for locking partition */ @@ -57,7 +53,7 @@ struct _CamelPartitionTablePrivate { GQueue partition; }; -G_DEFINE_TYPE (CamelPartitionTable, camel_partition_table, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelPartitionTable, camel_partition_table, G_TYPE_OBJECT) static void partition_table_finalize (GObject *object) @@ -86,8 +82,6 @@ camel_partition_table_class_init (CamelPartitionTableClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelPartitionTablePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = partition_table_finalize; } @@ -95,7 +89,7 @@ camel_partition_table_class_init (CamelPartitionTableClass *class) static void camel_partition_table_init (CamelPartitionTable *cpi) { - cpi->priv = CAMEL_PARTITION_TABLE_GET_PRIVATE (cpi); + cpi->priv = camel_partition_table_get_instance_private (cpi); g_queue_init (&cpi->priv->partition); g_mutex_init (&cpi->priv->lock); @@ -619,10 +613,6 @@ fail: /* ********************************************************************** */ -#define CAMEL_KEY_TABLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_KEY_TABLE, CamelKeyTablePrivate)) - #define CAMEL_KEY_TABLE_LOCK(kf, lock) \ (g_mutex_lock (&(kf)->priv->lock)) #define CAMEL_KEY_TABLE_UNLOCK(kf, lock) \ @@ -639,7 +629,7 @@ struct _CamelKeyTablePrivate { CamelBlock *root_block; }; -G_DEFINE_TYPE (CamelKeyTable, camel_key_table, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelKeyTable, camel_key_table, G_TYPE_OBJECT) static void key_table_finalize (GObject *object) @@ -666,8 +656,6 @@ camel_key_table_class_init (CamelKeyTableClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelKeyTablePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = key_table_finalize; } @@ -675,7 +663,7 @@ camel_key_table_class_init (CamelKeyTableClass *class) static void camel_key_table_init (CamelKeyTable *table) { - table->priv = CAMEL_KEY_TABLE_GET_PRIVATE (table); + table->priv = camel_key_table_get_instance_private (table); g_mutex_init (&table->priv->lock); } diff --git a/src/camel/camel-sasl-anonymous.c b/src/camel/camel-sasl-anonymous.c index ca0f98c14..7672f29c3 100644 --- a/src/camel/camel-sasl-anonymous.c +++ b/src/camel/camel-sasl-anonymous.c @@ -40,7 +40,7 @@ static CamelServiceAuthType sasl_anonymous_auth_type = { FALSE }; -G_DEFINE_TYPE (CamelSaslAnonymous, camel_sasl_anonymous, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslAnonymous, camel_sasl_anonymous, CAMEL_TYPE_SASL) static void sasl_anonymous_finalize (GObject *object) @@ -126,8 +126,6 @@ camel_sasl_anonymous_class_init (CamelSaslAnonymousClass *class) GObjectClass *object_class; CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslAnonymousPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = sasl_anonymous_finalize; @@ -139,7 +137,7 @@ camel_sasl_anonymous_class_init (CamelSaslAnonymousClass *class) static void camel_sasl_anonymous_init (CamelSaslAnonymous *sasl_anonymous) { - sasl_anonymous->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl_anonymous, CAMEL_TYPE_SASL_ANONYMOUS, CamelSaslAnonymousPrivate); + sasl_anonymous->priv = camel_sasl_anonymous_get_instance_private (sasl_anonymous); } /** diff --git a/src/camel/camel-sasl-cram-md5.c b/src/camel/camel-sasl-cram-md5.c index 3ca12b675..3564465ce 100644 --- a/src/camel/camel-sasl-cram-md5.c +++ b/src/camel/camel-sasl-cram-md5.c @@ -29,10 +29,6 @@ #include "camel-sasl-cram-md5.h" #include "camel-service.h" -#define CAMEL_SASL_CRAM_MD5_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5Private)) - struct _CamelSaslCramMd5Private { gint placeholder; /* allow for future expansion */ }; @@ -47,7 +43,7 @@ static CamelServiceAuthType sasl_cram_md5_auth_type = { TRUE }; -G_DEFINE_TYPE (CamelSaslCramMd5, camel_sasl_cram_md5, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslCramMd5, camel_sasl_cram_md5, CAMEL_TYPE_SASL) /* CRAM-MD5 algorithm: * MD5 ((passwd XOR opad), MD5 ((passwd XOR ipad), timestamp)) @@ -149,8 +145,6 @@ camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *class) { CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslCramMd5Private)); - sasl_class = CAMEL_SASL_CLASS (class); sasl_class->auth_type = &sasl_cram_md5_auth_type; sasl_class->challenge_sync = sasl_cram_md5_challenge_sync; @@ -159,5 +153,5 @@ camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *class) static void camel_sasl_cram_md5_init (CamelSaslCramMd5 *sasl) { - sasl->priv = CAMEL_SASL_CRAM_MD5_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_cram_md5_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl-digest-md5.c b/src/camel/camel-sasl-digest-md5.c index d5b34fefd..1540bb9cc 100644 --- a/src/camel/camel-sasl-digest-md5.c +++ b/src/camel/camel-sasl-digest-md5.c @@ -44,10 +44,6 @@ #define PARANOID(x) x -#define CAMEL_SASL_DIGEST_MD5_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5Private)) - /* Implements rfc2831 */ static CamelServiceAuthType sasl_digest_md5_auth_type = { @@ -167,7 +163,7 @@ struct _CamelSaslDigestMd5Private { gint state; }; -G_DEFINE_TYPE (CamelSaslDigestMd5, camel_sasl_digest_md5, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslDigestMd5, camel_sasl_digest_md5, CAMEL_TYPE_SASL) static void decode_lwsp (const gchar **in) @@ -966,8 +962,6 @@ camel_sasl_digest_md5_class_init (CamelSaslDigestMd5Class *class) GObjectClass *object_class; CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslDigestMd5Private)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = sasl_digest_md5_finalize; @@ -979,5 +973,5 @@ camel_sasl_digest_md5_class_init (CamelSaslDigestMd5Class *class) static void camel_sasl_digest_md5_init (CamelSaslDigestMd5 *sasl) { - sasl->priv = CAMEL_SASL_DIGEST_MD5_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_digest_md5_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl-gssapi.c b/src/camel/camel-sasl-gssapi.c index 7233aeb7f..dad190a8c 100644 --- a/src/camel/camel-sasl-gssapi.c +++ b/src/camel/camel-sasl-gssapi.c @@ -70,10 +70,6 @@ extern gss_OID gss_nt_service_name; #endif /* HAVE_SUN_KRB5 */ #endif /* HAVE_HEIMDAL_KRB5 */ -#define CAMEL_SASL_GSSAPI_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapiPrivate)) - static const char spnego_OID[] = "\x2b\x06\x01\x05\x05\x02"; static const gss_OID_desc gss_mech_spnego = { 6, @@ -122,7 +118,7 @@ struct _CamelSaslGssapiPrivate { #endif /* HAVE_KRB5 */ -G_DEFINE_TYPE (CamelSaslGssapi, camel_sasl_gssapi, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslGssapi, camel_sasl_gssapi, CAMEL_TYPE_SASL) #ifdef HAVE_KRB5 @@ -368,7 +364,7 @@ sasl_gssapi_challenge_sync (CamelSasl *sasl, gchar *user = NULL; GError *krb_error = NULL; - priv = CAMEL_SASL_GSSAPI_GET_PRIVATE (sasl); + priv = CAMEL_SASL_GSSAPI (sasl)->priv; service_name = camel_sasl_get_service_name (sasl); @@ -571,8 +567,6 @@ camel_sasl_gssapi_class_init (CamelSaslGssapiClass *class) GObjectClass *object_class; CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslGssapiPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = sasl_gssapi_finalize; @@ -586,7 +580,7 @@ static void camel_sasl_gssapi_init (CamelSaslGssapi *sasl) { #ifdef HAVE_KRB5 - sasl->priv = CAMEL_SASL_GSSAPI_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_gssapi_get_instance_private (sasl); sasl->priv->state = GSSAPI_STATE_INIT; sasl->priv->ctx = GSS_C_NO_CONTEXT; sasl->priv->target = GSS_C_NO_NAME; diff --git a/src/camel/camel-sasl-login.c b/src/camel/camel-sasl-login.c index 703805efb..091cbd563 100644 --- a/src/camel/camel-sasl-login.c +++ b/src/camel/camel-sasl-login.c @@ -27,10 +27,6 @@ #include "camel-sasl-login.h" #include "camel-service.h" -#define CAMEL_SASL_LOGIN_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_LOGIN, CamelSaslLoginPrivate)) - static CamelServiceAuthType sasl_login_auth_type = { N_("Login"), @@ -50,7 +46,7 @@ struct _CamelSaslLoginPrivate { gint state; }; -G_DEFINE_TYPE (CamelSaslLogin, camel_sasl_login, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslLogin, camel_sasl_login, CAMEL_TYPE_SASL) static GByteArray * sasl_login_challenge_sync (CamelSasl *sasl, @@ -70,7 +66,7 @@ sasl_login_challenge_sync (CamelSasl *sasl, if (token == NULL) return NULL; - priv = CAMEL_SASL_LOGIN_GET_PRIVATE (sasl); + priv = CAMEL_SASL_LOGIN (sasl)->priv; service = camel_sasl_get_service (sasl); @@ -117,8 +113,6 @@ camel_sasl_login_class_init (CamelSaslLoginClass *class) { CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslLoginPrivate)); - sasl_class = CAMEL_SASL_CLASS (class); sasl_class->auth_type = &sasl_login_auth_type; sasl_class->challenge_sync = sasl_login_challenge_sync; @@ -127,5 +121,5 @@ camel_sasl_login_class_init (CamelSaslLoginClass *class) static void camel_sasl_login_init (CamelSaslLogin *sasl) { - sasl->priv = CAMEL_SASL_LOGIN_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_login_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl-ntlm.c b/src/camel/camel-sasl-ntlm.c index 8dae6a0dc..0fe72cfac 100644 --- a/src/camel/camel-sasl-ntlm.c +++ b/src/camel/camel-sasl-ntlm.c @@ -27,10 +27,6 @@ #include "camel-sasl-ntlm.h" #include "camel-stream-process.h" -#define CAMEL_SASL_NTLM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_NTLM, CamelSaslNTLMPrivate)) - struct _CamelSaslNTLMPrivate { gint placeholder; /* allow for future expansion */ #ifndef G_OS_WIN32 @@ -50,7 +46,7 @@ static CamelServiceAuthType sasl_ntlm_auth_type = { TRUE }; -G_DEFINE_TYPE (CamelSaslNTLM, camel_sasl_ntlm, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslNTLM, camel_sasl_ntlm, CAMEL_TYPE_SASL) #define NTLM_REQUEST "NTLMSSP\x00\x01\x00\x00\x00\x06\x82\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00" @@ -990,8 +986,6 @@ camel_sasl_ntlm_class_init (CamelSaslNTLMClass *class) GObjectClass *object_class; CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslNTLMPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = sasl_ntlm_finalize; @@ -1004,5 +998,5 @@ camel_sasl_ntlm_class_init (CamelSaslNTLMClass *class) static void camel_sasl_ntlm_init (CamelSaslNTLM *sasl) { - sasl->priv = CAMEL_SASL_NTLM_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_ntlm_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl-plain.c b/src/camel/camel-sasl-plain.c index 09b4dd7c1..b69fb6026 100644 --- a/src/camel/camel-sasl-plain.c +++ b/src/camel/camel-sasl-plain.c @@ -27,10 +27,6 @@ #include "camel-sasl-plain.h" #include "camel-service.h" -#define CAMEL_SASL_PLAIN_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_PLAIN, CamelSaslPlainPrivate)) - struct _CamelSaslPlainPrivate { gint placeholder; /* allow for future expansion */ }; @@ -45,7 +41,7 @@ static CamelServiceAuthType sasl_plain_auth_type = { TRUE }; -G_DEFINE_TYPE (CamelSaslPlain, camel_sasl_plain, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslPlain, camel_sasl_plain, CAMEL_TYPE_SASL) static GByteArray * sasl_plain_challenge_sync (CamelSasl *sasl, @@ -94,8 +90,6 @@ camel_sasl_plain_class_init (CamelSaslPlainClass *class) { CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslPlainPrivate)); - sasl_class = CAMEL_SASL_CLASS (class); sasl_class->auth_type = &sasl_plain_auth_type; sasl_class->challenge_sync = sasl_plain_challenge_sync; @@ -104,5 +98,5 @@ camel_sasl_plain_class_init (CamelSaslPlainClass *class) static void camel_sasl_plain_init (CamelSaslPlain *sasl) { - sasl->priv = CAMEL_SASL_PLAIN_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_plain_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl-popb4smtp.c b/src/camel/camel-sasl-popb4smtp.c index 26ef51244..5d4fb4a0a 100644 --- a/src/camel/camel-sasl-popb4smtp.c +++ b/src/camel/camel-sasl-popb4smtp.c @@ -29,10 +29,6 @@ #include "camel-session.h" #include "camel-store.h" -#define CAMEL_SASL_POPB4SMTP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTPPrivate)) - struct _CamelSaslPOPB4SMTPPrivate { gint placeholder; /* allow for future expansion */ }; @@ -56,7 +52,7 @@ static GMutex lock; #define POPB4SMTP_LOCK(l) g_mutex_lock(&l) #define POPB4SMTP_UNLOCK(l) g_mutex_unlock(&l) -G_DEFINE_TYPE (CamelSaslPOPB4SMTP, camel_sasl_popb4smtp, CAMEL_TYPE_SASL) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSaslPOPB4SMTP, camel_sasl_popb4smtp, CAMEL_TYPE_SASL) static GByteArray * sasl_popb4smtp_challenge_sync (CamelSasl *sasl, @@ -160,8 +156,6 @@ camel_sasl_popb4smtp_class_init (CamelSaslPOPB4SMTPClass *class) { CamelSaslClass *sasl_class; - g_type_class_add_private (class, sizeof (CamelSaslPOPB4SMTPPrivate)); - sasl_class = CAMEL_SASL_CLASS (class); sasl_class->auth_type = &sasl_popb4smtp_auth_type; sasl_class->challenge_sync = sasl_popb4smtp_challenge_sync; @@ -172,5 +166,5 @@ camel_sasl_popb4smtp_class_init (CamelSaslPOPB4SMTPClass *class) static void camel_sasl_popb4smtp_init (CamelSaslPOPB4SMTP *sasl) { - sasl->priv = CAMEL_SASL_POPB4SMTP_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_popb4smtp_get_instance_private (sasl); } diff --git a/src/camel/camel-sasl.c b/src/camel/camel-sasl.c index 3a39c54a1..c532f0dbe 100644 --- a/src/camel/camel-sasl.c +++ b/src/camel/camel-sasl.c @@ -37,10 +37,6 @@ #include "camel-sasl.h" #include "camel-service.h" -#define CAMEL_SASL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SASL, CamelSaslPrivate)) - #define w(x) typedef struct _AsyncContext AsyncContext; @@ -65,7 +61,7 @@ enum { PROP_SERVICE_NAME }; -G_DEFINE_ABSTRACT_TYPE (CamelSasl, camel_sasl, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelSasl, camel_sasl, G_TYPE_OBJECT) static void async_context_free (AsyncContext *async_context) @@ -253,7 +249,7 @@ sasl_dispose (GObject *object) { CamelSaslPrivate *priv; - priv = CAMEL_SASL_GET_PRIVATE (object); + priv = CAMEL_SASL (object)->priv; if (priv->service != NULL) { g_object_unref (priv->service); @@ -269,7 +265,7 @@ sasl_finalize (GObject *object) { CamelSaslPrivate *priv; - priv = CAMEL_SASL_GET_PRIVATE (object); + priv = CAMEL_SASL (object)->priv; g_free (priv->mechanism); g_free (priv->service_name); @@ -283,8 +279,6 @@ camel_sasl_class_init (CamelSaslClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSaslPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = sasl_set_property; object_class->get_property = sasl_get_property; @@ -339,7 +333,7 @@ camel_sasl_class_init (CamelSaslClass *class) static void camel_sasl_init (CamelSasl *sasl) { - sasl->priv = CAMEL_SASL_GET_PRIVATE (sasl); + sasl->priv = camel_sasl_get_instance_private (sasl); } /** diff --git a/src/camel/camel-service.c b/src/camel/camel-service.c index f44870277..a076259b5 100644 --- a/src/camel/camel-service.c +++ b/src/camel/camel-service.c @@ -41,10 +41,6 @@ #define d(x) #define w(x) -#define CAMEL_SERVICE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SERVICE, CamelServicePrivate)) - #define DISPATCH_DATA_KEY "camel-service-dispatch-data" typedef struct _AsyncContext AsyncContext; @@ -119,6 +115,7 @@ static void service_task_dispatch (CamelService *service, G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( CamelService, camel_service, CAMEL_TYPE_OBJECT, + G_ADD_PRIVATE (CamelService) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, camel_service_initable_init)) G_DEFINE_BOXED_TYPE (CamelServiceAuthType, camel_service_auth_type, camel_service_auth_type_copy, camel_service_auth_type_free); @@ -807,7 +804,7 @@ service_dispose (GObject *object) { CamelServicePrivate *priv; - priv = CAMEL_SERVICE_GET_PRIVATE (object); + priv = CAMEL_SERVICE (object)->priv; if (priv->status == CAMEL_SERVICE_CONNECTED) CAMEL_SERVICE_GET_CLASS (object)->disconnect_sync ( @@ -829,7 +826,7 @@ service_finalize (GObject *object) { CamelServicePrivate *priv; - priv = CAMEL_SERVICE_GET_PRIVATE (object); + priv = CAMEL_SERVICE (object)->priv; g_mutex_clear (&priv->property_lock); @@ -939,8 +936,6 @@ camel_service_class_init (CamelServiceClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelServicePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = service_set_property; object_class->get_property = service_get_property; @@ -1071,7 +1066,7 @@ camel_service_init (CamelService *service) (GDestroyNotify) NULL, (GDestroyNotify) task_queue_free); - service->priv = CAMEL_SERVICE_GET_PRIVATE (service); + service->priv = camel_service_get_instance_private (service); g_mutex_init (&service->priv->property_lock); g_mutex_init (&service->priv->connection_lock); diff --git a/src/camel/camel-session.c b/src/camel/camel-session.c index 1f8aad482..1a060006b 100644 --- a/src/camel/camel-session.c +++ b/src/camel/camel-session.c @@ -43,10 +43,6 @@ #include "camel-transport.h" #include "camel-url.h" -#define CAMEL_SESSION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SESSION, CamelSessionPrivate)) - /* Prioritize ahead of GTK+ redraws. */ #define JOB_PRIORITY G_PRIORITY_HIGH_IDLE @@ -118,7 +114,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE (CamelSession, camel_session, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSession, camel_session, G_TYPE_OBJECT) static void async_context_free (AsyncContext *async_context) @@ -366,7 +362,7 @@ session_dispose (GObject *object) { CamelSessionPrivate *priv; - priv = CAMEL_SESSION_GET_PRIVATE (object); + priv = CAMEL_SESSION (object)->priv; g_hash_table_remove_all (priv->services); @@ -382,7 +378,7 @@ session_finalize (GObject *object) { CamelSessionPrivate *priv; - priv = CAMEL_SESSION_GET_PRIVATE (object); + priv = CAMEL_SESSION (object)->priv; g_free (priv->user_data_dir); g_free (priv->user_cache_dir); @@ -603,8 +599,6 @@ camel_session_class_init (CamelSessionClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSessionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = session_set_property; object_class->get_property = session_get_property; @@ -745,7 +739,7 @@ camel_session_init (CamelSession *session) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - session->priv = CAMEL_SESSION_GET_PRIVATE (session); + session->priv = camel_session_get_instance_private (session); session->priv->services = services; g_mutex_init (&session->priv->services_lock); diff --git a/src/camel/camel-sexp.c b/src/camel/camel-sexp.c index 3edccc949..50c263ade 100644 --- a/src/camel/camel-sexp.c +++ b/src/camel/camel-sexp.c @@ -106,7 +106,7 @@ struct _CamelSExpPrivate { CamelMemChunk *result_chunks; }; -G_DEFINE_TYPE (CamelSExp, camel_sexp, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSExp, camel_sexp, G_TYPE_OBJECT) static CamelSExpTerm * parse_list (CamelSExp *sexp, gint gotbrace); static CamelSExpTerm * parse_value (CamelSExp *sexp); @@ -1532,8 +1532,6 @@ camel_sexp_class_init (CamelSExpClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSExpPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = camel_sexp_finalize; } @@ -1565,7 +1563,7 @@ camel_sexp_init (CamelSExp *sexp) { gint i; - sexp->priv = G_TYPE_INSTANCE_GET_PRIVATE (sexp, CAMEL_TYPE_SEXP, CamelSExpPrivate); + sexp->priv = camel_sexp_get_instance_private (sexp); sexp->priv->scanner = g_scanner_new (&scanner_config); sexp->priv->term_chunks = camel_memchunk_new (16, sizeof (CamelSExpTerm)); diff --git a/src/camel/camel-smime-context.c b/src/camel/camel-smime-context.c index e6aa7a10b..1ca20083d 100644 --- a/src/camel/camel-smime-context.c +++ b/src/camel/camel-smime-context.c @@ -57,10 +57,6 @@ #define d(x) -#define CAMEL_SMIME_CONTEXT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SMIME_CONTEXT, CamelSMIMEContextPrivate)) - struct _CamelSMIMEContextPrivate { CERTCertDBHandle *certdb; @@ -71,7 +67,7 @@ struct _CamelSMIMEContextPrivate { guint send_encrypt_key_prefs : 1; }; -G_DEFINE_TYPE (CamelSMIMEContext, camel_smime_context, CAMEL_TYPE_CIPHER_CONTEXT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSMIMEContext, camel_smime_context, CAMEL_TYPE_CIPHER_CONTEXT) static void smime_cert_data_free (gpointer cert_data) @@ -1575,8 +1571,6 @@ camel_smime_context_class_init (CamelSMIMEContextClass *class) CamelCipherContextClass *cipher_context_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSMIMEContextPrivate)); - cipher_context_class = CAMEL_CIPHER_CONTEXT_CLASS (class); cipher_context_class->sign_protocol = "application/pkcs7-signature"; cipher_context_class->encrypt_protocol = "application/pkcs7-mime"; @@ -1595,7 +1589,7 @@ camel_smime_context_class_init (CamelSMIMEContextClass *class) static void camel_smime_context_init (CamelSMIMEContext *smime_context) { - smime_context->priv = CAMEL_SMIME_CONTEXT_GET_PRIVATE (smime_context); + smime_context->priv = camel_smime_context_get_instance_private (smime_context); smime_context->priv->certdb = CERT_GetDefaultCertDB (); smime_context->priv->sign_mode = CAMEL_SMIME_SIGN_CLEARSIGN; smime_context->priv->password_tries = 0; diff --git a/src/camel/camel-store-settings.c b/src/camel/camel-store-settings.c index fde537b70..1dc49d7ec 100644 --- a/src/camel/camel-store-settings.c +++ b/src/camel/camel-store-settings.c @@ -17,10 +17,6 @@ #include "camel-store-settings.h" -#define CAMEL_STORE_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STORE_SETTINGS, CamelStoreSettingsPrivate)) - struct _CamelStoreSettingsPrivate { gboolean filter_inbox; }; @@ -30,7 +26,7 @@ enum { PROP_FILTER_INBOX }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelStoreSettings, camel_store_settings, CAMEL_TYPE_SETTINGS) @@ -75,8 +71,6 @@ camel_store_settings_class_init (CamelStoreSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelStoreSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = store_settings_set_property; object_class->get_property = store_settings_get_property; @@ -98,7 +92,7 @@ camel_store_settings_class_init (CamelStoreSettingsClass *class) static void camel_store_settings_init (CamelStoreSettings *settings) { - settings->priv = CAMEL_STORE_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_store_settings_get_instance_private (settings); } /** diff --git a/src/camel/camel-store-summary.c b/src/camel/camel-store-summary.c index e4e835ec8..7938f4e58 100644 --- a/src/camel/camel-store-summary.c +++ b/src/camel/camel-store-summary.c @@ -46,10 +46,6 @@ /* current version */ #define CAMEL_STORE_SUMMARY_VERSION (2) -#define CAMEL_STORE_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummaryPrivate)) - struct _CamelStoreSummaryPrivate { GRecMutex summary_lock; /* for the summary hashtable/array */ GRecMutex io_lock; /* load/save lock, for access to saved_count, etc */ @@ -71,7 +67,7 @@ struct _CamelStoreSummaryPrivate { GHashTable *folders_path; /* CamelStoreInfo's by path name */ }; -G_DEFINE_TYPE (CamelStoreSummary, camel_store_summary, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelStoreSummary, camel_store_summary, G_TYPE_OBJECT) static void store_summary_finalize (GObject *object) @@ -258,8 +254,6 @@ camel_store_summary_class_init (CamelStoreSummaryClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelStoreSummaryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = store_summary_dispose; object_class->finalize = store_summary_finalize; @@ -277,7 +271,7 @@ camel_store_summary_class_init (CamelStoreSummaryClass *class) static void camel_store_summary_init (CamelStoreSummary *summary) { - summary->priv = CAMEL_STORE_SUMMARY_GET_PRIVATE (summary); + summary->priv = camel_store_summary_get_instance_private (summary); summary->priv->version = CAMEL_STORE_SUMMARY_VERSION; diff --git a/src/camel/camel-store.c b/src/camel/camel-store.c index 7e8aac5b5..5c0ecfc21 100644 --- a/src/camel/camel-store.c +++ b/src/camel/camel-store.c @@ -43,10 +43,6 @@ #define d(x) #define w(x) -#define CAMEL_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STORE, CamelStorePrivate)) - typedef struct _AsyncContext AsyncContext; typedef struct _SignalClosure SignalClosure; @@ -93,6 +89,7 @@ static void camel_store_initable_init (GInitableIface *iface); G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( CamelStore, camel_store, CAMEL_TYPE_SERVICE, + G_ADD_PRIVATE (CamelStore) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, camel_store_initable_init)) @@ -572,8 +569,6 @@ camel_store_class_init (CamelStoreClass *class) GObjectClass *object_class; CamelServiceClass *service_class; - g_type_class_add_private (class, sizeof (CamelStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = store_finalize; object_class->dispose = store_dispose; @@ -667,7 +662,7 @@ camel_store_initable_init (GInitableIface *iface) static void camel_store_init (CamelStore *store) { - store->priv = CAMEL_STORE_GET_PRIVATE (store); + store->priv = camel_store_get_instance_private (store); /* Default CamelStore capabilities: * diff --git a/src/camel/camel-stream-buffer.c b/src/camel/camel-stream-buffer.c index 33f3f2722..3e2e0dd36 100644 --- a/src/camel/camel-stream-buffer.c +++ b/src/camel/camel-stream-buffer.c @@ -28,10 +28,6 @@ #include "camel-stream-buffer.h" -#define CAMEL_STREAM_BUFFER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STREAM_BUFFER, CamelStreamBufferPrivate)) - struct _CamelStreamBufferPrivate { CamelStream *stream; @@ -45,7 +41,7 @@ struct _CamelStreamBufferPrivate { CamelStreamBufferMode mode; }; -G_DEFINE_TYPE (CamelStreamBuffer, camel_stream_buffer, CAMEL_TYPE_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (CamelStreamBuffer, camel_stream_buffer, CAMEL_TYPE_STREAM) #define BUF_SIZE 1024 @@ -77,7 +73,7 @@ set_vbuf (CamelStreamBuffer *stream, { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; g_free (priv->buf); @@ -93,7 +89,7 @@ stream_buffer_dispose (GObject *object) { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (object); + priv = CAMEL_STREAM_BUFFER (object)->priv; if (priv->stream != NULL) { g_object_unref (priv->stream); @@ -109,7 +105,7 @@ stream_buffer_finalize (GObject *object) { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (object); + priv = CAMEL_STREAM_BUFFER (object)->priv; g_free (priv->buf); g_free (priv->linebuf); @@ -131,7 +127,7 @@ stream_buffer_read (CamelStream *stream, gchar *bptr = buffer; GError *local_error = NULL; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; g_return_val_if_fail ( (priv->mode & CAMEL_STREAM_BUFFER_MODE) == @@ -203,7 +199,7 @@ stream_buffer_write (CamelStream *stream, gssize total = n; gssize left, todo; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; g_return_val_if_fail ( (priv->mode & CAMEL_STREAM_BUFFER_MODE) == @@ -251,7 +247,7 @@ stream_buffer_flush (CamelStream *stream, { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; if ((priv->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE) { gsize len = priv->ptr - priv->buf; @@ -276,7 +272,7 @@ stream_buffer_close (CamelStream *stream, { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; if (stream_buffer_flush (stream, cancellable, error) == -1) return -1; @@ -289,7 +285,7 @@ stream_buffer_eos (CamelStream *stream) { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; return camel_stream_eos (priv->stream) && priv->ptr == priv->end; } @@ -301,7 +297,7 @@ stream_buffer_init_method (CamelStreamBuffer *stream, { CamelStreamBufferPrivate *priv; - priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_BUFFER (stream)->priv; set_vbuf (stream, mode); @@ -317,8 +313,6 @@ camel_stream_buffer_class_init (CamelStreamBufferClass *class) GObjectClass *object_class; CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamBufferPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = stream_buffer_dispose; object_class->finalize = stream_buffer_finalize; @@ -336,7 +330,7 @@ camel_stream_buffer_class_init (CamelStreamBufferClass *class) static void camel_stream_buffer_init (CamelStreamBuffer *stream) { - stream->priv = CAMEL_STREAM_BUFFER_GET_PRIVATE (stream); + stream->priv = camel_stream_buffer_get_instance_private (stream); stream->priv->size = BUF_SIZE; stream->priv->buf = g_malloc (BUF_SIZE); stream->priv->ptr = stream->priv->buf; diff --git a/src/camel/camel-stream-filter.c b/src/camel/camel-stream-filter.c index 873cfa558..f5a826ec9 100644 --- a/src/camel/camel-stream-filter.c +++ b/src/camel/camel-stream-filter.c @@ -33,10 +33,6 @@ /*extern void g_check(gpointer mp);*/ #define g_check(x) -#define CAMEL_STREAM_FILTER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STREAM_FILTER, CamelStreamFilterPrivate)) - struct _filter { struct _filter *next; gint id; @@ -66,6 +62,7 @@ struct _CamelStreamFilterPrivate { static void camel_stream_filter_seekable_init (GSeekableIface *iface); G_DEFINE_TYPE_WITH_CODE (CamelStreamFilter, camel_stream_filter, CAMEL_TYPE_STREAM, + G_ADD_PRIVATE (CamelStreamFilter) G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_filter_seekable_init)) static void @@ -100,7 +97,7 @@ stream_filter_read (CamelStream *stream, gssize size; struct _filter *f; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; priv->last_was_read = TRUE; @@ -183,7 +180,7 @@ stream_filter_write (CamelStream *stream, gsize presize, len, left = n; gchar *buffer, realbuffer[READ_SIZE + READ_PAD]; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; priv->last_was_read = FALSE; @@ -239,7 +236,7 @@ stream_filter_flush (CamelStream *stream, gsize presize; gsize len; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; if (priv->last_was_read) return 0; @@ -280,7 +277,7 @@ stream_filter_close (CamelStream *stream, { CamelStreamFilterPrivate *priv; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; /* Ignore errors while flushing. */ if (!priv->last_was_read) @@ -294,7 +291,7 @@ stream_filter_eos (CamelStream *stream) { CamelStreamFilterPrivate *priv; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; if (priv->filteredlen > 0) return FALSE; @@ -310,7 +307,7 @@ stream_filter_tell (GSeekable *seekable) { CamelStreamFilterPrivate *priv; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_FILTER (seekable)->priv; if (!G_IS_SEEKABLE (priv->source)) return 0; @@ -334,7 +331,7 @@ stream_filter_seek (GSeekable *seekable, CamelStreamFilterPrivate *priv; struct _filter *f; - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_FILTER (seekable)->priv; if (type != G_SEEK_SET || offset != 0) { g_set_error_literal ( @@ -383,8 +380,6 @@ camel_stream_filter_class_init (CamelStreamFilterClass *class) GObjectClass *object_class; CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamFilterPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = stream_filter_finalize; @@ -409,7 +404,7 @@ camel_stream_filter_seekable_init (GSeekableIface *iface) static void camel_stream_filter_init (CamelStreamFilter *stream) { - stream->priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + stream->priv = camel_stream_filter_get_instance_private (stream); stream->priv->realbuffer = g_malloc (READ_SIZE + READ_PAD); stream->priv->buffer = stream->priv->realbuffer + READ_PAD; stream->priv->last_was_read = TRUE; @@ -436,7 +431,7 @@ camel_stream_filter_new (CamelStream *source) g_return_val_if_fail (CAMEL_IS_STREAM (source), NULL); stream = g_object_new (CAMEL_TYPE_STREAM_FILTER, NULL); - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; priv->source = g_object_ref (source); @@ -482,7 +477,7 @@ camel_stream_filter_add (CamelStreamFilter *stream, g_return_val_if_fail (CAMEL_IS_STREAM_FILTER (stream), -1); g_return_val_if_fail (CAMEL_IS_MIME_FILTER (filter), -1); - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; fn = g_malloc (sizeof (*fn)); fn->id = priv->filterid++; @@ -513,7 +508,7 @@ camel_stream_filter_remove (CamelStreamFilter *stream, g_return_if_fail (CAMEL_IS_STREAM_FILTER (stream)); - priv = CAMEL_STREAM_FILTER_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FILTER (stream)->priv; f = (struct _filter *) &priv->filters; while (f && f->next) { diff --git a/src/camel/camel-stream-fs.c b/src/camel/camel-stream-fs.c index beceb3d5a..c64601659 100644 --- a/src/camel/camel-stream-fs.c +++ b/src/camel/camel-stream-fs.c @@ -34,10 +34,6 @@ #include "camel-stream-fs.h" #include "camel-win32.h" -#define CAMEL_STREAM_FS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STREAM_FS, CamelStreamFsPrivate)) - struct _CamelStreamFsPrivate { gboolean eos; gint fd; /* file descriptor on the underlying file */ @@ -48,6 +44,7 @@ static void camel_stream_fs_seekable_init (GSeekableIface *iface); G_DEFINE_TYPE_WITH_CODE ( CamelStreamFs, camel_stream_fs, CAMEL_TYPE_STREAM, + G_ADD_PRIVATE (CamelStreamFs) G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_fs_seekable_init)) static void @@ -55,7 +52,7 @@ stream_fs_finalize (GObject *object) { CamelStreamFsPrivate *priv; - priv = CAMEL_STREAM_FS_GET_PRIVATE (object); + priv = CAMEL_STREAM_FS (object)->priv; if (priv->fd != -1) close (priv->fd); @@ -74,7 +71,7 @@ stream_fs_read (CamelStream *stream, CamelStreamFsPrivate *priv; gssize nread; - priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FS (stream)->priv; nread = camel_read (priv->fd, buffer, n, cancellable, error); @@ -93,7 +90,7 @@ stream_fs_write (CamelStream *stream, { CamelStreamFsPrivate *priv; - priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FS (stream)->priv; return camel_write (priv->fd, buffer, n, cancellable, error); } @@ -105,7 +102,7 @@ stream_fs_flush (CamelStream *stream, { CamelStreamFsPrivate *priv; - priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FS (stream)->priv; if (g_cancellable_set_error_if_cancelled (cancellable, error)) return -1; @@ -128,7 +125,7 @@ stream_fs_close (CamelStream *stream, { CamelStreamFsPrivate *priv; - priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FS (stream)->priv; if (g_cancellable_set_error_if_cancelled (cancellable, error)) return -1; @@ -159,7 +156,7 @@ stream_fs_tell (GSeekable *seekable) { CamelStreamFsPrivate *priv; - priv = CAMEL_STREAM_FS_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_FS (seekable)->priv; return (goffset) lseek (priv->fd, 0, SEEK_CUR); } @@ -180,7 +177,7 @@ stream_fs_seek (GSeekable *seekable, CamelStreamFsPrivate *priv; goffset real = 0; - priv = CAMEL_STREAM_FS_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_FS (seekable)->priv; switch (type) { case G_SEEK_SET: @@ -241,8 +238,6 @@ camel_stream_fs_class_init (CamelStreamFsClass *class) GObjectClass *object_class; CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamFsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = stream_fs_finalize; @@ -267,7 +262,7 @@ camel_stream_fs_seekable_init (GSeekableIface *iface) static void camel_stream_fs_init (CamelStreamFs *stream) { - stream->priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + stream->priv = camel_stream_fs_get_instance_private (stream); stream->priv->fd = -1; stream->priv->eos = FALSE; } @@ -292,7 +287,7 @@ camel_stream_fs_new_with_fd (gint fd) return NULL; stream = g_object_new (CAMEL_TYPE_STREAM_FS, NULL); - priv = CAMEL_STREAM_FS_GET_PRIVATE (stream); + priv = CAMEL_STREAM_FS (stream)->priv; priv->fd = fd; diff --git a/src/camel/camel-stream-mem.c b/src/camel/camel-stream-mem.c index 673e0f8c3..cc1364b8f 100644 --- a/src/camel/camel-stream-mem.c +++ b/src/camel/camel-stream-mem.c @@ -29,10 +29,6 @@ #include "camel-stream-mem.h" -#define CAMEL_STREAM_MEM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STREAM_MEM, CamelStreamMemPrivate)) - struct _CamelStreamMemPrivate { guint owner : 1; /* do we own the buffer? */ guint secure : 1; /* do we clear the buffer on finalize? @@ -47,6 +43,7 @@ static void camel_stream_mem_seekable_init (GSeekableIface *iface); G_DEFINE_TYPE_WITH_CODE ( CamelStreamMem, camel_stream_mem, CAMEL_TYPE_STREAM, + G_ADD_PRIVATE (CamelStreamMem) G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_mem_seekable_init)) /* could probably be a util method */ @@ -73,7 +70,7 @@ stream_mem_finalize (GObject *object) { CamelStreamMemPrivate *priv; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (object); + priv = CAMEL_STREAM_MEM (object)->priv; if (priv->buffer && priv->owner) { /* TODO: we need our own bytearray type since we don't know @@ -97,7 +94,7 @@ stream_mem_read (CamelStream *stream, CamelStreamMemPrivate *priv; gssize nread; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream); + priv = CAMEL_STREAM_MEM (stream)->priv; nread = MIN (n, priv->buffer->len - priv->position); if (nread > 0) { @@ -119,7 +116,7 @@ stream_mem_write (CamelStream *stream, CamelStreamMemPrivate *priv; gssize nwrite = n; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream); + priv = CAMEL_STREAM_MEM (stream)->priv; /* FIXME: we shouldn't use g_byte_arrays or g_malloc perhaps? */ if (priv->position == priv->buffer->len) { @@ -138,7 +135,7 @@ stream_mem_eos (CamelStream *stream) { CamelStreamMemPrivate *priv; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream); + priv = CAMEL_STREAM_MEM (stream)->priv; return priv->buffer->len <= priv->position; } @@ -148,7 +145,7 @@ stream_mem_tell (GSeekable *seekable) { CamelStreamMemPrivate *priv; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_MEM (seekable)->priv; return priv->position; } @@ -169,7 +166,7 @@ stream_mem_seek (GSeekable *seekable, CamelStreamMemPrivate *priv; goffset position; - priv = CAMEL_STREAM_MEM_GET_PRIVATE (seekable); + priv = CAMEL_STREAM_MEM (seekable)->priv; switch (type) { case G_SEEK_SET: @@ -225,8 +222,6 @@ camel_stream_mem_class_init (CamelStreamMemClass *class) GObjectClass *object_class; CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamMemPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = stream_mem_finalize; @@ -249,7 +244,7 @@ camel_stream_mem_seekable_init (GSeekableIface *iface) static void camel_stream_mem_init (CamelStreamMem *stream) { - stream->priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream); + stream->priv = camel_stream_mem_get_instance_private (stream); } /** @@ -312,7 +307,7 @@ camel_stream_mem_new_with_byte_array (GByteArray *buffer) g_return_val_if_fail (buffer != NULL, NULL); stream = g_object_new (CAMEL_TYPE_STREAM_MEM, NULL); - priv = CAMEL_STREAM_MEM_GET_PRIVATE (stream); + priv = CAMEL_STREAM_MEM (stream)->priv; priv->buffer = buffer; priv->owner = TRUE; diff --git a/src/camel/camel-stream-null.c b/src/camel/camel-stream-null.c index c02574bc5..46e646139 100644 --- a/src/camel/camel-stream-null.c +++ b/src/camel/camel-stream-null.c @@ -33,6 +33,7 @@ struct _CamelStreamNullPrivate { static void camel_stream_null_seekable_init (GSeekableIface *iface); G_DEFINE_TYPE_WITH_CODE (CamelStreamNull, camel_stream_null, CAMEL_TYPE_STREAM, + G_ADD_PRIVATE (CamelStreamNull) G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_null_seekable_init)) static gssize @@ -119,8 +120,6 @@ camel_stream_null_class_init (CamelStreamNullClass *class) { CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamNullPrivate)); - stream_class = CAMEL_STREAM_CLASS (class); stream_class->write = stream_null_write; stream_class->eos = stream_null_eos; @@ -139,7 +138,7 @@ camel_stream_null_seekable_init (GSeekableIface *iface) static void camel_stream_null_init (CamelStreamNull *stream_null) { - stream_null->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream_null, CAMEL_TYPE_STREAM_NULL, CamelStreamNullPrivate); + stream_null->priv = camel_stream_null_get_instance_private (stream_null); stream_null->priv->ends_with_crlf = FALSE; stream_null->priv->ends_with_cr = FALSE; } diff --git a/src/camel/camel-stream-process.c b/src/camel/camel-stream-process.c index 2cdd3b445..262db2c82 100644 --- a/src/camel/camel-stream-process.c +++ b/src/camel/camel-stream-process.c @@ -45,7 +45,7 @@ struct _CamelStreamProcessPrivate { pid_t childpid; }; -G_DEFINE_TYPE (CamelStreamProcess, camel_stream_process, CAMEL_TYPE_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (CamelStreamProcess, camel_stream_process, CAMEL_TYPE_STREAM) static void stream_process_finalize (GObject *object) @@ -157,8 +157,6 @@ camel_stream_process_class_init (CamelStreamProcessClass *class) GObjectClass *object_class; CamelStreamClass *stream_class; - g_type_class_add_private (class, sizeof (CamelStreamProcessPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = stream_process_finalize; @@ -172,7 +170,7 @@ camel_stream_process_class_init (CamelStreamProcessClass *class) static void camel_stream_process_init (CamelStreamProcess *stream) { - stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_STREAM_PROCESS, CamelStreamProcessPrivate); + stream->priv = camel_stream_process_get_instance_private (stream); stream->priv->sockfd = -1; stream->priv->childpid = 0; } diff --git a/src/camel/camel-stream.c b/src/camel/camel-stream.c index 73af12770..55fd06d6a 100644 --- a/src/camel/camel-stream.c +++ b/src/camel/camel-stream.c @@ -26,10 +26,6 @@ #include "camel-stream.h" -#define CAMEL_STREAM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_STREAM, CamelStreamPrivate)) - struct _CamelStreamPrivate { GIOStream *base_stream; GMutex base_stream_lock; @@ -48,6 +44,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelStream, camel_stream, G_TYPE_OBJECT, + G_ADD_PRIVATE (CamelStream) G_IMPLEMENT_INTERFACE ( G_TYPE_SEEKABLE, camel_stream_seekable_init)) @@ -92,7 +89,7 @@ stream_dispose (GObject *object) { CamelStreamPrivate *priv; - priv = CAMEL_STREAM_GET_PRIVATE (object); + priv = CAMEL_STREAM (object)->priv; g_clear_object (&priv->base_stream); @@ -105,7 +102,7 @@ stream_finalize (GObject *object) { CamelStreamPrivate *priv; - priv = CAMEL_STREAM_GET_PRIVATE (object); + priv = CAMEL_STREAM (object)->priv; g_mutex_clear (&priv->base_stream_lock); @@ -354,8 +351,6 @@ camel_stream_class_init (CamelStreamClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelStreamPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = stream_set_property; object_class->get_property = stream_get_property; @@ -394,7 +389,7 @@ camel_stream_seekable_init (GSeekableIface *iface) static void camel_stream_init (CamelStream *stream) { - stream->priv = CAMEL_STREAM_GET_PRIVATE (stream); + stream->priv = camel_stream_get_instance_private (stream); g_mutex_init (&stream->priv->base_stream_lock); } diff --git a/src/camel/camel-text-index.c b/src/camel/camel-text-index.c index 1c9bb4d59..7987e0028 100644 --- a/src/camel/camel-text-index.c +++ b/src/camel/camel-text-index.c @@ -55,10 +55,6 @@ static gint text_index_compress_nosync (CamelIndex *idx); /* ********************************************************************** */ -#define CAMEL_TEXT_INDEX_NAME_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_TEXT_INDEX_NAME, CamelTextIndexNamePrivate)) - struct _CamelTextIndexNamePrivate { GString *buffer; camel_key_t nameid; @@ -69,10 +65,6 @@ CamelTextIndexName *camel_text_index_name_new (CamelTextIndex *idx, const gchar /* ****************************** */ -#define CAMEL_TEXT_INDEX_CURSOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_TEXT_INDEX_CURSOR, CamelTextIndexCursorPrivate)) - struct _CamelTextIndexCursorPrivate { camel_block_t first; camel_block_t next; @@ -89,10 +81,6 @@ CamelTextIndexCursor *camel_text_index_cursor_new (CamelTextIndex *idx, camel_bl /* ****************************** */ -#define CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR, CamelTextIndexKeyCursorPrivate)) - struct _CamelTextIndexKeyCursorPrivate { CamelKeyTable *table; @@ -109,10 +97,6 @@ CamelTextIndexKeyCursor *camel_text_index_key_cursor_new (CamelTextIndex *idx, C #define CAMEL_TEXT_INDEX_VERSION "TEXT.000" #define CAMEL_TEXT_INDEX_KEY_VERSION "KEYS.000" -#define CAMEL_TEXT_INDEX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_TEXT_INDEX, CamelTextIndexPrivate)) - struct _CamelTextIndexPrivate { CamelBlockFile *blocks; CamelKeyFile *links; @@ -159,14 +143,14 @@ struct _CamelTextIndexWord { /* CamelTextIndex */ /* ********************************************************************** */ -G_DEFINE_TYPE (CamelTextIndex, camel_text_index, CAMEL_TYPE_INDEX) +G_DEFINE_TYPE_WITH_PRIVATE (CamelTextIndex, camel_text_index, CAMEL_TYPE_INDEX) static void text_index_dispose (GObject *object) { CamelTextIndexPrivate *priv; - priv = CAMEL_TEXT_INDEX_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX (object)->priv; /* Only run this the first time. */ if (priv->word_index != NULL) @@ -211,7 +195,7 @@ text_index_finalize (GObject *object) { CamelTextIndexPrivate *priv; - priv = CAMEL_TEXT_INDEX_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX (object)->priv; g_warn_if_fail (g_queue_is_empty (&priv->word_cache)); g_warn_if_fail (g_hash_table_size (priv->words) == 0); @@ -332,7 +316,7 @@ text_index_add_name_to_word (CamelIndex *idx, static gint text_index_sync (CamelIndex *idx) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; struct _CamelTextIndexWord *ww; struct _CamelTextIndexRoot *rb; gint ret = 0, wfrag, nfrag; @@ -468,8 +452,8 @@ text_index_compress_nosync (CamelIndex *idx) if (newidx == NULL) return -1; - newp = CAMEL_TEXT_INDEX_GET_PRIVATE (newidx); - oldp = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + newp = CAMEL_TEXT_INDEX (newidx)->priv; + oldp = CAMEL_TEXT_INDEX (idx)->priv; CAMEL_TEXT_INDEX_LOCK (idx, lock); @@ -610,7 +594,7 @@ fail: static gint text_index_delete (CamelIndex *idx) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; gint ret = 0; if (camel_block_file_delete (p->blocks) == -1) @@ -625,7 +609,7 @@ static gint text_index_rename (CamelIndex *idx, const gchar *path) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; gchar *newlink, *newblock; gsize newlink_len, newblock_len; gint err, ret; @@ -665,7 +649,7 @@ static gint text_index_has_name (CamelIndex *idx, const gchar *name) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; return camel_partition_table_lookup (p->name_hash, name) != 0; } @@ -674,7 +658,7 @@ static CamelIndexName * text_index_add_name (CamelIndex *idx, const gchar *name) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; camel_key_t keyid; CamelIndexName *idn; struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *) camel_block_file_get_root (p->blocks); @@ -757,7 +741,7 @@ static void text_index_delete_name (CamelIndex *idx, const gchar *name) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; camel_key_t keyid; struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *) camel_block_file_get_root (p->blocks); @@ -782,7 +766,7 @@ static CamelIndexCursor * text_index_find (CamelIndex *idx, const gchar *word) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; camel_key_t keyid; camel_block_t data = 0; guint flags; @@ -808,7 +792,7 @@ text_index_find (CamelIndex *idx, static CamelIndexCursor * text_index_words (CamelIndex *idx) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; return (CamelIndexCursor *) camel_text_index_key_cursor_new ((CamelTextIndex *) idx, p->word_index); } @@ -819,8 +803,6 @@ camel_text_index_class_init (CamelTextIndexClass *class) GObjectClass *object_class; CamelIndexClass *index_class; - g_type_class_add_private (class, sizeof (CamelTextIndexPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = text_index_dispose; object_class->finalize = text_index_finalize; @@ -842,7 +824,7 @@ camel_text_index_class_init (CamelTextIndexClass *class) static void camel_text_index_init (CamelTextIndex *text_index) { - text_index->priv = CAMEL_TEXT_INDEX_GET_PRIVATE (text_index); + text_index->priv = camel_text_index_get_instance_private (text_index); g_queue_init (&text_index->priv->word_cache); text_index->priv->words = g_hash_table_new (g_str_hash, g_str_equal); @@ -874,7 +856,7 @@ camel_text_index_new (const gchar *path, gint flags) { CamelTextIndex *idx = g_object_new (CAMEL_TYPE_TEXT_INDEX, NULL); - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; struct _CamelTextIndexRoot *rb; gchar *link; gsize link_len; @@ -1270,7 +1252,7 @@ dump_raw (GHashTable *map, void camel_text_index_dump (CamelTextIndex *idx) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; #ifndef DUMP_RAW camel_key_t keyid; gchar *word = NULL; @@ -1335,7 +1317,7 @@ camel_text_index_dump (CamelTextIndex *idx) void camel_text_index_validate (CamelTextIndex *idx) { - CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx); + CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX (idx)->priv; camel_key_t keyid; gchar *word = NULL; const gchar *name; @@ -1469,14 +1451,14 @@ camel_text_index_validate (CamelTextIndex *idx) /* CamelTextIndexName */ /* ********************************************************************** */ -G_DEFINE_TYPE (CamelTextIndexName, camel_text_index_name, CAMEL_TYPE_INDEX_NAME) +G_DEFINE_TYPE_WITH_PRIVATE (CamelTextIndexName, camel_text_index_name, CAMEL_TYPE_INDEX_NAME) static void text_index_name_finalize (GObject *object) { CamelTextIndexNamePrivate *priv; - priv = CAMEL_TEXT_INDEX_NAME_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX_NAME (object)->priv; g_hash_table_destroy (CAMEL_TEXT_INDEX_NAME (object)->parent.words); @@ -1570,7 +1552,7 @@ text_index_name_add_buffer (CamelIndexName *idn, const gchar *buffer, gsize len) { - CamelTextIndexNamePrivate *p = CAMEL_TEXT_INDEX_NAME_GET_PRIVATE (idn); + CamelTextIndexNamePrivate *p = CAMEL_TEXT_INDEX_NAME (idn)->priv; const guchar *ptr, *ptrend; guint32 c; gchar utf8[8]; @@ -1611,8 +1593,6 @@ camel_text_index_name_class_init (CamelTextIndexNameClass *class) GObjectClass *object_class; CamelIndexNameClass *index_name_class; - g_type_class_add_private (class, sizeof (CamelTextIndexNamePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = text_index_name_finalize; @@ -1624,8 +1604,7 @@ camel_text_index_name_class_init (CamelTextIndexNameClass *class) static void camel_text_index_name_init (CamelTextIndexName *text_index_name) { - text_index_name->priv = - CAMEL_TEXT_INDEX_NAME_GET_PRIVATE (text_index_name); + text_index_name->priv = camel_text_index_name_get_instance_private (text_index_name); text_index_name->parent.words = g_hash_table_new ( g_str_hash, g_str_equal); @@ -1642,7 +1621,7 @@ camel_text_index_name_new (CamelTextIndex *idx, { CamelTextIndexName *idn = g_object_new (CAMEL_TYPE_TEXT_INDEX_NAME, NULL); CamelIndexName *cin = &idn->parent; - CamelTextIndexNamePrivate *p = CAMEL_TEXT_INDEX_NAME_GET_PRIVATE (idn); + CamelTextIndexNamePrivate *p = CAMEL_TEXT_INDEX_NAME (idn)->priv; cin->index = g_object_ref (idx); cin->name = camel_mempool_strdup (p->pool, name); @@ -1655,14 +1634,14 @@ camel_text_index_name_new (CamelTextIndex *idx, /* CamelTextIndexCursor */ /* ********************************************************************** */ -G_DEFINE_TYPE (CamelTextIndexCursor, camel_text_index_cursor, CAMEL_TYPE_INDEX_CURSOR) +G_DEFINE_TYPE_WITH_PRIVATE (CamelTextIndexCursor, camel_text_index_cursor, CAMEL_TYPE_INDEX_CURSOR) static void text_index_cursor_finalize (GObject *object) { CamelTextIndexCursorPrivate *priv; - priv = CAMEL_TEXT_INDEX_CURSOR_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX_CURSOR (object)->priv; g_free (priv->records); g_free (priv->current); @@ -1674,8 +1653,8 @@ text_index_cursor_finalize (GObject *object) static const gchar * text_index_cursor_next (CamelIndexCursor *idc) { - CamelTextIndexCursorPrivate *p = CAMEL_TEXT_INDEX_CURSOR_GET_PRIVATE (idc); - CamelTextIndexPrivate *tip = CAMEL_TEXT_INDEX_GET_PRIVATE (idc->index); + CamelTextIndexCursorPrivate *p = CAMEL_TEXT_INDEX_CURSOR (idc)->priv; + CamelTextIndexPrivate *tip = CAMEL_TEXT_INDEX (idc->index)->priv; guint flags; c (printf ("Going to next cursor for word with data '%08x' next %08x\n", p->first, p->next)); @@ -1715,8 +1694,6 @@ camel_text_index_cursor_class_init (CamelTextIndexCursorClass *class) GObjectClass *object_class; CamelIndexCursorClass *index_cursor_class; - g_type_class_add_private (class, sizeof (CamelTextIndexCursorPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = text_index_cursor_finalize; @@ -1727,8 +1704,7 @@ camel_text_index_cursor_class_init (CamelTextIndexCursorClass *class) static void camel_text_index_cursor_init (CamelTextIndexCursor *text_index_cursor) { - text_index_cursor->priv = - CAMEL_TEXT_INDEX_CURSOR_GET_PRIVATE (text_index_cursor); + text_index_cursor->priv = camel_text_index_cursor_get_instance_private (text_index_cursor); } CamelTextIndexCursor * @@ -1737,7 +1713,7 @@ camel_text_index_cursor_new (CamelTextIndex *idx, { CamelTextIndexCursor *idc = g_object_new (CAMEL_TYPE_TEXT_INDEX_CURSOR, NULL); CamelIndexCursor *cic = &idc->parent; - CamelTextIndexCursorPrivate *p = CAMEL_TEXT_INDEX_CURSOR_GET_PRIVATE (idc); + CamelTextIndexCursorPrivate *p = CAMEL_TEXT_INDEX_CURSOR (idc)->priv; cic->index = g_object_ref (idx); p->first = data; @@ -1752,14 +1728,14 @@ camel_text_index_cursor_new (CamelTextIndex *idx, /* CamelTextIndexKeyCursor */ /* ********************************************************************** */ -G_DEFINE_TYPE (CamelTextIndexKeyCursor, camel_text_index_key_cursor, CAMEL_TYPE_INDEX_CURSOR) +G_DEFINE_TYPE_WITH_PRIVATE (CamelTextIndexKeyCursor, camel_text_index_key_cursor, CAMEL_TYPE_INDEX_CURSOR) static void text_index_key_cursor_dispose (GObject *object) { CamelTextIndexKeyCursorPrivate *priv; - priv = CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX_KEY_CURSOR (object)->priv; if (priv->table != NULL) { g_object_unref (priv->table); @@ -1775,7 +1751,7 @@ text_index_key_cursor_finalize (GObject *object) { CamelTextIndexKeyCursorPrivate *priv; - priv = CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE (object); + priv = CAMEL_TEXT_INDEX_KEY_CURSOR (object)->priv; g_free (priv->current); @@ -1786,7 +1762,7 @@ text_index_key_cursor_finalize (GObject *object) static const gchar * text_index_key_cursor_next (CamelIndexCursor *idc) { - CamelTextIndexKeyCursorPrivate *p = CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE (idc); + CamelTextIndexKeyCursorPrivate *p = CAMEL_TEXT_INDEX_KEY_CURSOR (idc)->priv; c (printf ("Going to next cursor for keyid %08x\n", p->keyid)); @@ -1811,8 +1787,6 @@ camel_text_index_key_cursor_class_init (CamelTextIndexKeyCursorClass *class) GObjectClass *object_class; CamelIndexCursorClass *index_cursor_class; - g_type_class_add_private (class, sizeof (CamelTextIndexKeyCursorPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = text_index_key_cursor_dispose; object_class->finalize = text_index_key_cursor_finalize; @@ -1824,8 +1798,7 @@ camel_text_index_key_cursor_class_init (CamelTextIndexKeyCursorClass *class) static void camel_text_index_key_cursor_init (CamelTextIndexKeyCursor *text_index_key_cursor) { - text_index_key_cursor->priv = - CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE (text_index_key_cursor); + text_index_key_cursor->priv = camel_text_index_key_cursor_get_instance_private (text_index_key_cursor); text_index_key_cursor->priv->keyid = 0; text_index_key_cursor->priv->flags = 0; @@ -1839,7 +1812,7 @@ camel_text_index_key_cursor_new (CamelTextIndex *idx, { CamelTextIndexKeyCursor *idc = g_object_new (CAMEL_TYPE_TEXT_INDEX_KEY_CURSOR, NULL); CamelIndexCursor *cic = &idc->parent; - CamelTextIndexKeyCursorPrivate *p = CAMEL_TEXT_INDEX_KEY_CURSOR_GET_PRIVATE (idc); + CamelTextIndexKeyCursorPrivate *p = CAMEL_TEXT_INDEX_KEY_CURSOR (idc)->priv; cic->index = g_object_ref (idx); p->table = g_object_ref (table); diff --git a/src/camel/camel-transport.c b/src/camel/camel-transport.c index d83eef0fa..627c5853a 100644 --- a/src/camel/camel-transport.c +++ b/src/camel/camel-transport.c @@ -26,10 +26,6 @@ #include "camel-mime-message.h" #include "camel-transport.h" -#define CAMEL_TRANSPORT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_TRANSPORT, CamelTransportPrivate)) - typedef struct _AsyncContext AsyncContext; struct _CamelTransportPrivate { @@ -43,7 +39,7 @@ struct _AsyncContext { gboolean sent_message_saved; }; -G_DEFINE_ABSTRACT_TYPE (CamelTransport, camel_transport, CAMEL_TYPE_SERVICE) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (CamelTransport, camel_transport, CAMEL_TYPE_SERVICE) static void async_context_free (AsyncContext *async_context) @@ -63,13 +59,12 @@ async_context_free (AsyncContext *async_context) static void camel_transport_class_init (CamelTransportClass *class) { - g_type_class_add_private (class, sizeof (CamelTransportPrivate)); } static void camel_transport_init (CamelTransport *transport) { - transport->priv = CAMEL_TRANSPORT_GET_PRIVATE (transport); + transport->priv = camel_transport_get_instance_private (transport); } /** diff --git a/src/camel/camel-vee-data-cache.c b/src/camel/camel-vee-data-cache.c index 83b6854d5..60b96bcb3 100644 --- a/src/camel/camel-vee-data-cache.c +++ b/src/camel/camel-vee-data-cache.c @@ -23,16 +23,12 @@ #include "camel-vee-data-cache.h" -#define CAMEL_VEE_SUBFOLDER_DATA_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_SUBFOLDER_DATA, CamelVeeSubfolderDataPrivate)) - struct _CamelVeeSubfolderDataPrivate { CamelFolder *folder; const gchar *folder_id; /* stored in string pool */ }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelVeeSubfolderData, camel_vee_subfolder_data, G_TYPE_OBJECT) @@ -42,7 +38,7 @@ vee_subfolder_data_dispose (GObject *object) { CamelVeeSubfolderDataPrivate *priv; - priv = CAMEL_VEE_SUBFOLDER_DATA_GET_PRIVATE (object); + priv = CAMEL_VEE_SUBFOLDER_DATA (object)->priv; g_clear_object (&priv->folder); @@ -56,7 +52,7 @@ vee_subfolder_data_finalize (GObject *object) { CamelVeeSubfolderDataPrivate *priv; - priv = CAMEL_VEE_SUBFOLDER_DATA_GET_PRIVATE (object); + priv = CAMEL_VEE_SUBFOLDER_DATA (object)->priv; if (priv->folder_id != NULL) camel_pstring_free (priv->folder_id); @@ -71,8 +67,6 @@ camel_vee_subfolder_data_class_init (CamelVeeSubfolderDataClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelVeeSubfolderDataPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = vee_subfolder_data_dispose; object_class->finalize = vee_subfolder_data_finalize; @@ -81,7 +75,7 @@ camel_vee_subfolder_data_class_init (CamelVeeSubfolderDataClass *class) static void camel_vee_subfolder_data_init (CamelVeeSubfolderData *data) { - data->priv = CAMEL_VEE_SUBFOLDER_DATA_GET_PRIVATE (data); + data->priv = camel_vee_subfolder_data_get_instance_private (data); } static void @@ -188,17 +182,13 @@ camel_vee_subfolder_data_get_folder_id (CamelVeeSubfolderData *data) /* ----------------------------------------------------------------------- */ -#define CAMEL_VEE_MESSAGE_INFO_DATA_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_MESSAGE_INFO_DATA, CamelVeeMessageInfoDataPrivate)) - struct _CamelVeeMessageInfoDataPrivate { CamelVeeSubfolderData *subfolder_data; const gchar *orig_message_uid; /* stored in string pool */ const gchar *vee_message_uid; /* stored in string pool */ }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelVeeMessageInfoData, camel_vee_message_info_data, G_TYPE_OBJECT) @@ -208,7 +198,7 @@ vee_message_info_data_dispose (GObject *object) { CamelVeeMessageInfoDataPrivate *priv; - priv = CAMEL_VEE_MESSAGE_INFO_DATA_GET_PRIVATE (object); + priv = CAMEL_VEE_MESSAGE_INFO_DATA (object)->priv; g_clear_object (&priv->subfolder_data); @@ -222,7 +212,7 @@ vee_message_info_data_finalize (GObject *object) { CamelVeeMessageInfoDataPrivate *priv; - priv = CAMEL_VEE_MESSAGE_INFO_DATA_GET_PRIVATE (object); + priv = CAMEL_VEE_MESSAGE_INFO_DATA (object)->priv; if (priv->orig_message_uid != NULL) camel_pstring_free (priv->orig_message_uid); @@ -240,9 +230,6 @@ camel_vee_message_info_data_class_init (CamelVeeMessageInfoDataClass *class) { GObjectClass *object_class; - g_type_class_add_private ( - class, sizeof (CamelVeeMessageInfoDataPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = vee_message_info_data_dispose; object_class->finalize = vee_message_info_data_finalize; @@ -251,7 +238,7 @@ camel_vee_message_info_data_class_init (CamelVeeMessageInfoDataClass *class) static void camel_vee_message_info_data_init (CamelVeeMessageInfoData *data) { - data->priv = CAMEL_VEE_MESSAGE_INFO_DATA_GET_PRIVATE (data); + data->priv = camel_vee_message_info_data_get_instance_private (data); } /** @@ -339,10 +326,6 @@ camel_vee_message_info_data_get_vee_message_uid (CamelVeeMessageInfoData *data) /* ----------------------------------------------------------------------- */ -#define CAMEL_VEE_DATA_CACHE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_DATA_CACHE, CamelVeeDataCachePrivate)) - struct _CamelVeeDataCachePrivate { GMutex sf_mutex; /* guards subfolder_hash */ GHashTable *subfolder_hash; /* CamelFolder * => CamelVeeSubfolderData * */ @@ -352,7 +335,7 @@ struct _CamelVeeDataCachePrivate { GHashTable *vee_message_uid_hash; /* const gchar *vee_uid => CamelVeeMessageInfoData * */ }; -G_DEFINE_TYPE (CamelVeeDataCache, camel_vee_data_cache, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelVeeDataCache, camel_vee_data_cache, G_TYPE_OBJECT) typedef struct _VeeData { CamelFolder *folder; @@ -391,7 +374,7 @@ vee_data_cache_dispose (GObject *object) { CamelVeeDataCachePrivate *priv; - priv = CAMEL_VEE_DATA_CACHE_GET_PRIVATE (object); + priv = CAMEL_VEE_DATA_CACHE (object)->priv; if (priv->subfolder_hash != NULL) { g_hash_table_destroy (priv->subfolder_hash); @@ -417,7 +400,7 @@ vee_data_cache_finalize (GObject *object) { CamelVeeDataCachePrivate *priv; - priv = CAMEL_VEE_DATA_CACHE_GET_PRIVATE (object); + priv = CAMEL_VEE_DATA_CACHE (object)->priv; g_mutex_clear (&priv->sf_mutex); g_mutex_clear (&priv->mi_mutex); @@ -431,8 +414,6 @@ camel_vee_data_cache_class_init (CamelVeeDataCacheClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelVeeDataCachePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = vee_data_cache_dispose; object_class->finalize = vee_data_cache_finalize; @@ -441,7 +422,7 @@ camel_vee_data_cache_class_init (CamelVeeDataCacheClass *class) static void camel_vee_data_cache_init (CamelVeeDataCache *data_cache) { - data_cache->priv = CAMEL_VEE_DATA_CACHE_GET_PRIVATE (data_cache); + data_cache->priv = camel_vee_data_cache_get_instance_private (data_cache); g_mutex_init (&data_cache->priv->sf_mutex); data_cache->priv->subfolder_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref); diff --git a/src/camel/camel-vee-folder.c b/src/camel/camel-vee-folder.c index 4068aca85..2d64daa65 100644 --- a/src/camel/camel-vee-folder.c +++ b/src/camel/camel-vee-folder.c @@ -43,10 +43,6 @@ extern gint camel_application_is_exiting; typedef struct _FolderChangedData FolderChangedData; -#define CAMEL_VEE_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_FOLDER, CamelVeeFolderPrivate)) - struct _CamelVeeFolderPrivate { guint32 flags; /* folder open flags */ gboolean destroyed; @@ -80,7 +76,7 @@ enum { PROP_AUTO_UPDATE = 0x2401 }; -G_DEFINE_TYPE (CamelVeeFolder, camel_vee_folder, CAMEL_TYPE_FOLDER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelVeeFolder, camel_vee_folder, CAMEL_TYPE_FOLDER) struct _FolderChangedData { CamelFolderChangeInfo *changes; @@ -1477,8 +1473,6 @@ camel_vee_folder_class_init (CamelVeeFolderClass *class) GObjectClass *object_class; CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelVeeFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = vee_folder_dispose; object_class->finalize = vee_folder_finalize; @@ -1526,7 +1520,7 @@ camel_vee_folder_init (CamelVeeFolder *vee_folder) { CamelFolder *folder = CAMEL_FOLDER (vee_folder); - vee_folder->priv = CAMEL_VEE_FOLDER_GET_PRIVATE (vee_folder); + vee_folder->priv = camel_vee_folder_get_instance_private (vee_folder); camel_folder_set_flags (folder, camel_folder_get_flags (folder) | CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY); diff --git a/src/camel/camel-vee-message-info.c b/src/camel/camel-vee-message-info.c index f11bf3a0e..926a37849 100644 --- a/src/camel/camel-vee-message-info.c +++ b/src/camel/camel-vee-message-info.c @@ -33,7 +33,7 @@ struct _CamelVeeMessageInfoPrivate { CamelFolderSummary *orig_summary; }; -G_DEFINE_TYPE (CamelVeeMessageInfo, camel_vee_message_info, CAMEL_TYPE_MESSAGE_INFO) +G_DEFINE_TYPE_WITH_PRIVATE (CamelVeeMessageInfo, camel_vee_message_info, CAMEL_TYPE_MESSAGE_INFO) static CamelMessageInfo * vee_message_info_clone (const CamelMessageInfo *mi, @@ -449,8 +449,6 @@ camel_vee_message_info_class_init (CamelVeeMessageInfoClass *class) CamelMessageInfoClass *mi_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelVeeMessageInfoPrivate)); - mi_class = CAMEL_MESSAGE_INFO_CLASS (class); mi_class->clone = vee_message_info_clone; mi_class->get_flags = vee_message_info_get_flags; @@ -495,7 +493,7 @@ camel_vee_message_info_class_init (CamelVeeMessageInfoClass *class) static void camel_vee_message_info_init (CamelVeeMessageInfo *vmi) { - vmi->priv = G_TYPE_INSTANCE_GET_PRIVATE (vmi, CAMEL_TYPE_VEE_MESSAGE_INFO, CamelVeeMessageInfoPrivate); + vmi->priv = camel_vee_message_info_get_instance_private (vmi); } /** diff --git a/src/camel/camel-vee-store.c b/src/camel/camel-vee-store.c index 3ca024e94..a8414b210 100644 --- a/src/camel/camel-vee-store.c +++ b/src/camel/camel-vee-store.c @@ -29,10 +29,6 @@ #include "camel-vee-folder.h" #include "camel-vee-store.h" -#define CAMEL_VEE_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_STORE, CamelVeeStorePrivate)) - /* Translators: 'Unmatched' is a folder name under Search folders where are shown * all messages not belonging into any other configured search folder */ #define PRETTY_UNMATCHED_FOLDER_NAME _("Unmatched") @@ -56,8 +52,6 @@ enum { PROP_UNMATCHED_ENABLED = 0x2400 }; -G_DEFINE_TYPE (CamelVeeStore, camel_vee_store, CAMEL_TYPE_STORE) - struct _CamelVeeStorePrivate { CamelVeeDataCache *vee_data_cache; CamelVeeFolder *unmatched_folder; @@ -70,6 +64,8 @@ struct _CamelVeeStorePrivate { GHashTable *vuid_usage_counts; /* gchar * (vuid) => gint of usages, those with 0 comes to unmatched_folder */ }; +G_DEFINE_TYPE_WITH_PRIVATE (CamelVeeStore, camel_vee_store, CAMEL_TYPE_STORE) + static gint vee_folder_cmp (gconstpointer ap, gconstpointer bp) @@ -153,7 +149,7 @@ vee_store_dispose (GObject *object) { CamelVeeStorePrivate *priv; - priv = CAMEL_VEE_STORE_GET_PRIVATE (object); + priv = CAMEL_VEE_STORE (object)->priv; g_clear_object (&priv->vee_data_cache); g_clear_object (&priv->unmatched_folder); @@ -167,7 +163,7 @@ vee_store_finalize (GObject *object) { CamelVeeStorePrivate *priv; - priv = CAMEL_VEE_STORE_GET_PRIVATE (object); + priv = CAMEL_VEE_STORE (object)->priv; g_hash_table_destroy (priv->subfolder_usage_counts); g_hash_table_destroy (priv->vuid_usage_counts); @@ -525,8 +521,6 @@ camel_vee_store_class_init (CamelVeeStoreClass *class) CamelServiceClass *service_class; CamelStoreClass *store_class; - g_type_class_add_private (class, sizeof (CamelVeeStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = vee_store_set_property; object_class->get_property = vee_store_get_property; @@ -562,7 +556,7 @@ camel_vee_store_init (CamelVeeStore *vee_store) { CamelStore *store = CAMEL_STORE (vee_store); - vee_store->priv = CAMEL_VEE_STORE_GET_PRIVATE (vee_store); + vee_store->priv = camel_vee_store_get_instance_private (vee_store); vee_store->priv->vee_data_cache = camel_vee_data_cache_new (); vee_store->priv->unmatched_enabled = TRUE; diff --git a/src/camel/camel-vee-summary.c b/src/camel/camel-vee-summary.c index 80626e8af..6f2ed5c2a 100644 --- a/src/camel/camel-vee-summary.c +++ b/src/camel/camel-vee-summary.c @@ -39,16 +39,12 @@ #define d(x) -#define CAMEL_VEE_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_VEE_SUMMARY, CamelVeeSummaryPrivate)) - struct _CamelVeeSummaryPrivate { /* CamelFolder * => GHashTable * of gchar *vuid */ GHashTable *vuids_by_subfolder; }; -G_DEFINE_TYPE (CamelVeeSummary, camel_vee_summary, CAMEL_TYPE_FOLDER_SUMMARY) +G_DEFINE_TYPE_WITH_PRIVATE (CamelVeeSummary, camel_vee_summary, CAMEL_TYPE_FOLDER_SUMMARY) static CamelMessageInfo * message_info_from_uid (CamelFolderSummary *s, @@ -122,7 +118,7 @@ vee_summary_finalize (GObject *object) { CamelVeeSummaryPrivate *priv; - priv = CAMEL_VEE_SUMMARY_GET_PRIVATE (object); + priv = CAMEL_VEE_SUMMARY (object)->priv; g_hash_table_destroy (priv->vuids_by_subfolder); @@ -136,8 +132,6 @@ camel_vee_summary_class_init (CamelVeeSummaryClass *class) GObjectClass *object_class; CamelFolderSummaryClass *folder_summary_class; - g_type_class_add_private (class, sizeof (CamelVeeSummaryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = vee_summary_finalize; @@ -150,7 +144,7 @@ camel_vee_summary_class_init (CamelVeeSummaryClass *class) static void camel_vee_summary_init (CamelVeeSummary *vee_summary) { - vee_summary->priv = CAMEL_VEE_SUMMARY_GET_PRIVATE (vee_summary); + vee_summary->priv = camel_vee_summary_get_instance_private (vee_summary); vee_summary->priv->vuids_by_subfolder = g_hash_table_new_full ( (GHashFunc) g_direct_hash, diff --git a/src/camel/camel-vtrash-folder.c b/src/camel/camel-vtrash-folder.c index 79198e895..12ba28ca8 100644 --- a/src/camel/camel-vtrash-folder.c +++ b/src/camel/camel-vtrash-folder.c @@ -63,7 +63,7 @@ struct _transfer_data { guint32 sbit; }; -G_DEFINE_TYPE (CamelVTrashFolder, camel_vtrash_folder, CAMEL_TYPE_VEE_FOLDER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelVTrashFolder, camel_vtrash_folder, CAMEL_TYPE_VEE_FOLDER) static void transfer_messages (CamelFolder *folder, @@ -223,8 +223,6 @@ camel_vtrash_folder_class_init (CamelVTrashFolderClass *class) { CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelVTrashFolderPrivate)); - folder_class = CAMEL_FOLDER_CLASS (class); folder_class->append_message_sync = vtrash_folder_append_message_sync; folder_class->transfer_messages_to_sync = vtrash_folder_transfer_messages_to_sync; @@ -233,7 +231,7 @@ camel_vtrash_folder_class_init (CamelVTrashFolderClass *class) static void camel_vtrash_folder_init (CamelVTrashFolder *vtrash_folder) { - vtrash_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (vtrash_folder, CAMEL_TYPE_VTRASH_FOLDER, CamelVTrashFolderPrivate); + vtrash_folder->priv = camel_vtrash_folder_get_instance_private (vtrash_folder); } /** diff --git a/src/camel/providers/imapx/camel-imapx-conn-manager.c b/src/camel/providers/imapx/camel-imapx-conn-manager.c index 02bcd8f77..c14a0d5e1 100644 --- a/src/camel/providers/imapx/camel-imapx-conn-manager.c +++ b/src/camel/providers/imapx/camel-imapx-conn-manager.c @@ -44,10 +44,6 @@ #define JOB_QUEUE_LOCK(x) g_rec_mutex_lock (&(x)->priv->job_queue_lock) #define JOB_QUEUE_UNLOCK(x) g_rec_mutex_unlock (&(x)->priv->job_queue_lock) -#define CAMEL_IMAPX_CONN_MANAGER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_CONN_MANAGER, CamelIMAPXConnManagerPrivate)) - typedef struct _ConnectionInfo ConnectionInfo; struct _CamelIMAPXConnManagerPrivate { @@ -95,7 +91,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXConnManager, camel_imapx_conn_manager, G_TYPE_OBJECT) @@ -627,7 +623,7 @@ imapx_conn_manager_finalize (GObject *object) { CamelIMAPXConnManagerPrivate *priv; - priv = CAMEL_IMAPX_CONN_MANAGER_GET_PRIVATE (object); + priv = CAMEL_IMAPX_CONN_MANAGER (object)->priv; g_warn_if_fail (priv->pending_connections == NULL); g_warn_if_fail (priv->job_queue == NULL); @@ -653,8 +649,6 @@ camel_imapx_conn_manager_class_init (CamelIMAPXConnManagerClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXConnManagerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_conn_manager_set_property; object_class->get_property = imapx_conn_manager_get_property; @@ -686,7 +680,7 @@ camel_imapx_conn_manager_class_init (CamelIMAPXConnManagerClass *class) static void camel_imapx_conn_manager_init (CamelIMAPXConnManager *conn_man) { - conn_man->priv = CAMEL_IMAPX_CONN_MANAGER_GET_PRIVATE (conn_man); + conn_man->priv = camel_imapx_conn_manager_get_instance_private (conn_man); g_rw_lock_init (&conn_man->priv->rw_lock); g_rec_mutex_init (&conn_man->priv->job_queue_lock); diff --git a/src/camel/providers/imapx/camel-imapx-folder.c b/src/camel/providers/imapx/camel-imapx-folder.c index 055eb4a4c..40b19f7b6 100644 --- a/src/camel/providers/imapx/camel-imapx-folder.c +++ b/src/camel/providers/imapx/camel-imapx-folder.c @@ -36,10 +36,6 @@ #define d(...) camel_imapx_debug(debug, '?', __VA_ARGS__) -#define CAMEL_IMAPX_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_FOLDER, CamelIMAPXFolderPrivate)) - struct _CamelIMAPXFolderPrivate { GMutex property_lock; GWeakRef mailbox; @@ -61,7 +57,7 @@ enum { PROP_CHECK_FOLDER = 0x2502 }; -G_DEFINE_TYPE (CamelIMAPXFolder, camel_imapx_folder, CAMEL_TYPE_OFFLINE_FOLDER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelIMAPXFolder, camel_imapx_folder, CAMEL_TYPE_OFFLINE_FOLDER) static gboolean imapx_folder_get_apply_filters (CamelIMAPXFolder *folder); @@ -1093,8 +1089,6 @@ camel_imapx_folder_class_init (CamelIMAPXFolderClass *class) GObjectClass *object_class; CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelIMAPXFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_folder_set_property; object_class->get_property = imapx_folder_get_property; @@ -1178,7 +1172,7 @@ camel_imapx_folder_init (CamelIMAPXFolder *imapx_folder) (GDestroyNotify) camel_pstring_free, (GDestroyNotify) NULL); - imapx_folder->priv = CAMEL_IMAPX_FOLDER_GET_PRIVATE (imapx_folder); + imapx_folder->priv = camel_imapx_folder_get_instance_private (imapx_folder); camel_folder_set_flags (folder, camel_folder_get_flags (folder) | CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY); diff --git a/src/camel/providers/imapx/camel-imapx-input-stream.c b/src/camel/providers/imapx/camel-imapx-input-stream.c index bb55d62e8..64e814dd1 100644 --- a/src/camel/providers/imapx/camel-imapx-input-stream.c +++ b/src/camel/providers/imapx/camel-imapx-input-stream.c @@ -31,10 +31,6 @@ #include "camel-imapx-input-stream.h" -#define CAMEL_IMAPX_INPUT_STREAM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_INPUT_STREAM, CamelIMAPXInputStreamPrivate)) - struct _CamelIMAPXInputStreamPrivate { guchar *buf, *ptr, *end; guint literal; @@ -58,6 +54,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelIMAPXInputStream, camel_imapx_input_stream, G_TYPE_FILTER_INPUT_STREAM, + G_ADD_PRIVATE (CamelIMAPXInputStream) G_IMPLEMENT_INTERFACE ( G_TYPE_POLLABLE_INPUT_STREAM, camel_imapx_input_stream_pollable_init)) @@ -111,7 +108,7 @@ imapx_input_stream_finalize (GObject *object) { CamelIMAPXInputStreamPrivate *priv; - priv = CAMEL_IMAPX_INPUT_STREAM_GET_PRIVATE (object); + priv = CAMEL_IMAPX_INPUT_STREAM (object)->priv; g_free (priv->buf); g_free (priv->tokenbuf); @@ -132,7 +129,7 @@ imapx_input_stream_read (GInputStream *stream, GInputStream *base_stream; gssize max; - priv = CAMEL_IMAPX_INPUT_STREAM_GET_PRIVATE (stream); + priv = CAMEL_IMAPX_INPUT_STREAM (stream)->priv; base_stream = g_filter_input_stream_get_base_stream ( G_FILTER_INPUT_STREAM (stream)); @@ -236,9 +233,6 @@ camel_imapx_input_stream_class_init (CamelIMAPXInputStreamClass *class) GObjectClass *object_class; GInputStreamClass *input_stream_class; - g_type_class_add_private ( - class, sizeof (CamelIMAPXInputStreamPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = imapx_input_stream_finalize; @@ -258,7 +252,7 @@ camel_imapx_input_stream_pollable_init (GPollableInputStreamInterface *iface) static void camel_imapx_input_stream_init (CamelIMAPXInputStream *is) { - is->priv = CAMEL_IMAPX_INPUT_STREAM_GET_PRIVATE (is); + is->priv = camel_imapx_input_stream_get_instance_private (is); /* +1 is room for appending a 0 if we need to for a token */ is->priv->bufsize = 4096; diff --git a/src/camel/providers/imapx/camel-imapx-list-response.c b/src/camel/providers/imapx/camel-imapx-list-response.c index a11753e9e..c0eb4b51d 100644 --- a/src/camel/providers/imapx/camel-imapx-list-response.c +++ b/src/camel/providers/imapx/camel-imapx-list-response.c @@ -37,10 +37,6 @@ #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_LIST_RESPONSE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_LIST_RESPONSE, CamelIMAPXListResponsePrivate)) - struct _CamelIMAPXListResponsePrivate { gchar *mailbox_name; gchar separator; @@ -48,7 +44,7 @@ struct _CamelIMAPXListResponsePrivate { GHashTable *extended_items; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXListResponse, camel_imapx_list_response, G_TYPE_OBJECT) @@ -78,7 +74,7 @@ imapx_list_response_finalize (GObject *object) { CamelIMAPXListResponsePrivate *priv; - priv = CAMEL_IMAPX_LIST_RESPONSE_GET_PRIVATE (object); + priv = CAMEL_IMAPX_LIST_RESPONSE (object)->priv; g_free (priv->mailbox_name); @@ -96,9 +92,6 @@ camel_imapx_list_response_class_init (CamelIMAPXListResponseClass *class) GObjectClass *object_class; gint ii; - g_type_class_add_private ( - class, sizeof (CamelIMAPXListResponsePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = imapx_list_response_finalize; @@ -122,7 +115,7 @@ camel_imapx_list_response_init (CamelIMAPXListResponse *response) (GDestroyNotify) g_free, (GDestroyNotify) g_variant_unref); - response->priv = CAMEL_IMAPX_LIST_RESPONSE_GET_PRIVATE (response); + response->priv = camel_imapx_list_response_get_instance_private (response); response->priv->attributes = attributes; response->priv->extended_items = extended_items; } diff --git a/src/camel/providers/imapx/camel-imapx-logger.c b/src/camel/providers/imapx/camel-imapx-logger.c index 6d15cd547..287628ffb 100644 --- a/src/camel/providers/imapx/camel-imapx-logger.c +++ b/src/camel/providers/imapx/camel-imapx-logger.c @@ -33,10 +33,6 @@ #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_LOGGER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_LOGGER, CamelIMAPXLoggerPrivate)) - struct _CamelIMAPXLoggerPrivate { gchar prefix; }; @@ -54,6 +50,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelIMAPXLogger, camel_imapx_logger, G_TYPE_OBJECT, + G_ADD_PRIVATE (CamelIMAPXLogger) G_IMPLEMENT_INTERFACE ( G_TYPE_CONVERTER, camel_imapx_logger_interface_init)) @@ -116,7 +113,7 @@ imapx_logger_convert (GConverter *converter, gsize min_size; const gchar *login_start; - priv = CAMEL_IMAPX_LOGGER_GET_PRIVATE (converter); + priv = CAMEL_IMAPX_LOGGER (converter)->priv; min_size = MIN (inbuf_size, outbuf_size); @@ -171,8 +168,6 @@ camel_imapx_logger_class_init (CamelIMAPXLoggerClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXLoggerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_logger_set_property; object_class->get_property = imapx_logger_get_property; @@ -200,7 +195,7 @@ camel_imapx_logger_interface_init (GConverterIface *iface) static void camel_imapx_logger_init (CamelIMAPXLogger *logger) { - logger->priv = CAMEL_IMAPX_LOGGER_GET_PRIVATE (logger); + logger->priv = camel_imapx_logger_get_instance_private (logger); } /** diff --git a/src/camel/providers/imapx/camel-imapx-mailbox.c b/src/camel/providers/imapx/camel-imapx-mailbox.c index f4cbc70c1..dbf9740cd 100644 --- a/src/camel/providers/imapx/camel-imapx-mailbox.c +++ b/src/camel/providers/imapx/camel-imapx-mailbox.c @@ -33,10 +33,6 @@ #include "camel-imapx-mailbox.h" #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_MAILBOX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_MAILBOX, CamelIMAPXMailboxPrivate)) - struct _CamelIMAPXMailboxPrivate { gchar *name; gchar separator; @@ -64,7 +60,7 @@ struct _CamelIMAPXMailboxPrivate { gchar **quota_roots; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXMailbox, camel_imapx_mailbox, G_TYPE_OBJECT) @@ -85,7 +81,7 @@ imapx_mailbox_dispose (GObject *object) { CamelIMAPXMailboxPrivate *priv; - priv = CAMEL_IMAPX_MAILBOX_GET_PRIVATE (object); + priv = CAMEL_IMAPX_MAILBOX (object)->priv; g_clear_object (&priv->namespace); @@ -98,7 +94,7 @@ imapx_mailbox_finalize (GObject *object) { CamelIMAPXMailboxPrivate *priv; - priv = CAMEL_IMAPX_MAILBOX_GET_PRIVATE (object); + priv = CAMEL_IMAPX_MAILBOX (object)->priv; g_free (priv->name); @@ -117,8 +113,6 @@ camel_imapx_mailbox_class_init (CamelIMAPXMailboxClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXMailboxPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = imapx_mailbox_dispose; object_class->finalize = imapx_mailbox_finalize; @@ -127,7 +121,7 @@ camel_imapx_mailbox_class_init (CamelIMAPXMailboxClass *class) static void camel_imapx_mailbox_init (CamelIMAPXMailbox *mailbox) { - mailbox->priv = CAMEL_IMAPX_MAILBOX_GET_PRIVATE (mailbox); + mailbox->priv = camel_imapx_mailbox_get_instance_private (mailbox); g_mutex_init (&mailbox->priv->property_lock); g_mutex_init (&mailbox->priv->update_lock); diff --git a/src/camel/providers/imapx/camel-imapx-message-info.c b/src/camel/providers/imapx/camel-imapx-message-info.c index 26b9cd71e..7bdc10cde 100644 --- a/src/camel/providers/imapx/camel-imapx-message-info.c +++ b/src/camel/providers/imapx/camel-imapx-message-info.c @@ -37,7 +37,7 @@ enum { PROP_SERVER_USER_TAGS }; -G_DEFINE_TYPE (CamelIMAPXMessageInfo, camel_imapx_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelIMAPXMessageInfo, camel_imapx_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) static CamelMessageInfo * imapx_message_info_clone (const CamelMessageInfo *mi, @@ -262,8 +262,6 @@ camel_imapx_message_info_class_init (CamelIMAPXMessageInfoClass *class) CamelMessageInfoClass *mi_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXMessageInfoPrivate)); - mi_class = CAMEL_MESSAGE_INFO_CLASS (class); mi_class->clone = imapx_message_info_clone; mi_class->load = imapx_message_info_load; @@ -334,7 +332,7 @@ camel_imapx_message_info_class_init (CamelIMAPXMessageInfoClass *class) static void camel_imapx_message_info_init (CamelIMAPXMessageInfo *imi) { - imi->priv = G_TYPE_INSTANCE_GET_PRIVATE (imi, CAMEL_TYPE_IMAPX_MESSAGE_INFO, CamelIMAPXMessageInfoPrivate); + imi->priv = camel_imapx_message_info_get_instance_private (imi); } guint32 diff --git a/src/camel/providers/imapx/camel-imapx-namespace-response.c b/src/camel/providers/imapx/camel-imapx-namespace-response.c index 545c3bd38..f935187f1 100644 --- a/src/camel/providers/imapx/camel-imapx-namespace-response.c +++ b/src/camel/providers/imapx/camel-imapx-namespace-response.c @@ -33,15 +33,11 @@ #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_NAMESPACE_RESPONSE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_NAMESPACE_RESPONSE, CamelIMAPXNamespaceResponsePrivate)) - struct _CamelIMAPXNamespaceResponsePrivate { GQueue namespaces; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXNamespaceResponse, camel_imapx_namespace_response, G_TYPE_OBJECT) @@ -63,7 +59,7 @@ imapx_namespace_response_dispose (GObject *object) { CamelIMAPXNamespaceResponsePrivate *priv; - priv = CAMEL_IMAPX_NAMESPACE_RESPONSE_GET_PRIVATE (object); + priv = CAMEL_IMAPX_NAMESPACE_RESPONSE (object)->priv; while (!g_queue_is_empty (&priv->namespaces)) g_object_unref (g_queue_pop_head (&priv->namespaces)); @@ -78,9 +74,6 @@ camel_imapx_namespace_response_class_init (CamelIMAPXNamespaceResponseClass *cla { GObjectClass *object_class; - g_type_class_add_private ( - class, sizeof (CamelIMAPXNamespaceResponsePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = imapx_namespace_response_dispose; } @@ -88,8 +81,7 @@ camel_imapx_namespace_response_class_init (CamelIMAPXNamespaceResponseClass *cla static void camel_imapx_namespace_response_init (CamelIMAPXNamespaceResponse *response) { - response->priv = - CAMEL_IMAPX_NAMESPACE_RESPONSE_GET_PRIVATE (response); + response->priv = camel_imapx_namespace_response_get_instance_private (response); } static gboolean diff --git a/src/camel/providers/imapx/camel-imapx-namespace.c b/src/camel/providers/imapx/camel-imapx-namespace.c index 02b8ee816..7c4b84b1e 100644 --- a/src/camel/providers/imapx/camel-imapx-namespace.c +++ b/src/camel/providers/imapx/camel-imapx-namespace.c @@ -29,17 +29,13 @@ #include "camel-imapx-namespace.h" -#define CAMEL_IMAPX_NAMESPACE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_NAMESPACE, CamelIMAPXNamespacePrivate)) - struct _CamelIMAPXNamespacePrivate { CamelIMAPXNamespaceCategory category; gchar *prefix; gchar separator; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXNamespace, camel_imapx_namespace, G_TYPE_OBJECT) @@ -49,7 +45,7 @@ imapx_namespace_finalize (GObject *object) { CamelIMAPXNamespacePrivate *priv; - priv = CAMEL_IMAPX_NAMESPACE_GET_PRIVATE (object); + priv = CAMEL_IMAPX_NAMESPACE (object)->priv; g_free (priv->prefix); @@ -62,8 +58,6 @@ camel_imapx_namespace_class_init (CamelIMAPXNamespaceClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXNamespacePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = imapx_namespace_finalize; } @@ -71,7 +65,7 @@ camel_imapx_namespace_class_init (CamelIMAPXNamespaceClass *class) static void camel_imapx_namespace_init (CamelIMAPXNamespace *namespace) { - namespace->priv = CAMEL_IMAPX_NAMESPACE_GET_PRIVATE (namespace); + namespace->priv = camel_imapx_namespace_get_instance_private (namespace); } /** diff --git a/src/camel/providers/imapx/camel-imapx-search.c b/src/camel/providers/imapx/camel-imapx-search.c index b687a37b6..6d68f700e 100644 --- a/src/camel/providers/imapx/camel-imapx-search.c +++ b/src/camel/providers/imapx/camel-imapx-search.c @@ -25,10 +25,6 @@ #include "camel-imapx-folder.h" -#define CAMEL_IMAPX_SEARCH_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_SEARCH, CamelIMAPXSearchPrivate)) - struct _CamelIMAPXSearchPrivate { GWeakRef imapx_store; gint *local_data_search; /* not NULL, if testing whether all used headers are all locally available */ @@ -42,7 +38,7 @@ enum { PROP_STORE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXSearch, camel_imapx_search, CAMEL_TYPE_FOLDER_SEARCH) @@ -87,7 +83,7 @@ imapx_search_dispose (GObject *object) { CamelIMAPXSearchPrivate *priv; - priv = CAMEL_IMAPX_SEARCH_GET_PRIVATE (object); + priv = CAMEL_IMAPX_SEARCH (object)->priv; g_weak_ref_set (&priv->imapx_store, NULL); @@ -100,7 +96,7 @@ imapx_search_finalize (GObject *object) { CamelIMAPXSearchPrivate *priv; - priv = CAMEL_IMAPX_SEARCH_GET_PRIVATE (object); + priv = CAMEL_IMAPX_SEARCH (object)->priv; g_weak_ref_clear (&priv->imapx_store); @@ -639,8 +635,6 @@ camel_imapx_search_class_init (CamelIMAPXSearchClass *class) GObjectClass *object_class; CamelFolderSearchClass *search_class; - g_type_class_add_private (class, sizeof (CamelIMAPXSearchPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_search_set_property; object_class->get_property = imapx_search_get_property; @@ -669,7 +663,7 @@ camel_imapx_search_class_init (CamelIMAPXSearchClass *class) static void camel_imapx_search_init (CamelIMAPXSearch *search) { - search->priv = CAMEL_IMAPX_SEARCH_GET_PRIVATE (search); + search->priv = camel_imapx_search_get_instance_private (search); search->priv->local_data_search = NULL; g_weak_ref_init (&search->priv->imapx_store, NULL); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c index b71e87694..65aa11d03 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -47,10 +47,6 @@ #include "camel-imapx-summary.h" #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_SERVER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_SERVER, CamelIMAPXServerPrivate)) - #define c(...) camel_imapx_debug(command, __VA_ARGS__) #define e(...) camel_imapx_debug(extra, __VA_ARGS__) @@ -366,7 +362,7 @@ static gint imapx_uids_array_cmp (gconstpointer ap, gconstpointer bp); static void imapx_sync_free_user (GArray *user_set); -G_DEFINE_TYPE (CamelIMAPXServer, camel_imapx_server, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CamelIMAPXServer, camel_imapx_server, G_TYPE_OBJECT) typedef struct _FetchChangesInfo { guint32 server_flags; @@ -3657,8 +3653,6 @@ camel_imapx_server_class_init (CamelIMAPXServerClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXServerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_server_set_property; object_class->get_property = imapx_server_get_property; @@ -3691,7 +3685,7 @@ camel_imapx_server_class_init (CamelIMAPXServerClass *class) static void camel_imapx_server_init (CamelIMAPXServer *is) { - is->priv = CAMEL_IMAPX_SERVER_GET_PRIVATE (is); + is->priv = camel_imapx_server_get_instance_private (is); is->priv->untagged_handlers = create_initial_untagged_handler_table (); diff --git a/src/camel/providers/imapx/camel-imapx-settings.c b/src/camel/providers/imapx/camel-imapx-settings.c index 92f3059d2..a09ea28c6 100644 --- a/src/camel/providers/imapx/camel-imapx-settings.c +++ b/src/camel/providers/imapx/camel-imapx-settings.c @@ -22,10 +22,6 @@ #define MIN_CONCURRENT_CONNECTIONS 1 #define MAX_CONCURRENT_CONNECTIONS 7 -#define CAMEL_IMAPX_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_SETTINGS, CamelIMAPXSettingsPrivate)) - struct _CamelIMAPXSettingsPrivate { GMutex property_lock; gchar *namespace; @@ -90,6 +86,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelIMAPXSettings, camel_imapx_settings, CAMEL_TYPE_OFFLINE_SETTINGS, + G_ADD_PRIVATE (CamelIMAPXSettings) G_IMPLEMENT_INTERFACE ( CAMEL_TYPE_NETWORK_SETTINGS, NULL)) @@ -471,7 +468,7 @@ imapx_settings_finalize (GObject *object) { CamelIMAPXSettingsPrivate *priv; - priv = CAMEL_IMAPX_SETTINGS_GET_PRIVATE (object); + priv = CAMEL_IMAPX_SETTINGS (object)->priv; g_mutex_clear (&priv->property_lock); @@ -489,8 +486,6 @@ camel_imapx_settings_class_init (CamelIMAPXSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelIMAPXSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_settings_set_property; object_class->get_property = imapx_settings_get_property; @@ -820,7 +815,7 @@ camel_imapx_settings_class_init (CamelIMAPXSettingsClass *class) static void camel_imapx_settings_init (CamelIMAPXSettings *settings) { - settings->priv = CAMEL_IMAPX_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_imapx_settings_get_instance_private (settings); g_mutex_init (&settings->priv->property_lock); } diff --git a/src/camel/providers/imapx/camel-imapx-status-response.c b/src/camel/providers/imapx/camel-imapx-status-response.c index 6fa1d933d..e1c13988d 100644 --- a/src/camel/providers/imapx/camel-imapx-status-response.c +++ b/src/camel/providers/imapx/camel-imapx-status-response.c @@ -31,10 +31,6 @@ #include "camel-imapx-utils.h" -#define CAMEL_IMAPX_STATUS_RESPONSE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_STATUS_RESPONSE, CamelIMAPXStatusResponsePrivate)) - struct _CamelIMAPXStatusResponsePrivate { gchar *mailbox_name; @@ -53,7 +49,7 @@ struct _CamelIMAPXStatusResponsePrivate { gboolean have_highestmodseq; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelIMAPXStatusResponse, camel_imapx_status_response, G_TYPE_OBJECT) @@ -63,7 +59,7 @@ imapx_status_response_finalize (GObject *object) { CamelIMAPXStatusResponsePrivate *priv; - priv = CAMEL_IMAPX_STATUS_RESPONSE_GET_PRIVATE (object); + priv = CAMEL_IMAPX_STATUS_RESPONSE (object)->priv; g_free (priv->mailbox_name); @@ -77,9 +73,6 @@ camel_imapx_status_response_class_init (CamelIMAPXStatusResponseClass *class) { GObjectClass *object_class; - g_type_class_add_private ( - class, sizeof (CamelIMAPXStatusResponsePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = imapx_status_response_finalize; } @@ -87,7 +80,7 @@ camel_imapx_status_response_class_init (CamelIMAPXStatusResponseClass *class) static void camel_imapx_status_response_init (CamelIMAPXStatusResponse *response) { - response->priv = CAMEL_IMAPX_STATUS_RESPONSE_GET_PRIVATE (response); + response->priv = camel_imapx_status_response_get_instance_private (response); } /** diff --git a/src/camel/providers/imapx/camel-imapx-store.c b/src/camel/providers/imapx/camel-imapx-store.c index ed3ee353f..7f10ac2e2 100644 --- a/src/camel/providers/imapx/camel-imapx-store.c +++ b/src/camel/providers/imapx/camel-imapx-store.c @@ -50,10 +50,6 @@ #define FINFO_REFRESH_INTERVAL 60 -#define CAMEL_IMAPX_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_IMAPX_STORE, CamelIMAPXStorePrivate)) - #define e(...) camel_imapx_debug(extra, __VA_ARGS__) struct _CamelIMAPXStorePrivate { @@ -112,6 +108,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelIMAPXStore, camel_imapx_store, CAMEL_TYPE_OFFLINE_STORE, + G_ADD_PRIVATE (CamelIMAPXStore) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, camel_imapx_store_initable_init) @@ -792,7 +789,7 @@ imapx_store_connect_to_settings (CamelStore *store) * in a CamelService is reponsible for deciding whether * camel_store_folder_info_stale() should be called. */ - priv = CAMEL_IMAPX_STORE_GET_PRIVATE (store); + priv = CAMEL_IMAPX_STORE (store)->priv; settings = camel_service_ref_settings (CAMEL_SERVICE (store)); @@ -903,7 +900,7 @@ imapx_store_finalize (GObject *object) { CamelIMAPXStorePrivate *priv; - priv = CAMEL_IMAPX_STORE_GET_PRIVATE (object); + priv = CAMEL_IMAPX_STORE (object)->priv; g_mutex_clear (&priv->get_finfo_lock); g_mutex_clear (&priv->server_lock); @@ -1014,7 +1011,7 @@ imapx_disconnect_sync (CamelService *service, { CamelIMAPXStorePrivate *priv; - priv = CAMEL_IMAPX_STORE_GET_PRIVATE (service); + priv = CAMEL_IMAPX_STORE (service)->priv; if (priv->conn_man != NULL) camel_imapx_conn_manager_disconnect_sync (priv->conn_man, cancellable, error); @@ -1039,7 +1036,7 @@ imapx_authenticate_sync (CamelService *service, CamelIMAPXServer *imapx_server; CamelAuthenticationResult result; - priv = CAMEL_IMAPX_STORE_GET_PRIVATE (service); + priv = CAMEL_IMAPX_STORE (service)->priv; if (g_cancellable_set_error_if_cancelled (cancellable, error)) return CAMEL_AUTHENTICATION_ERROR; @@ -3220,8 +3217,6 @@ camel_imapx_store_class_init (CamelIMAPXStoreClass *class) CamelStoreClass *store_class; CamelOfflineStoreClass *offline_store_class; - g_type_class_add_private (class, sizeof (CamelIMAPXStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = imapx_store_set_property; object_class->get_property = imapx_store_get_property; @@ -3335,7 +3330,7 @@ camel_subscribable_init (CamelSubscribableInterface *iface) static void camel_imapx_store_init (CamelIMAPXStore *store) { - store->priv = CAMEL_IMAPX_STORE_GET_PRIVATE (store); + store->priv = camel_imapx_store_get_instance_private (store); store->priv->conn_man = camel_imapx_conn_manager_new (CAMEL_STORE (store)); diff --git a/src/camel/providers/local/camel-local-folder.c b/src/camel/providers/local/camel-local-folder.c index 672b694ce..e1283e159 100644 --- a/src/camel/providers/local/camel-local-folder.c +++ b/src/camel/providers/local/camel-local-folder.c @@ -46,10 +46,6 @@ #define PATH_MAX _POSIX_PATH_MAX #endif -#define CAMEL_LOCAL_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_LOCAL_FOLDER, CamelLocalFolderPrivate)) - /* The custom property ID is a CamelArg artifact. * It still identifies the property in state files. */ enum { @@ -57,7 +53,7 @@ enum { PROP_INDEX_BODY = 0x2400 }; -G_DEFINE_TYPE (CamelLocalFolder, camel_local_folder, CAMEL_TYPE_FOLDER) +G_DEFINE_TYPE_WITH_PRIVATE (CamelLocalFolder, camel_local_folder, CAMEL_TYPE_FOLDER) static void local_folder_set_property (GObject *object, @@ -477,8 +473,6 @@ camel_local_folder_class_init (CamelLocalFolderClass *class) GObjectClass *object_class; CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelLocalFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = local_folder_set_property; object_class->get_property = local_folder_get_property; @@ -520,7 +514,7 @@ camel_local_folder_init (CamelLocalFolder *local_folder) { CamelFolder *folder = CAMEL_FOLDER (local_folder); - local_folder->priv = CAMEL_LOCAL_FOLDER_GET_PRIVATE (local_folder); + local_folder->priv = camel_local_folder_get_instance_private (local_folder); g_mutex_init (&local_folder->priv->search_lock); g_rec_mutex_init (&local_folder->priv->changes_lock); diff --git a/src/camel/providers/local/camel-local-store.c b/src/camel/providers/local/camel-local-store.c index 80e7eaa15..9a14e8c80 100644 --- a/src/camel/providers/local/camel-local-store.c +++ b/src/camel/providers/local/camel-local-store.c @@ -33,10 +33,6 @@ #define d(x) -#define CAMEL_LOCAL_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_LOCAL_STORE, CamelLocalStorePrivate)) - struct _CamelLocalStorePrivate { gboolean need_summary_check; }; @@ -46,7 +42,7 @@ enum { PROP_NEED_SUMMARY_CHECK }; -G_DEFINE_TYPE (CamelLocalStore, camel_local_store, CAMEL_TYPE_STORE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelLocalStore, camel_local_store, CAMEL_TYPE_STORE) static gint xrename (const gchar *oldp, @@ -662,8 +658,6 @@ camel_local_store_class_init (CamelLocalStoreClass *class) CamelServiceClass *service_class; CamelStoreClass *store_class; - g_type_class_add_private (class, sizeof (CamelLocalStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = local_store_set_property; object_class->get_property = local_store_get_property; @@ -704,7 +698,7 @@ camel_local_store_class_init (CamelLocalStoreClass *class) static void camel_local_store_init (CamelLocalStore *local_store) { - local_store->priv = CAMEL_LOCAL_STORE_GET_PRIVATE (local_store); + local_store->priv = camel_local_store_get_instance_private (local_store); } /* Returns whether is this store used as 'On This Computer' main store */ diff --git a/src/camel/providers/local/camel-maildir-message-info.c b/src/camel/providers/local/camel-maildir-message-info.c index 5f74fae99..94ef73067 100644 --- a/src/camel/providers/local/camel-maildir-message-info.c +++ b/src/camel/providers/local/camel-maildir-message-info.c @@ -33,7 +33,7 @@ enum { PROP_FILENAME }; -G_DEFINE_TYPE (CamelMaildirMessageInfo, camel_maildir_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMaildirMessageInfo, camel_maildir_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) static CamelMessageInfo * maildir_message_info_clone (const CamelMessageInfo *mi, @@ -138,8 +138,6 @@ camel_maildir_message_info_class_init (CamelMaildirMessageInfoClass *class) CamelMessageInfoClass *mi_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMaildirMessageInfoPrivate)); - mi_class = CAMEL_MESSAGE_INFO_CLASS (class); mi_class->clone = maildir_message_info_clone; mi_class->load = maildir_message_info_load; @@ -171,7 +169,7 @@ camel_maildir_message_info_class_init (CamelMaildirMessageInfoClass *class) static void camel_maildir_message_info_init (CamelMaildirMessageInfo *mmi) { - mmi->priv = G_TYPE_INSTANCE_GET_PRIVATE (mmi, CAMEL_TYPE_MAILDIR_MESSAGE_INFO, CamelMaildirMessageInfoPrivate); + mmi->priv = camel_maildir_message_info_get_instance_private (mmi); } const gchar * diff --git a/src/camel/providers/local/camel-maildir-store.c b/src/camel/providers/local/camel-maildir-store.c index 9611e0169..19d817f68 100644 --- a/src/camel/providers/local/camel-maildir-store.c +++ b/src/camel/providers/local/camel-maildir-store.c @@ -35,10 +35,6 @@ #define d(x) -#define CAMEL_MAILDIR_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MAILDIR_STORE, CamelMaildirStorePrivate)) - /* after the space is a version of the folder structure */ #define MAILDIR_CONTENT_VERSION_STR "maildir++ 1" #define MAILDIR_CONTENT_VERSION 1 @@ -71,7 +67,7 @@ static gchar *maildir_get_meta_path (CamelLocalStore *ls, const gchar *full_name static void maildir_migrate_hierarchy (CamelMaildirStore *mstore, gint maildir_version, GCancellable *cancellable, GError **error); static gboolean maildir_version_requires_migrate (const gchar *meta_filename, gboolean *file_exists, gint *maildir_version); -G_DEFINE_TYPE (CamelMaildirStore, camel_maildir_store, CAMEL_TYPE_LOCAL_STORE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMaildirStore, camel_maildir_store, CAMEL_TYPE_LOCAL_STORE) /* This fixes up some historical cruft of names starting with "./" */ static const gchar * @@ -967,8 +963,6 @@ camel_maildir_store_class_init (CamelMaildirStoreClass *class) CamelStoreClass *store_class; CamelLocalStoreClass *local_class; - g_type_class_add_private (class, sizeof (CamelMaildirStorePrivate)); - store_class = CAMEL_STORE_CLASS (class); store_class->hash_folder_name = maildir_store_hash_folder_name; store_class->equal_folder_name = maildir_store_equal_folder_name; @@ -987,7 +981,7 @@ camel_maildir_store_class_init (CamelMaildirStoreClass *class) static void camel_maildir_store_init (CamelMaildirStore *maildir_store) { - maildir_store->priv = CAMEL_MAILDIR_STORE_GET_PRIVATE (maildir_store); + maildir_store->priv = camel_maildir_store_get_instance_private (maildir_store); maildir_store->priv->already_migrated = FALSE; maildir_store->priv->can_escape_dots = TRUE; } diff --git a/src/camel/providers/local/camel-maildir-summary.c b/src/camel/providers/local/camel-maildir-summary.c index 36fd3c1f9..973e5a791 100644 --- a/src/camel/providers/local/camel-maildir-summary.c +++ b/src/camel/providers/local/camel-maildir-summary.c @@ -39,10 +39,6 @@ #include "camel-maildir-message-info.h" #include "camel-maildir-summary.h" -#define CAMEL_MAILDIR_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MAILDIR_SUMMARY, CamelMaildirSummaryPrivate)) - #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ #define CAMEL_MAILDIR_SUMMARY_VERSION (0x2000) @@ -92,7 +88,7 @@ struct _CamelMaildirMessageContentInfo { CamelMessageContentInfo info; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelMaildirSummary, camel_maildir_summary, CAMEL_TYPE_LOCAL_SUMMARY) @@ -102,7 +98,7 @@ maildir_summary_finalize (GObject *object) { CamelMaildirSummaryPrivate *priv; - priv = CAMEL_MAILDIR_SUMMARY_GET_PRIVATE (object); + priv = CAMEL_MAILDIR_SUMMARY (object)->priv; g_free (priv->hostname); g_mutex_clear (&priv->summary_lock); @@ -118,8 +114,6 @@ camel_maildir_summary_class_init (CamelMaildirSummaryClass *class) CamelFolderSummaryClass *folder_summary_class; CamelLocalSummaryClass *local_summary_class; - g_type_class_add_private (class, sizeof (CamelMaildirSummaryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = maildir_summary_finalize; @@ -147,8 +141,7 @@ camel_maildir_summary_init (CamelMaildirSummary *maildir_summary) folder_summary = CAMEL_FOLDER_SUMMARY (maildir_summary); - maildir_summary->priv = - CAMEL_MAILDIR_SUMMARY_GET_PRIVATE (maildir_summary); + maildir_summary->priv = camel_maildir_summary_get_instance_private (maildir_summary); /* set unique file version */ camel_folder_summary_set_version (folder_summary, camel_folder_summary_get_version (folder_summary) + CAMEL_MAILDIR_SUMMARY_VERSION); diff --git a/src/camel/providers/local/camel-mbox-message-info.c b/src/camel/providers/local/camel-mbox-message-info.c index 2c066bbfc..6ec18f6ef 100644 --- a/src/camel/providers/local/camel-mbox-message-info.c +++ b/src/camel/providers/local/camel-mbox-message-info.c @@ -33,7 +33,7 @@ enum { PROP_OFFSET }; -G_DEFINE_TYPE (CamelMboxMessageInfo, camel_mbox_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMboxMessageInfo, camel_mbox_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE) static CamelMessageInfo * mbox_message_info_clone (const CamelMessageInfo *mi, @@ -171,8 +171,6 @@ camel_mbox_message_info_class_init (CamelMboxMessageInfoClass *class) CamelMessageInfoClass *mi_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMboxMessageInfoPrivate)); - mi_class = CAMEL_MESSAGE_INFO_CLASS (class); mi_class->clone = mbox_message_info_clone; mi_class->load = mbox_message_info_load; @@ -205,7 +203,7 @@ camel_mbox_message_info_class_init (CamelMboxMessageInfoClass *class) static void camel_mbox_message_info_init (CamelMboxMessageInfo *mmi) { - mmi->priv = G_TYPE_INSTANCE_GET_PRIVATE (mmi, CAMEL_TYPE_MBOX_MESSAGE_INFO, CamelMboxMessageInfoPrivate); + mmi->priv = camel_mbox_message_info_get_instance_private (mmi); } goffset diff --git a/src/camel/providers/local/camel-mh-settings.c b/src/camel/providers/local/camel-mh-settings.c index 65603ec6d..593af90dd 100644 --- a/src/camel/providers/local/camel-mh-settings.c +++ b/src/camel/providers/local/camel-mh-settings.c @@ -17,10 +17,6 @@ #include "camel-mh-settings.h" -#define CAMEL_MH_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MH_SETTINGS, CamelMhSettingsPrivate)) - struct _CamelMhSettingsPrivate { gboolean use_dot_folders; }; @@ -30,7 +26,7 @@ enum { PROP_USE_DOT_FOLDERS }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelMhSettings, camel_mh_settings, CAMEL_TYPE_LOCAL_SETTINGS) @@ -75,8 +71,6 @@ camel_mh_settings_class_init (CamelMhSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelMhSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = mh_settings_set_property; object_class->get_property = mh_settings_get_property; @@ -98,7 +92,7 @@ camel_mh_settings_class_init (CamelMhSettingsClass *class) static void camel_mh_settings_init (CamelMhSettings *settings) { - settings->priv = CAMEL_MH_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_mh_settings_get_instance_private (settings); } /** diff --git a/src/camel/providers/local/camel-mh-summary.c b/src/camel/providers/local/camel-mh-summary.c index f3aa03432..70b6fbad5 100644 --- a/src/camel/providers/local/camel-mh-summary.c +++ b/src/camel/providers/local/camel-mh-summary.c @@ -37,10 +37,6 @@ #define CAMEL_MH_SUMMARY_VERSION (0x2000) -#define CAMEL_MH_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_MH_SUMMARY, CamelMhSummaryPrivate)) - static gint mh_summary_check (CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, GCancellable *cancellable, GError **error); static gint mh_summary_sync (CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, GCancellable *cancellable, GError **error); static gint mh_summary_decode_x_evolution (CamelLocalSummary *cls, const gchar *xev, CamelMessageInfo *info); @@ -52,7 +48,7 @@ struct _CamelMhSummaryPrivate { gchar *current_uid; }; -G_DEFINE_TYPE (CamelMhSummary, camel_mh_summary, CAMEL_TYPE_LOCAL_SUMMARY) +G_DEFINE_TYPE_WITH_PRIVATE (CamelMhSummary, camel_mh_summary, CAMEL_TYPE_LOCAL_SUMMARY) static void camel_mh_summary_class_init (CamelMhSummaryClass *class) @@ -60,8 +56,6 @@ camel_mh_summary_class_init (CamelMhSummaryClass *class) CamelFolderSummaryClass *folder_summary_class; CamelLocalSummaryClass *local_summary_class; - g_type_class_add_private (class, sizeof (CamelMhSummaryPrivate)); - folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class); folder_summary_class->sort_by = "uid"; folder_summary_class->collate = "mh_uid_sort"; @@ -78,7 +72,7 @@ camel_mh_summary_init (CamelMhSummary *mh_summary) { CamelFolderSummary *folder_summary; - mh_summary->priv = CAMEL_MH_SUMMARY_GET_PRIVATE (mh_summary); + mh_summary->priv = camel_mh_summary_get_instance_private (mh_summary); folder_summary = CAMEL_FOLDER_SUMMARY (mh_summary); diff --git a/src/camel/providers/local/camel-spool-settings.c b/src/camel/providers/local/camel-spool-settings.c index cdd9a9046..ad0504f04 100644 --- a/src/camel/providers/local/camel-spool-settings.c +++ b/src/camel/providers/local/camel-spool-settings.c @@ -17,10 +17,6 @@ #include "camel-spool-settings.h" -#define CAMEL_SPOOL_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SPOOL_SETTINGS, CamelSpoolSettingsPrivate)) - struct _CamelSpoolSettingsPrivate { gboolean use_xstatus_headers; }; @@ -30,7 +26,7 @@ enum { PROP_USE_XSTATUS_HEADERS }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelSpoolSettings, camel_spool_settings, CAMEL_TYPE_LOCAL_SETTINGS) @@ -75,8 +71,6 @@ camel_spool_settings_class_init (CamelSpoolSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSpoolSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = spool_settings_set_property; object_class->get_property = spool_settings_get_property; @@ -98,7 +92,7 @@ camel_spool_settings_class_init (CamelSpoolSettingsClass *class) static void camel_spool_settings_init (CamelSpoolSettings *settings) { - settings->priv = CAMEL_SPOOL_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_spool_settings_get_instance_private (settings); } /** diff --git a/src/camel/providers/local/camel-spool-store.c b/src/camel/providers/local/camel-spool-store.c index 481b869fe..151da9adf 100644 --- a/src/camel/providers/local/camel-spool-store.c +++ b/src/camel/providers/local/camel-spool-store.c @@ -35,10 +35,6 @@ #include "camel-spool-settings.h" #include "camel-spool-store.h" -#define CAMEL_SPOOL_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SPOOL_STORE, CamelSpoolStorePrivate)) - #define d(x) typedef enum _camel_spool_store_t { @@ -51,7 +47,7 @@ struct _CamelSpoolStorePrivate { gint placeholder; /* for future expansion */ }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelSpoolStore, camel_spool_store, CAMEL_TYPE_MBOX_STORE) @@ -685,8 +681,6 @@ camel_spool_store_class_init (CamelSpoolStoreClass *class) CamelStoreClass *store_class; CamelLocalStoreClass *local_store_class; - g_type_class_add_private (class, sizeof (CamelSpoolStorePrivate)); - service_class = CAMEL_SERVICE_CLASS (class); service_class->settings_type = CAMEL_TYPE_SPOOL_SETTINGS; service_class->get_name = spool_store_get_name; @@ -706,5 +700,5 @@ camel_spool_store_class_init (CamelSpoolStoreClass *class) static void camel_spool_store_init (CamelSpoolStore *spool_store) { - spool_store->priv = CAMEL_SPOOL_STORE_GET_PRIVATE (spool_store); + spool_store->priv = camel_spool_store_get_instance_private (spool_store); } diff --git a/src/camel/providers/nntp/camel-nntp-folder.c b/src/camel/providers/nntp/camel-nntp-folder.c index 349c330f3..4b6c00c5f 100644 --- a/src/camel/providers/nntp/camel-nntp-folder.c +++ b/src/camel/providers/nntp/camel-nntp-folder.c @@ -33,10 +33,6 @@ #include "camel-nntp-store.h" #include "camel-nntp-summary.h" -#define CAMEL_NNTP_FOLDER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_NNTP_FOLDER, CamelNNTPFolderPrivate)) - /* The custom property ID is a CamelArg artifact. * It still identifies the property in state files. */ enum { @@ -44,7 +40,7 @@ enum { PROP_APPLY_FILTERS = 0x2501 }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( CamelNNTPFolder, camel_nntp_folder, CAMEL_TYPE_OFFLINE_FOLDER) @@ -809,8 +805,6 @@ camel_nntp_folder_class_init (CamelNNTPFolderClass *class) GObjectClass *object_class; CamelFolderClass *folder_class; - g_type_class_add_private (class, sizeof (CamelNNTPFolderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = nntp_folder_set_property; object_class->get_property = nntp_folder_get_property; @@ -848,7 +842,7 @@ camel_nntp_folder_class_init (CamelNNTPFolderClass *class) static void camel_nntp_folder_init (CamelNNTPFolder *nntp_folder) { - nntp_folder->priv = CAMEL_NNTP_FOLDER_GET_PRIVATE (nntp_folder); + nntp_folder->priv = camel_nntp_folder_get_instance_private (nntp_folder); nntp_folder->changes = camel_folder_change_info_new (); g_mutex_init (&nntp_folder->priv->search_lock); diff --git a/src/camel/providers/nntp/camel-nntp-settings.c b/src/camel/providers/nntp/camel-nntp-settings.c index c4e7407db..34bec8e6e 100644 --- a/src/camel/providers/nntp/camel-nntp-settings.c +++ b/src/camel/providers/nntp/camel-nntp-settings.c @@ -17,10 +17,6 @@ #include "camel-nntp-settings.h" -#define CAMEL_NNTP_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_NNTP_SETTINGS, CamelNNTPSettingsPrivate)) - struct _CamelNNTPSettingsPrivate { gboolean filter_all; gboolean filter_junk; @@ -49,6 +45,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelNNTPSettings, camel_nntp_settings, CAMEL_TYPE_OFFLINE_SETTINGS, + G_ADD_PRIVATE (CamelNNTPSettings) G_IMPLEMENT_INTERFACE ( CAMEL_TYPE_NETWORK_SETTINGS, NULL)) @@ -222,8 +219,6 @@ camel_nntp_settings_class_init (CamelNNTPSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelNNTPSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = nntp_settings_set_property; object_class->get_property = nntp_settings_get_property; @@ -340,7 +335,7 @@ camel_nntp_settings_class_init (CamelNNTPSettingsClass *class) static void camel_nntp_settings_init (CamelNNTPSettings *settings) { - settings->priv = CAMEL_NNTP_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_nntp_settings_get_instance_private (settings); } /** diff --git a/src/camel/providers/nntp/camel-nntp-store.c b/src/camel/providers/nntp/camel-nntp-store.c index 9c4dd55e4..fb273bec5 100644 --- a/src/camel/providers/nntp/camel-nntp-store.c +++ b/src/camel/providers/nntp/camel-nntp-store.c @@ -43,10 +43,6 @@ #include <ws2tcpip.h> #endif -#define CAMEL_NNTP_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_NNTP_STORE, CamelNNTPStorePrivate)) - #define w(x) #define dd(x) (camel_debug("nntp")?(x):0) @@ -81,6 +77,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelNNTPStore, camel_nntp_store, CAMEL_TYPE_OFFLINE_STORE, + G_ADD_PRIVATE (CamelNNTPStore) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, camel_nntp_store_initable_init) @@ -158,7 +155,7 @@ nntp_store_dispose (GObject *object) { CamelNNTPStorePrivate *priv; - priv = CAMEL_NNTP_STORE_GET_PRIVATE (object); + priv = CAMEL_NNTP_STORE (object)->priv; /* Only run this the first time. */ if (priv->summary != NULL) { @@ -1716,8 +1713,6 @@ camel_nntp_store_class_init (CamelNNTPStoreClass *class) CamelServiceClass *service_class; CamelStoreClass *store_class; - g_type_class_add_private (class, sizeof (CamelNNTPStorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = nntp_store_set_property; object_class->get_property = nntp_store_get_property; @@ -1779,7 +1774,7 @@ camel_subscribable_init (CamelSubscribableInterface *iface) static void camel_nntp_store_init (CamelNNTPStore *nntp_store) { - nntp_store->priv = CAMEL_NNTP_STORE_GET_PRIVATE (nntp_store); + nntp_store->priv = camel_nntp_store_get_instance_private (nntp_store); g_mutex_init (&nntp_store->priv->property_lock); diff --git a/src/camel/providers/nntp/camel-nntp-summary.c b/src/camel/providers/nntp/camel-nntp-summary.c index 22dce4136..5712800e5 100644 --- a/src/camel/providers/nntp/camel-nntp-summary.c +++ b/src/camel/providers/nntp/camel-nntp-summary.c @@ -41,10 +41,6 @@ #define CAMEL_NNTP_SUMMARY_VERSION (1) -#define CAMEL_NNTP_SUMMARY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_NNTP_SUMMARY, CamelNNTPSummaryPrivate)) - struct _CamelNNTPSummaryPrivate { gchar *uid; guint last_full_resync; @@ -58,15 +54,13 @@ static CamelMessageInfo * message_info_new_from_headers (CamelFolderSummary *, c static gboolean summary_header_load (CamelFolderSummary *s, CamelFIRecord *mir); static CamelFIRecord * summary_header_save (CamelFolderSummary *s, GError **error); -G_DEFINE_TYPE (CamelNNTPSummary, camel_nntp_summary, CAMEL_TYPE_FOLDER_SUMMARY) +G_DEFINE_TYPE_WITH_PRIVATE (CamelNNTPSummary, camel_nntp_summary, CAMEL_TYPE_FOLDER_SUMMARY) static void camel_nntp_summary_class_init (CamelNNTPSummaryClass *class) { CamelFolderSummaryClass *folder_summary_class; - g_type_class_add_private (class, sizeof (CamelNNTPSummaryPrivate)); - folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class); folder_summary_class->message_info_new_from_headers = message_info_new_from_headers; folder_summary_class->summary_header_load = summary_header_load; @@ -78,7 +72,7 @@ camel_nntp_summary_init (CamelNNTPSummary *nntp_summary) { CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (nntp_summary); - nntp_summary->priv = CAMEL_NNTP_SUMMARY_GET_PRIVATE (nntp_summary); + nntp_summary->priv = camel_nntp_summary_get_instance_private (nntp_summary); /* and a unique file version */ camel_folder_summary_set_version (summary, camel_folder_summary_get_version (summary) + CAMEL_NNTP_SUMMARY_VERSION); diff --git a/src/camel/providers/pop3/camel-pop3-settings.c b/src/camel/providers/pop3/camel-pop3-settings.c index ad7158107..b598b95aa 100644 --- a/src/camel/providers/pop3/camel-pop3-settings.c +++ b/src/camel/providers/pop3/camel-pop3-settings.c @@ -17,10 +17,6 @@ #include "camel-pop3-settings.h" -#define CAMEL_POP3_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_POP3_SETTINGS, CamelPOP3SettingsPrivate)) - struct _CamelPOP3SettingsPrivate { gint delete_after_days; gboolean delete_expunged; @@ -49,6 +45,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelPOP3Settings, camel_pop3_settings, CAMEL_TYPE_STORE_SETTINGS, + G_ADD_PRIVATE (CamelPOP3Settings) G_IMPLEMENT_INTERFACE ( CAMEL_TYPE_NETWORK_SETTINGS, NULL)) @@ -222,8 +219,6 @@ camel_pop3_settings_class_init (CamelPOP3SettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelPOP3SettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = pop3_settings_set_property; object_class->get_property = pop3_settings_get_property; @@ -346,7 +341,7 @@ camel_pop3_settings_class_init (CamelPOP3SettingsClass *class) static void camel_pop3_settings_init (CamelPOP3Settings *settings) { - settings->priv = CAMEL_POP3_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_pop3_settings_get_instance_private (settings); } /** diff --git a/src/camel/providers/pop3/camel-pop3-store.c b/src/camel/providers/pop3/camel-pop3-store.c index 3f565424b..a3bdb4eb3 100644 --- a/src/camel/providers/pop3/camel-pop3-store.c +++ b/src/camel/providers/pop3/camel-pop3-store.c @@ -39,10 +39,6 @@ #include <ws2tcpip.h> #endif -#define CAMEL_POP3_STORE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_POP3_STORE, CamelPOP3StorePrivate)) - /* Specified in RFC 1939 */ #define POP3_PORT 110 #define POP3S_PORT 995 @@ -72,6 +68,7 @@ G_DEFINE_TYPE_WITH_CODE ( CamelPOP3Store, camel_pop3_store, CAMEL_TYPE_STORE, + G_ADD_PRIVATE (CamelPOP3Store) G_IMPLEMENT_INTERFACE ( CAMEL_TYPE_NETWORK_SERVICE, camel_network_service_init)) @@ -437,7 +434,7 @@ pop3_store_dispose (GObject *object) { CamelPOP3StorePrivate *priv; - priv = CAMEL_POP3_STORE_GET_PRIVATE (object); + priv = CAMEL_POP3_STORE (object)->priv; /* Force disconnect so we dont have it run * later, after we've cleaned up some stuff. */ @@ -456,7 +453,7 @@ pop3_store_finalize (GObject *object) { CamelPOP3StorePrivate *priv; - priv = CAMEL_POP3_STORE_GET_PRIVATE (object); + priv = CAMEL_POP3_STORE (object)->priv; g_mutex_clear (&priv->property_lock); @@ -973,8 +970,6 @@ camel_pop3_store_class_init (CamelPOP3StoreClass *class) CamelServiceClass *service_class; CamelStoreClass *store_class; - g_type_class_add_private (class, sizeof (CamelPOP3StorePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = pop3_store_set_property; object_class->get_property = pop3_store_get_property; @@ -1018,7 +1013,7 @@ camel_network_service_init (CamelNetworkServiceInterface *iface) static void camel_pop3_store_init (CamelPOP3Store *pop3_store) { - pop3_store->priv = CAMEL_POP3_STORE_GET_PRIVATE (pop3_store); + pop3_store->priv = camel_pop3_store_get_instance_private (pop3_store); g_mutex_init (&pop3_store->priv->property_lock); } diff --git a/src/camel/providers/sendmail/camel-sendmail-settings.c b/src/camel/providers/sendmail/camel-sendmail-settings.c index f3197548a..b4dc1203e 100644 --- a/src/camel/providers/sendmail/camel-sendmail-settings.c +++ b/src/camel/providers/sendmail/camel-sendmail-settings.c @@ -17,10 +17,6 @@ #include "camel-sendmail-settings.h" -#define CAMEL_SENDMAIL_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SENDMAIL_SETTINGS, CamelSendmailSettingsPrivate)) - struct _CamelSendmailSettingsPrivate { GMutex property_lock; gchar *custom_binary; @@ -40,7 +36,7 @@ enum { PROP_SEND_IN_OFFLINE }; -G_DEFINE_TYPE (CamelSendmailSettings, camel_sendmail_settings, CAMEL_TYPE_SETTINGS) +G_DEFINE_TYPE_WITH_PRIVATE (CamelSendmailSettings, camel_sendmail_settings, CAMEL_TYPE_SETTINGS) static void sendmail_settings_set_property (GObject *object, @@ -134,7 +130,7 @@ sendmail_settings_finalize (GObject *object) { CamelSendmailSettingsPrivate *priv; - priv = CAMEL_SENDMAIL_SETTINGS_GET_PRIVATE (object); + priv = CAMEL_SENDMAIL_SETTINGS (object)->priv; g_mutex_clear (&priv->property_lock); @@ -150,8 +146,6 @@ camel_sendmail_settings_class_init (CamelSendmailSettingsClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (CamelSendmailSettingsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = sendmail_settings_set_property; object_class->get_property = sendmail_settings_get_property; @@ -226,7 +220,7 @@ camel_sendmail_settings_class_init (CamelSendmailSettingsClass *class) static void camel_sendmail_settings_init (CamelSendmailSettings *settings) { - settings->priv = CAMEL_SENDMAIL_SETTINGS_GET_PRIVATE (settings); + settings->priv = camel_sendmail_settings_get_instance_private (settings); g_mutex_init (&settings->priv->property_lock); } diff --git a/src/camel/providers/smtp/camel-smtp-settings.c b/src/camel/providers/smtp/camel-smtp-settings.c index 2e99e8abd..c314dfebb 100644 --- a/src/camel/providers/smtp/camel-smtp-settings.c +++ b/src/camel/providers/smtp/camel-smtp-settings.c @@ -17,10 +17,6 @@ #include "camel-smtp-settings.h" -#define CAMEL_SMTP_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), CAMEL_TYPE_SMTP_SETTINGS, CamelSmtpSettingsPrivate)) - enum { PROP_0, PROP_AUTH_MECHANISM, diff --git a/src/examples/cursor/cursor-navigator.c b/src/examples/cursor/cursor-navigator.c index 784477dab..32cca04cd 100644 --- a/src/examples/cursor/cursor-navigator.c +++ b/src/examples/cursor/cursor-navigator.c @@ -49,7 +49,7 @@ enum { PROP_INDEX, }; -G_DEFINE_TYPE (CursorNavigator, cursor_navigator, GTK_TYPE_SCALE); +G_DEFINE_TYPE_WITH_PRIVATE (CursorNavigator, cursor_navigator, GTK_TYPE_SCALE); /************************************************************************ * GObjectClass * @@ -73,8 +73,6 @@ cursor_navigator_class_init (CursorNavigatorClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); - - g_type_class_add_private (object_class, sizeof (CursorNavigatorPrivate)); } static void @@ -82,11 +80,7 @@ cursor_navigator_init (CursorNavigator *navigator) { CursorNavigatorPrivate *priv; - navigator->priv = priv = - G_TYPE_INSTANCE_GET_PRIVATE ( - navigator, - CURSOR_TYPE_NAVIGATOR, - CursorNavigatorPrivate); + navigator->priv = priv = cursor_navigator_get_instance_private (navigator); priv->letters = -1; } diff --git a/src/libebackend/e-backend.c b/src/libebackend/e-backend.c index 9b6e8c7d4..1b75ab13c 100644 --- a/src/libebackend/e-backend.c +++ b/src/libebackend/e-backend.c @@ -41,10 +41,6 @@ #include "e-backend.h" #include "e-user-prompter.h" -#define E_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_BACKEND, EBackendPrivate)) - #define G_IS_IO_ERROR(error, code) \ (g_error_matches ((error), G_IO_ERROR, (code))) @@ -83,7 +79,7 @@ enum { PROP_USER_PROMPTER }; -G_DEFINE_ABSTRACT_TYPE (EBackend, e_backend, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EBackend, e_backend, G_TYPE_OBJECT) typedef struct _CanReachData { EBackend *backend; @@ -585,7 +581,7 @@ backend_dispose (GObject *object) { EBackendPrivate *priv; - priv = E_BACKEND_GET_PRIVATE (object); + priv = E_BACKEND (object)->priv; if (priv->network_changed_handler_id > 0) { g_signal_handler_disconnect ( @@ -634,7 +630,7 @@ backend_finalize (GObject *object) { EBackendPrivate *priv; - priv = E_BACKEND_GET_PRIVATE (object); + priv = E_BACKEND (object)->priv; g_mutex_clear (&priv->property_lock); g_mutex_clear (&priv->update_online_state_lock); @@ -730,8 +726,6 @@ e_backend_class_init (EBackendClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EBackendPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = backend_set_property; object_class->get_property = backend_get_property; @@ -809,7 +803,7 @@ e_backend_init (EBackend *backend) GNetworkMonitor *network_monitor; gulong handler_id; - backend->priv = E_BACKEND_GET_PRIVATE (backend); + backend->priv = e_backend_get_instance_private (backend); backend->priv->prompter = e_user_prompter_new (); backend->priv->main_context = g_main_context_ref_thread_default (); backend->priv->tried_with_empty_credentials = FALSE; diff --git a/src/libebackend/e-cache.c b/src/libebackend/e-cache.c index 60ae14366..66e581428 100644 --- a/src/libebackend/e-cache.c +++ b/src/libebackend/e-cache.c @@ -83,7 +83,7 @@ static guint signals[LAST_SIGNAL]; G_DEFINE_QUARK (e-cache-error-quark, e_cache_error) -G_DEFINE_ABSTRACT_TYPE (ECache, e_cache, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ECache, e_cache, G_TYPE_OBJECT) G_DEFINE_BOXED_TYPE (ECacheColumnValues, e_cache_column_values, e_cache_column_values_copy, e_cache_column_values_free) G_DEFINE_BOXED_TYPE (ECacheOfflineChange, e_cache_offline_change, e_cache_offline_change_copy, e_cache_offline_change_free) @@ -3108,8 +3108,6 @@ e_cache_class_init (ECacheClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (ECachePrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->finalize = e_cache_finalize; @@ -3167,7 +3165,7 @@ e_cache_class_init (ECacheClass *klass) static void e_cache_init (ECache *cache) { - cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache, E_TYPE_CACHE, ECachePrivate); + cache->priv = e_cache_get_instance_private (cache); cache->priv->filename = NULL; cache->priv->db = NULL; diff --git a/src/libebackend/e-collection-backend.c b/src/libebackend/e-collection-backend.c index 4826baa4c..a1627dc3a 100644 --- a/src/libebackend/e-collection-backend.c +++ b/src/libebackend/e-collection-backend.c @@ -48,10 +48,6 @@ #include "e-collection-backend.h" -#define E_COLLECTION_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_COLLECTION_BACKEND, ECollectionBackendPrivate)) - struct _ECollectionBackendPrivate { GWeakRef server; @@ -94,7 +90,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ECollectionBackend, e_collection_backend, E_TYPE_BACKEND) @@ -785,7 +781,7 @@ collection_backend_dispose (GObject *object) ECollectionBackendPrivate *priv; ESourceRegistryServer *server; - priv = E_COLLECTION_BACKEND_GET_PRIVATE (object); + priv = E_COLLECTION_BACKEND (object)->priv; server = g_weak_ref_get (&priv->server); if (server != NULL) { @@ -847,7 +843,7 @@ collection_backend_finalize (GObject *object) { ECollectionBackendPrivate *priv; - priv = E_COLLECTION_BACKEND_GET_PRIVATE (object); + priv = E_COLLECTION_BACKEND (object)->priv; g_hash_table_destroy (priv->children); g_mutex_clear (&priv->children_lock); @@ -1155,8 +1151,6 @@ e_collection_backend_class_init (ECollectionBackendClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ECollectionBackendPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = collection_backend_set_property; object_class->get_property = collection_backend_get_property; @@ -1261,7 +1255,7 @@ e_collection_backend_init (ECollectionBackend *backend) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - backend->priv = E_COLLECTION_BACKEND_GET_PRIVATE (backend); + backend->priv = e_collection_backend_get_instance_private (backend); backend->priv->children = children; g_mutex_init (&backend->priv->children_lock); g_mutex_init (&backend->priv->property_lock); diff --git a/src/libebackend/e-data-factory.c b/src/libebackend/e-data-factory.c index 68b2970b5..428c4463d 100644 --- a/src/libebackend/e-data-factory.c +++ b/src/libebackend/e-data-factory.c @@ -34,10 +34,6 @@ #include "e-data-factory.h" -#define E_DATA_FACTORY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DATA_FACTORY, EDataFactoryPrivate)) - typedef enum { DATA_FACTORY_SPAWN_SUBPROCESS_NONE = 0, DATA_FACTORY_SPAWN_SUBPROCESS_BLOCKED, @@ -109,6 +105,7 @@ G_DEFINE_TYPE_WITH_CODE ( EDataFactory, e_data_factory, E_TYPE_DBUS_SERVER, + G_ADD_PRIVATE (EDataFactory) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_data_factory_initable_init)) @@ -1141,8 +1138,6 @@ e_data_factory_class_init (EDataFactoryClass *class) GObjectClass *object_class; EDBusServerClass *dbus_server_class; - g_type_class_add_private (class, sizeof (EDataFactoryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->get_property = e_data_factory_get_property; object_class->set_property = e_data_factory_set_property; @@ -1197,7 +1192,7 @@ e_data_factory_class_init (EDataFactoryClass *class) static void e_data_factory_init (EDataFactory *data_factory) { - data_factory->priv = E_DATA_FACTORY_GET_PRIVATE (data_factory); + data_factory->priv = e_data_factory_get_instance_private (data_factory); g_mutex_init (&data_factory->priv->mutex); g_mutex_init (&data_factory->priv->subprocess_watched_ids_lock); diff --git a/src/libebackend/e-dbus-server.c b/src/libebackend/e-dbus-server.c index 47ebc3d7d..889231465 100644 --- a/src/libebackend/e-dbus-server.c +++ b/src/libebackend/e-dbus-server.c @@ -35,10 +35,6 @@ #include "e-dbus-server.h" -#define E_DBUS_SERVER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_DBUS_SERVER, EDBusServerPrivate)) - #define INACTIVITY_TIMEOUT 10 /* seconds */ struct _EDBusServerPrivate { @@ -73,6 +69,7 @@ G_LOCK_DEFINE_STATIC (loaded_modules); G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( EDBusServer, e_dbus_server, G_TYPE_OBJECT, + G_ADD_PRIVATE (EDBusServer) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) static void @@ -138,7 +135,7 @@ dbus_server_finalize (GObject *object) { EDBusServerPrivate *priv; - priv = E_DBUS_SERVER_GET_PRIVATE (object); + priv = E_DBUS_SERVER (object)->priv; g_main_loop_unref (priv->main_loop); @@ -287,8 +284,6 @@ e_dbus_server_class_init (EDBusServerClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EDBusServerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->finalize = dbus_server_finalize; object_class->dispose = dbus_server_dispose; @@ -397,7 +392,7 @@ e_dbus_server_init (EDBusServer *server) g_network_monitor_get_default (); #endif - server->priv = E_DBUS_SERVER_GET_PRIVATE (server); + server->priv = e_dbus_server_get_instance_private (server); server->priv->main_loop = g_main_loop_new (NULL, FALSE); server->priv->wait_for_client = FALSE; diff --git a/src/libebackend/e-file-cache.c b/src/libebackend/e-file-cache.c index 8f92df7e8..a94e5f300 100644 --- a/src/libebackend/e-file-cache.c +++ b/src/libebackend/e-file-cache.c @@ -37,10 +37,6 @@ #include "e-file-cache.h" -#define E_FILE_CACHE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_FILE_CACHE, EFileCachePrivate)) - struct _EFileCachePrivate { gchar *filename; EXmlHash *xml_hash; @@ -53,7 +49,7 @@ enum { PROP_FILENAME }; -G_DEFINE_TYPE (EFileCache, e_file_cache, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EFileCache, e_file_cache, G_TYPE_OBJECT) static void file_cache_set_filename (EFileCache *cache, @@ -105,7 +101,7 @@ file_cache_finalize (GObject *object) { EFileCachePrivate *priv; - priv = E_FILE_CACHE_GET_PRIVATE (object); + priv = E_FILE_CACHE (object)->priv; g_free (priv->filename); @@ -153,8 +149,6 @@ e_file_cache_class_init (EFileCacheClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EFileCachePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = file_cache_set_property; object_class->get_property = file_cache_get_property; @@ -182,7 +176,7 @@ e_file_cache_class_init (EFileCacheClass *class) static void e_file_cache_init (EFileCache *cache) { - cache->priv = E_FILE_CACHE_GET_PRIVATE (cache); + cache->priv = e_file_cache_get_instance_private (cache); } /** diff --git a/src/libebackend/e-server-side-source-credentials-provider.c b/src/libebackend/e-server-side-source-credentials-provider.c index 503a737b5..08b8f1ca2 100644 --- a/src/libebackend/e-server-side-source-credentials-provider.c +++ b/src/libebackend/e-server-side-source-credentials-provider.c @@ -27,7 +27,7 @@ struct _EServerSideSourceCredentialsProviderPrivate { gboolean dummy; }; -G_DEFINE_TYPE (EServerSideSourceCredentialsProvider, e_server_side_source_credentials_provider, E_TYPE_SOURCE_CREDENTIALS_PROVIDER) +G_DEFINE_TYPE_WITH_PRIVATE (EServerSideSourceCredentialsProvider, e_server_side_source_credentials_provider, E_TYPE_SOURCE_CREDENTIALS_PROVIDER) static ESource * server_side_source_credentials_provider_ref_source (ESourceCredentialsProvider *provider, @@ -56,8 +56,6 @@ e_server_side_source_credentials_provider_class_init (EServerSideSourceCredentia { ESourceCredentialsProviderClass *provider_class; - g_type_class_add_private (class, sizeof (EServerSideSourceCredentialsProviderPrivate)); - provider_class = E_SOURCE_CREDENTIALS_PROVIDER_CLASS (class); provider_class->ref_source = server_side_source_credentials_provider_ref_source; } @@ -65,7 +63,7 @@ e_server_side_source_credentials_provider_class_init (EServerSideSourceCredentia static void e_server_side_source_credentials_provider_init (EServerSideSourceCredentialsProvider *provider) { - provider->priv = G_TYPE_INSTANCE_GET_PRIVATE (provider, E_TYPE_SERVER_SIDE_SOURCE_CREDENTIALS_PROVIDER, EServerSideSourceCredentialsProviderPrivate); + provider->priv = e_server_side_source_credentials_provider_get_instance_private (provider); } /** diff --git a/src/libebackend/e-server-side-source.c b/src/libebackend/e-server-side-source.c index 2c92d9fbf..97f9dd4c4 100644 --- a/src/libebackend/e-server-side-source.c +++ b/src/libebackend/e-server-side-source.c @@ -34,10 +34,6 @@ #include "e-server-side-source.h" -#define E_SERVER_SIDE_SOURCE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SERVER_SIDE_SOURCE, EServerSideSourcePrivate)) - #define DBUS_OBJECT_PATH E_SOURCE_REGISTRY_SERVER_OBJECT_PATH "/Source" #define PRIMARY_GROUP_NAME "Data Source" @@ -98,6 +94,7 @@ G_DEFINE_TYPE_WITH_CODE ( EServerSideSource, e_server_side_source, E_TYPE_SOURCE, + G_ADD_PRIVATE (EServerSideSource) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_server_side_source_initable_init)) @@ -1020,7 +1017,7 @@ server_side_source_dispose (GObject *object) { EServerSideSourcePrivate *priv; - priv = E_SERVER_SIDE_SOURCE_GET_PRIVATE (object); + priv = E_SERVER_SIDE_SOURCE (object)->priv; g_mutex_lock (&priv->last_values_lock); @@ -1069,7 +1066,7 @@ server_side_source_finalize (GObject *object) { EServerSideSourcePrivate *priv; - priv = E_SERVER_SIDE_SOURCE_GET_PRIVATE (object); + priv = E_SERVER_SIDE_SOURCE (object)->priv; g_node_unlink (&priv->node); @@ -1163,7 +1160,7 @@ server_side_source_remove (ESource *source, /* XXX Yes we block here. We do this operation * synchronously to keep the server code simple. */ - priv = E_SERVER_SIDE_SOURCE_GET_PRIVATE (source); + priv = E_SERVER_SIDE_SOURCE (source)->priv; simple = g_simple_async_result_new ( G_OBJECT (source), callback, user_data, @@ -1281,7 +1278,7 @@ server_side_source_write (ESource *source, /* XXX Yes we block here. We do this operation * synchronously to keep the server code simple. */ - priv = E_SERVER_SIDE_SOURCE_GET_PRIVATE (source); + priv = E_SERVER_SIDE_SOURCE (source)->priv; simple = g_simple_async_result_new ( G_OBJECT (source), callback, user_data, @@ -1594,8 +1591,6 @@ e_server_side_source_class_init (EServerSideSourceClass *class) GObjectClass *object_class; ESourceClass *source_class; - g_type_class_add_private (class, sizeof (EServerSideSourcePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = server_side_source_set_property; object_class->get_property = server_side_source_get_property; @@ -1750,7 +1745,7 @@ e_server_side_source_init (EServerSideSource *source) { const gchar *user_dir; - source->priv = E_SERVER_SIDE_SOURCE_GET_PRIVATE (source); + source->priv = e_server_side_source_get_instance_private (source); source->priv->node.data = source; diff --git a/src/libebackend/e-source-registry-server.c b/src/libebackend/e-source-registry-server.c index 925a30dc3..8c70ec4a1 100644 --- a/src/libebackend/e-source-registry-server.c +++ b/src/libebackend/e-source-registry-server.c @@ -45,10 +45,6 @@ #include "e-source-registry-server.h" -#define E_SOURCE_REGISTRY_SERVER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_REGISTRY_SERVER, ESourceRegistryServerPrivate)) - /* Collection backends get tacked on to * sources with a [Collection] extension. */ #define BACKEND_DATA_KEY "__e_collection_backend__" @@ -86,7 +82,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceRegistryServer, e_source_registry_server, E_TYPE_DATA_FACTORY) @@ -778,7 +774,7 @@ source_registry_server_dispose (GObject *object) { ESourceRegistryServerPrivate *priv; - priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (object); + priv = E_SOURCE_REGISTRY_SERVER (object)->priv; g_mutex_lock (&priv->file_monitor_lock); if (priv->file_monitor_source) { @@ -812,7 +808,7 @@ source_registry_server_finalize (GObject *object) { ESourceRegistryServerPrivate *priv; - priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (object); + priv = E_SOURCE_REGISTRY_SERVER (object)->priv; g_hash_table_destroy (priv->sources); g_hash_table_destroy (priv->orphans); @@ -836,7 +832,7 @@ source_registry_server_bus_acquired (EDBusServer *server, { ESourceRegistryServerPrivate *priv; - priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (server); + priv = E_SOURCE_REGISTRY_SERVER (server)->priv; g_dbus_object_manager_server_set_connection ( priv->object_manager, connection); @@ -852,7 +848,7 @@ source_registry_server_quit_server (EDBusServer *server, { ESourceRegistryServerPrivate *priv; - priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (server); + priv = E_SOURCE_REGISTRY_SERVER (server)->priv; /* This makes the object manager unexport all objects. */ g_dbus_object_manager_server_set_connection ( @@ -985,7 +981,7 @@ source_registry_server_get_dbus_interface_skeleton (EDBusServer *server) { ESourceRegistryServerPrivate *priv; - priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (server); + priv = E_SOURCE_REGISTRY_SERVER (server)->priv; return G_DBUS_INTERFACE_SKELETON (priv->source_manager); } @@ -1005,8 +1001,6 @@ e_source_registry_server_class_init (ESourceRegistryServerClass *class) g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR)) modules_directory = g_strdup (modules_directory_env); - g_type_class_add_private (class, sizeof (ESourceRegistryServerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = source_registry_server_constructed; object_class->dispose = source_registry_server_dispose; @@ -1163,7 +1157,7 @@ e_source_registry_server_init (ESourceRegistryServer *server) (GDestroyNotify) g_object_unref, (GDestroyNotify) g_object_unref); - server->priv = E_SOURCE_REGISTRY_SERVER_GET_PRIVATE (server); + server->priv = e_source_registry_server_get_instance_private (server); server->priv->main_context = g_main_context_ref_thread_default (); server->priv->object_manager = object_manager; server->priv->source_manager = source_manager; diff --git a/src/libebackend/e-subprocess-factory.c b/src/libebackend/e-subprocess-factory.c index 27a312aad..82c86abda 100644 --- a/src/libebackend/e-subprocess-factory.c +++ b/src/libebackend/e-subprocess-factory.c @@ -34,10 +34,6 @@ #include "e-subprocess-factory.h" -#define E_SUBPROCESS_FACTORY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SUBPROCESS_FACTORY, ESubprocessFactoryPrivate)) - struct _ESubprocessFactoryPrivate { ESourceRegistry *registry; @@ -66,6 +62,7 @@ G_DEFINE_TYPE_WITH_CODE ( ESubprocessFactory, e_subprocess_factory, G_TYPE_OBJECT, + G_ADD_PRIVATE (ESubprocessFactory) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_subprocess_factory_initable_init)) @@ -174,8 +171,6 @@ e_subprocess_factory_class_init (ESubprocessFactoryClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESubprocessFactoryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->get_property = e_subprocess_factory_get_property; object_class->dispose = subprocess_factory_dispose; @@ -196,7 +191,7 @@ e_subprocess_factory_class_init (ESubprocessFactoryClass *class) static void e_subprocess_factory_init (ESubprocessFactory *subprocess_factory) { - subprocess_factory->priv = E_SUBPROCESS_FACTORY_GET_PRIVATE (subprocess_factory); + subprocess_factory->priv = e_subprocess_factory_get_instance_private (subprocess_factory); g_mutex_init (&subprocess_factory->priv->mutex); diff --git a/src/libebackend/e-user-prompter-server-extension.c b/src/libebackend/e-user-prompter-server-extension.c index 8c1e4fc66..88c1bd2ff 100644 --- a/src/libebackend/e-user-prompter-server-extension.c +++ b/src/libebackend/e-user-prompter-server-extension.c @@ -42,15 +42,11 @@ #include "e-user-prompter-server.h" #include "e-user-prompter-server-extension.h" -#define E_USER_PROMPTER_SERVER_EXTENSION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_USER_PROMPTER_SERVER_EXTENSION, EUserPrompterServerExtensionPrivate)) - struct _EUserPrompterServerExtensionPrivate { gint dummy; /* not used */ }; -G_DEFINE_ABSTRACT_TYPE (EUserPrompterServerExtension, e_user_prompter_server_extension, E_TYPE_EXTENSION) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EUserPrompterServerExtension, e_user_prompter_server_extension, E_TYPE_EXTENSION) static void user_prompter_server_extension_constructed (GObject *object) @@ -86,8 +82,6 @@ e_user_prompter_server_extension_class_init (EUserPrompterServerExtensionClass * GObjectClass *object_class; EExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (EUserPrompterServerExtensionPrivate)); - class->register_dialogs = NULL; class->prompt = NULL; @@ -101,7 +95,7 @@ e_user_prompter_server_extension_class_init (EUserPrompterServerExtensionClass * static void e_user_prompter_server_extension_init (EUserPrompterServerExtension *extension) { - extension->priv = E_USER_PROMPTER_SERVER_EXTENSION_GET_PRIVATE (extension); + extension->priv = e_user_prompter_server_extension_get_instance_private (extension); } /** diff --git a/src/libebackend/e-user-prompter-server.c b/src/libebackend/e-user-prompter-server.c index 9ac4fe730..ca959fb60 100644 --- a/src/libebackend/e-user-prompter-server.c +++ b/src/libebackend/e-user-prompter-server.c @@ -36,10 +36,6 @@ #include "e-user-prompter-server-extension.h" #include "e-user-prompter-server.h" -#define E_USER_PROMPTER_SERVER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_USER_PROMPTER_SERVER, EUserPrompterServerPrivate)) - struct _EUserPrompterServerPrivate { EDBusUserPrompter *dbus_prompter; @@ -62,6 +58,7 @@ G_DEFINE_TYPE_WITH_CODE ( EUserPrompterServer, e_user_prompter_server, E_TYPE_DBUS_SERVER, + G_ADD_PRIVATE (EUserPrompterServer) G_IMPLEMENT_INTERFACE ( E_TYPE_EXTENSIBLE, NULL)) @@ -335,7 +332,7 @@ user_prompter_server_dispose (GObject *object) { EUserPrompterServerPrivate *priv; - priv = E_USER_PROMPTER_SERVER_GET_PRIVATE (object); + priv = E_USER_PROMPTER_SERVER (object)->priv; if (priv->dbus_prompter != NULL) { g_object_unref (priv->dbus_prompter); @@ -354,7 +351,7 @@ user_prompter_server_finalize (GObject *object) { EUserPrompterServerPrivate *priv; - priv = E_USER_PROMPTER_SERVER_GET_PRIVATE (object); + priv = E_USER_PROMPTER_SERVER (object)->priv; g_rec_mutex_clear (&priv->lock); g_hash_table_destroy (priv->extensions); @@ -370,7 +367,7 @@ user_prompter_server_bus_acquired (EDBusServer *server, EUserPrompterServerPrivate *priv; GError *error = NULL; - priv = E_USER_PROMPTER_SERVER_GET_PRIVATE (server); + priv = E_USER_PROMPTER_SERVER (server)->priv; g_dbus_interface_skeleton_export ( G_DBUS_INTERFACE_SKELETON (priv->dbus_prompter), @@ -394,7 +391,7 @@ user_prompter_server_quit_server (EDBusServer *server, { EUserPrompterServerPrivate *priv; - priv = E_USER_PROMPTER_SERVER_GET_PRIVATE (server); + priv = E_USER_PROMPTER_SERVER (server)->priv; g_dbus_interface_skeleton_unexport ( G_DBUS_INTERFACE_SKELETON (priv->dbus_prompter)); @@ -410,8 +407,6 @@ e_user_prompter_server_class_init (EUserPrompterServerClass *class) GObjectClass *object_class; EDBusServerClass *dbus_server_class; - g_type_class_add_private (class, sizeof (EUserPrompterServerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = user_prompter_server_constructed; object_class->dispose = user_prompter_server_dispose; @@ -454,7 +449,7 @@ e_user_prompter_server_class_init (EUserPrompterServerClass *class) static void e_user_prompter_server_init (EUserPrompterServer *server) { - server->priv = E_USER_PROMPTER_SERVER_GET_PRIVATE (server); + server->priv = e_user_prompter_server_get_instance_private (server); server->priv->dbus_prompter = e_dbus_user_prompter_skeleton_new (); server->priv->prompts = NULL; server->priv->extensions = g_hash_table_new_full ( diff --git a/src/libebackend/e-user-prompter.c b/src/libebackend/e-user-prompter.c index 74d925242..34c7f142a 100644 --- a/src/libebackend/e-user-prompter.c +++ b/src/libebackend/e-user-prompter.c @@ -30,26 +30,21 @@ #include "e-dbus-user-prompter.h" #include "e-user-prompter.h" -#define E_USER_PROMPTER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_USER_PROMPTER, EUserPrompterPrivate)) - struct _EUserPrompterPrivate { gint dummy; /* not used */ }; -G_DEFINE_TYPE (EUserPrompter, e_user_prompter, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EUserPrompter, e_user_prompter, G_TYPE_OBJECT) static void e_user_prompter_class_init (EUserPrompterClass *class) { - g_type_class_add_private (class, sizeof (EUserPrompterPrivate)); } static void e_user_prompter_init (EUserPrompter *prompter) { - prompter->priv = E_USER_PROMPTER_GET_PRIVATE (prompter); + prompter->priv = e_user_prompter_get_instance_private (prompter); } /** diff --git a/src/libebackend/e-webdav-collection-backend.c b/src/libebackend/e-webdav-collection-backend.c index e8833a9b1..d77932034 100644 --- a/src/libebackend/e-webdav-collection-backend.c +++ b/src/libebackend/e-webdav-collection-backend.c @@ -27,7 +27,7 @@ struct _EWebDAVCollectionBackendPrivate { gboolean dummy; }; -G_DEFINE_TYPE (EWebDAVCollectionBackend, e_webdav_collection_backend, E_TYPE_COLLECTION_BACKEND) +G_DEFINE_TYPE_WITH_PRIVATE (EWebDAVCollectionBackend, e_webdav_collection_backend, E_TYPE_COLLECTION_BACKEND) static void webdav_collection_add_uid_to_hashtable (gpointer source, @@ -360,8 +360,6 @@ e_webdav_collection_backend_class_init (EWebDAVCollectionBackendClass *klass) { ECollectionBackendClass *collection_backend_class; - g_type_class_add_private (klass, sizeof (EWebDAVCollectionBackendPrivate)); - klass->get_resource_id = webdav_collection_backend_get_resource_id; klass->is_custom_source = webdav_collection_backend_is_custom_source; @@ -372,7 +370,7 @@ e_webdav_collection_backend_class_init (EWebDAVCollectionBackendClass *klass) static void e_webdav_collection_backend_init (EWebDAVCollectionBackend *webdav_backend) { - webdav_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (webdav_backend, E_TYPE_WEBDAV_COLLECTION_BACKEND, EWebDAVCollectionBackendPrivate); + webdav_backend->priv = e_webdav_collection_backend_get_instance_private (webdav_backend); } /** diff --git a/src/libedataserver/e-client.c b/src/libedataserver/e-client.c index 50fb77224..55307d4d8 100644 --- a/src/libedataserver/e-client.c +++ b/src/libedataserver/e-client.c @@ -46,10 +46,6 @@ #include "e-client.h" #include "e-client-private.h" -#define E_CLIENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CLIENT, EClientPrivate)) - typedef struct _AsyncContext AsyncContext; struct _EClientPrivate { @@ -89,7 +85,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_ABSTRACT_TYPE (EClient, e_client, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EClient, e_client, G_TYPE_OBJECT) static void async_context_free (AsyncContext *async_context) @@ -339,7 +335,7 @@ client_dispose (GObject *object) { EClientPrivate *priv; - priv = E_CLIENT_GET_PRIVATE (object); + priv = E_CLIENT (object)->priv; if (priv->main_context != NULL) { g_main_context_unref (priv->main_context); @@ -360,7 +356,7 @@ client_finalize (GObject *object) { EClientPrivate *priv; - priv = E_CLIENT_GET_PRIVATE (object); + priv = E_CLIENT (object)->priv; g_slist_free_full (priv->capabilities, (GDestroyNotify) g_free); @@ -798,8 +794,6 @@ e_client_class_init (EClientClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EClientPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = client_set_property; object_class->get_property = client_get_property; @@ -972,7 +966,7 @@ e_client_class_init (EClientClass *class) static void e_client_init (EClient *client) { - client->priv = E_CLIENT_GET_PRIVATE (client); + client->priv = e_client_get_instance_private (client); client->priv->readonly = FALSE; client->priv->main_context = g_main_context_ref_thread_default (); diff --git a/src/libedataserver/e-extension.c b/src/libedataserver/e-extension.c index 1242355d4..6bd9f3ca4 100644 --- a/src/libedataserver/e-extension.c +++ b/src/libedataserver/e-extension.c @@ -42,10 +42,6 @@ #include "e-extension.h" -#define E_EXTENSION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_EXTENSION, EExtensionPrivate)) - struct _EExtensionPrivate { gpointer extensible; /* weak pointer */ }; @@ -55,7 +51,7 @@ enum { PROP_EXTENSIBLE }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( EExtension, e_extension, G_TYPE_OBJECT) @@ -130,7 +126,7 @@ extension_dispose (GObject *object) { EExtensionPrivate *priv; - priv = E_EXTENSION_GET_PRIVATE (object); + priv = E_EXTENSION (object)->priv; if (priv->extensible != NULL) { g_object_remove_weak_pointer ( @@ -147,8 +143,6 @@ e_extension_class_init (EExtensionClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EExtensionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = extension_set_property; object_class->get_property = extension_get_property; @@ -169,7 +163,7 @@ e_extension_class_init (EExtensionClass *class) static void e_extension_init (EExtension *extension) { - extension->priv = E_EXTENSION_GET_PRIVATE (extension); + extension->priv = e_extension_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-gdata-oauth2-authorizer.c b/src/libedataserver/e-gdata-oauth2-authorizer.c index 2d2e34b2d..6b379eee2 100644 --- a/src/libedataserver/e-gdata-oauth2-authorizer.c +++ b/src/libedataserver/e-gdata-oauth2-authorizer.c @@ -51,6 +51,7 @@ static GMutex mutex; static void e_gdata_oauth2_authorizer_interface_init (GDataAuthorizerInterface *iface); G_DEFINE_TYPE_WITH_CODE (EGDataOAuth2Authorizer, e_gdata_oauth2_authorizer, G_TYPE_OBJECT, + G_ADD_PRIVATE (EGDataOAuth2Authorizer) G_IMPLEMENT_INTERFACE (GDATA_TYPE_AUTHORIZER, e_gdata_oauth2_authorizer_interface_init)) static gboolean @@ -288,8 +289,6 @@ e_gdata_oauth2_authorizer_class_init (EGDataOAuth2AuthorizerClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EGDataOAuth2AuthorizerPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = e_gdata_oauth2_authorizer_set_property; object_class->get_property = e_gdata_oauth2_authorizer_get_property; @@ -333,7 +332,7 @@ e_gdata_oauth2_authorizer_interface_init (GDataAuthorizerInterface *iface) static void e_gdata_oauth2_authorizer_init (EGDataOAuth2Authorizer *oauth2_authorizer) { - oauth2_authorizer->priv = G_TYPE_INSTANCE_GET_PRIVATE (oauth2_authorizer, E_TYPE_GDATA_OAUTH2_AUTHORIZER, EGDataOAuth2AuthorizerPrivate); + oauth2_authorizer->priv = e_gdata_oauth2_authorizer_get_instance_private (oauth2_authorizer); oauth2_authorizer->priv->authorization_domains = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL); oauth2_authorizer->priv->expiry = EXPIRY_INVALID; g_weak_ref_init (&oauth2_authorizer->priv->source, NULL); diff --git a/src/libedataserver/e-module.c b/src/libedataserver/e-module.c index 5485c40cc..e0723b604 100644 --- a/src/libedataserver/e-module.c +++ b/src/libedataserver/e-module.c @@ -27,10 +27,6 @@ #include "e-module.h" -#define E_MODULE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_MODULE, EModulePrivate)) - /* This is the symbol we call when loading a module. */ #define LOAD_SYMBOL "e_module_load" @@ -50,7 +46,7 @@ enum { PROP_FILENAME }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( EModule, e_module, G_TYPE_TYPE_MODULE) @@ -103,7 +99,7 @@ module_finalize (GObject *object) { EModulePrivate *priv; - priv = E_MODULE_GET_PRIVATE (object); + priv = E_MODULE (object)->priv; g_free (priv->filename); @@ -117,7 +113,7 @@ module_load (GTypeModule *type_module) EModulePrivate *priv; gpointer symbol; - priv = E_MODULE_GET_PRIVATE (type_module); + priv = E_MODULE (type_module)->priv; g_return_val_if_fail (priv->filename != NULL, FALSE); priv->module = g_module_open (priv->filename, 0); @@ -172,7 +168,7 @@ module_unload (GTypeModule *type_module) { EModulePrivate *priv; - priv = E_MODULE_GET_PRIVATE (type_module); + priv = E_MODULE (type_module)->priv; priv->unload (type_module); @@ -189,8 +185,6 @@ e_module_class_init (EModuleClass *class) GObjectClass *object_class; GTypeModuleClass *type_module_class; - g_type_class_add_private (class, sizeof (EModulePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = module_set_property; object_class->get_property = module_get_property; @@ -220,7 +214,7 @@ e_module_class_init (EModuleClass *class) static void e_module_init (EModule *module) { - module->priv = E_MODULE_GET_PRIVATE (module); + module->priv = e_module_get_instance_private (module); } /** diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c index e0d8b87d6..188f2768d 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c @@ -45,6 +45,7 @@ static void e_network_monitor_initable_iface_init (GInitableIface *iface); static void e_network_monitor_gio_iface_init (GNetworkMonitorInterface *iface); G_DEFINE_TYPE_WITH_CODE (ENetworkMonitor, e_network_monitor, G_TYPE_OBJECT, + G_ADD_PRIVATE (ENetworkMonitor) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, e_network_monitor_initable_iface_init) G_IMPLEMENT_INTERFACE (G_TYPE_NETWORK_MONITOR, e_network_monitor_gio_iface_init)) @@ -291,8 +292,6 @@ e_network_monitor_class_init (ENetworkMonitorClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ENetworkMonitorPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = e_network_monitor_set_property; object_class->get_property = e_network_monitor_get_property; @@ -324,7 +323,7 @@ e_network_monitor_class_init (ENetworkMonitorClass *class) static void e_network_monitor_init (ENetworkMonitor *network_monitor) { - network_monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (network_monitor, E_TYPE_NETWORK_MONITOR, ENetworkMonitorPrivate); + network_monitor->priv = e_network_monitor_get_instance_private (network_monitor); g_mutex_init (&network_monitor->priv->property_lock); } diff --git a/src/libedataserver/e-oauth2-services.c b/src/libedataserver/e-oauth2-services.c index e82bebcea..6c0aa100c 100644 --- a/src/libedataserver/e-oauth2-services.c +++ b/src/libedataserver/e-oauth2-services.c @@ -46,6 +46,7 @@ struct _EOAuth2ServicesPrivate { }; G_DEFINE_TYPE_WITH_CODE (EOAuth2Services, e_oauth2_services, G_TYPE_OBJECT, + G_ADD_PRIVATE (EOAuth2Services) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) static GObject *services_singleton = NULL; @@ -126,8 +127,6 @@ e_oauth2_services_class_init (EOAuth2ServicesClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (EOAuth2ServicesPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->dispose = oauth2_services_dispose; object_class->finalize = oauth2_services_finalize; @@ -142,7 +141,7 @@ e_oauth2_services_class_init (EOAuth2ServicesClass *klass) static void e_oauth2_services_init (EOAuth2Services *oauth2_services) { - oauth2_services->priv = G_TYPE_INSTANCE_GET_PRIVATE (oauth2_services, E_TYPE_OAUTH2_SERVICES, EOAuth2ServicesPrivate); + oauth2_services->priv = e_oauth2_services_get_instance_private (oauth2_services); g_mutex_init (&oauth2_services->priv->property_lock); } diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c index 883379a60..577657c5d 100644 --- a/src/libedataserver/e-proxy.c +++ b/src/libedataserver/e-proxy.c @@ -38,12 +38,6 @@ #include <libsoup/soup-uri.h> #include "e-proxy.h" -#define E_PROXY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_PROXY, EProxyPrivate)) - -G_DEFINE_TYPE (EProxy, e_proxy, G_TYPE_OBJECT) - /* Debug */ #define d(x) @@ -101,6 +95,8 @@ enum { LAST_SIGNAL }; +G_DEFINE_TYPE_WITH_PRIVATE (EProxy, e_proxy, G_TYPE_OBJECT) + static guint signals[LAST_SIGNAL] = { 0 }; /* Forward declarations. */ @@ -941,8 +937,6 @@ e_proxy_class_init (EProxyClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EProxyPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = e_proxy_dispose; @@ -965,7 +959,7 @@ e_proxy_class_init (EProxyClass *class) static void e_proxy_init (EProxy *proxy) { - proxy->priv = E_PROXY_GET_PRIVATE (proxy); + proxy->priv = e_proxy_get_instance_private (proxy); proxy->priv->type = PROXY_TYPE_SYSTEM; diff --git a/src/libedataserver/e-sexp.c b/src/libedataserver/e-sexp.c index 5238b8f1c..910704390 100644 --- a/src/libedataserver/e-sexp.c +++ b/src/libedataserver/e-sexp.c @@ -107,7 +107,7 @@ struct _ESExpPrivate { struct _EMemChunk *result_chunks; }; -G_DEFINE_TYPE (ESExp, e_sexp, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (ESExp, e_sexp, G_TYPE_OBJECT) static ESExpTerm * parse_list (ESExp *sexp, gint gotbrace); @@ -1465,8 +1465,6 @@ e_sexp_class_init (ESExpClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - g_type_class_add_private (class, sizeof (ESExpPrivate)); - object_class->finalize = e_sexp_finalise; } @@ -1528,7 +1526,7 @@ e_sexp_init (ESExp *sexp) { gint i; - sexp->priv = G_TYPE_INSTANCE_GET_PRIVATE (sexp, E_TYPE_SEXP, ESExpPrivate); + sexp->priv = e_sexp_get_instance_private (sexp); sexp->priv->scanner = g_scanner_new (&scanner_config); sexp->priv->term_chunks = e_memchunk_new (16, sizeof (ESExpTerm)); diff --git a/src/libedataserver/e-soup-auth-bearer.c b/src/libedataserver/e-soup-auth-bearer.c index 8d1efa82a..ea4c1eca9 100644 --- a/src/libedataserver/e-soup-auth-bearer.c +++ b/src/libedataserver/e-soup-auth-bearer.c @@ -36,10 +36,6 @@ #include <time.h> -#define E_SOUP_AUTH_BEARER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerPrivate)) - #define AUTH_STRENGTH 1 #define EXPIRY_INVALID ((time_t) -1) @@ -49,7 +45,7 @@ struct _ESoupAuthBearerPrivate { time_t expiry; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESoupAuthBearer, e_soup_auth_bearer, SOUP_TYPE_AUTH) @@ -59,7 +55,7 @@ e_soup_auth_bearer_finalize (GObject *object) { ESoupAuthBearerPrivate *priv; - priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (object); + priv = E_SOUP_AUTH_BEARER (object)->priv; g_free (priv->access_token); @@ -128,8 +124,6 @@ e_soup_auth_bearer_class_init (ESoupAuthBearerClass *class) GObjectClass *object_class; SoupAuthClass *auth_class; - g_type_class_add_private (class, sizeof (ESoupAuthBearerPrivate)); - /* Keep the "e" prefix on private methods * so we don't step on libsoup's namespace. */ @@ -148,7 +142,7 @@ e_soup_auth_bearer_class_init (ESoupAuthBearerClass *class) static void e_soup_auth_bearer_init (ESoupAuthBearer *bearer) { - bearer->priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (bearer); + bearer->priv = e_soup_auth_bearer_get_instance_private (bearer); bearer->priv->expiry = EXPIRY_INVALID; } diff --git a/src/libedataserver/e-soup-session.c b/src/libedataserver/e-soup-session.c index 74028c858..664acb38f 100644 --- a/src/libedataserver/e-soup-session.c +++ b/src/libedataserver/e-soup-session.c @@ -62,7 +62,7 @@ enum { PROP_CREDENTIALS }; -G_DEFINE_TYPE (ESoupSession, e_soup_session, SOUP_TYPE_SESSION) +G_DEFINE_TYPE_WITH_PRIVATE (ESoupSession, e_soup_session, SOUP_TYPE_SESSION) static void e_soup_session_ensure_auth_usage (ESoupSession *session, @@ -453,8 +453,6 @@ e_soup_session_class_init (ESoupSessionClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (ESoupSessionPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->set_property = e_soup_session_set_property; object_class->get_property = e_soup_session_get_property; @@ -502,7 +500,7 @@ e_soup_session_class_init (ESoupSessionClass *klass) static void e_soup_session_init (ESoupSession *session) { - session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, E_TYPE_SOUP_SESSION, ESoupSessionPrivate); + session->priv = e_soup_session_get_instance_private (session); session->priv->ssl_info_set = FALSE; session->priv->log_level = SOUP_LOGGER_LOG_NONE; session->priv->auth_prefilled = FALSE; diff --git a/src/libedataserver/e-source-alarms.c b/src/libedataserver/e-source-alarms.c index 5b7a42079..c7aa93fe6 100644 --- a/src/libedataserver/e-source-alarms.c +++ b/src/libedataserver/e-source-alarms.c @@ -35,10 +35,6 @@ #include "e-source-alarms.h" -#define E_SOURCE_ALARMS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_ALARMS, ESourceAlarmsPrivate)) - struct _ESourceAlarmsPrivate { gboolean include_me; gchar *last_notified; @@ -50,7 +46,7 @@ enum { PROP_LAST_NOTIFIED }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceAlarms, e_source_alarms, E_TYPE_SOURCE_EXTENSION) @@ -108,7 +104,7 @@ source_alarms_finalize (GObject *object) { ESourceAlarmsPrivate *priv; - priv = E_SOURCE_ALARMS_GET_PRIVATE (object); + priv = E_SOURCE_ALARMS (object)->priv; g_free (priv->last_notified); @@ -122,8 +118,6 @@ e_source_alarms_class_init (ESourceAlarmsClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceAlarmsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_alarms_set_property; object_class->get_property = source_alarms_get_property; @@ -164,7 +158,7 @@ e_source_alarms_class_init (ESourceAlarmsClass *class) static void e_source_alarms_init (ESourceAlarms *extension) { - extension->priv = E_SOURCE_ALARMS_GET_PRIVATE (extension); + extension->priv = e_source_alarms_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-authentication.c b/src/libedataserver/e-source-authentication.c index bf2514ce2..721e873f8 100644 --- a/src/libedataserver/e-source-authentication.c +++ b/src/libedataserver/e-source-authentication.c @@ -38,10 +38,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_AUTHENTICATION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_AUTHENTICATION, ESourceAuthenticationPrivate)) - struct _ESourceAuthenticationPrivate { gchar *host; gchar *method; @@ -69,7 +65,7 @@ enum { PROP_CREDENTIAL_NAME }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceAuthentication, e_source_authentication, E_TYPE_SOURCE_EXTENSION) @@ -219,7 +215,7 @@ source_authentication_dispose (GObject *object) { ESourceAuthenticationPrivate *priv; - priv = E_SOURCE_AUTHENTICATION_GET_PRIVATE (object); + priv = E_SOURCE_AUTHENTICATION (object)->priv; g_clear_object (&priv->connectable); @@ -232,7 +228,7 @@ source_authentication_finalize (GObject *object) { ESourceAuthenticationPrivate *priv; - priv = E_SOURCE_AUTHENTICATION_GET_PRIVATE (object); + priv = E_SOURCE_AUTHENTICATION (object)->priv; g_free (priv->host); g_free (priv->method); @@ -249,8 +245,6 @@ e_source_authentication_class_init (ESourceAuthenticationClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceAuthenticationPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_authentication_set_property; object_class->get_property = source_authentication_get_property; @@ -377,7 +371,7 @@ e_source_authentication_class_init (ESourceAuthenticationClass *class) static void e_source_authentication_init (ESourceAuthentication *extension) { - extension->priv = E_SOURCE_AUTHENTICATION_GET_PRIVATE (extension); + extension->priv = e_source_authentication_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-autocomplete.c b/src/libedataserver/e-source-autocomplete.c index eecefb8d9..aa6b25eec 100644 --- a/src/libedataserver/e-source-autocomplete.c +++ b/src/libedataserver/e-source-autocomplete.c @@ -36,10 +36,6 @@ #include "e-source-autocomplete.h" -#define E_SOURCE_AUTOCOMPLETE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_AUTOCOMPLETE, ESourceAutocompletePrivate)) - struct _ESourceAutocompletePrivate { gboolean include_me; }; @@ -49,7 +45,7 @@ enum { PROP_INCLUDE_ME }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceAutocomplete, e_source_autocomplete, E_TYPE_SOURCE_EXTENSION) @@ -95,8 +91,6 @@ e_source_autocomplete_class_init (ESourceAutocompleteClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceAutocompletePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_autocomplete_set_property; object_class->get_property = source_autocomplete_get_property; @@ -122,7 +116,7 @@ e_source_autocomplete_class_init (ESourceAutocompleteClass *class) static void e_source_autocomplete_init (ESourceAutocomplete *extension) { - extension->priv = E_SOURCE_AUTOCOMPLETE_GET_PRIVATE (extension); + extension->priv = e_source_autocomplete_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-autoconfig.c b/src/libedataserver/e-source-autoconfig.c index 1ab031998..4dafcf1ad 100644 --- a/src/libedataserver/e-source-autoconfig.c +++ b/src/libedataserver/e-source-autoconfig.c @@ -36,10 +36,6 @@ #include "e-source-autoconfig.h" -#define E_SOURCE_AUTOCONFIG_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_AUTOCONFIG, ESourceAutoconfigPrivate)) - struct _ESourceAutoconfigPrivate { gchar *revision; }; @@ -49,7 +45,7 @@ enum { PROP_REVISION }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceAutoconfig, e_source_autoconfig, E_TYPE_SOURCE_EXTENSION) @@ -94,7 +90,7 @@ source_autoconfig_finalize (GObject *object) { ESourceAutoconfigPrivate *priv; - priv = E_SOURCE_AUTOCONFIG_GET_PRIVATE (object); + priv = E_SOURCE_AUTOCONFIG (object)->priv; g_free (priv->revision); @@ -108,8 +104,6 @@ e_source_autoconfig_class_init (ESourceAutoconfigClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceAutoconfigPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_autoconfig_set_property; object_class->get_property = source_autoconfig_get_property; @@ -136,7 +130,7 @@ e_source_autoconfig_class_init (ESourceAutoconfigClass *class) static void e_source_autoconfig_init (ESourceAutoconfig *extension) { - extension->priv = E_SOURCE_AUTOCONFIG_GET_PRIVATE (extension); + extension->priv = e_source_autoconfig_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-backend.c b/src/libedataserver/e-source-backend.c index 2ea21890a..f1589ff55 100644 --- a/src/libedataserver/e-source-backend.c +++ b/src/libedataserver/e-source-backend.c @@ -29,10 +29,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_BACKEND, ESourceBackendPrivate)) - struct _ESourceBackendPrivate { gchar *backend_name; }; @@ -42,7 +38,7 @@ enum { PROP_BACKEND_NAME }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( ESourceBackend, e_source_backend, E_TYPE_SOURCE_EXTENSION) @@ -87,7 +83,7 @@ source_backend_finalize (GObject *object) { ESourceBackendPrivate *priv; - priv = E_SOURCE_BACKEND_GET_PRIVATE (object); + priv = E_SOURCE_BACKEND (object)->priv; g_free (priv->backend_name); @@ -100,8 +96,6 @@ e_source_backend_class_init (ESourceBackendClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourceBackendPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_backend_set_property; object_class->get_property = source_backend_get_property; @@ -128,7 +122,7 @@ e_source_backend_class_init (ESourceBackendClass *class) static void e_source_backend_init (ESourceBackend *extension) { - extension->priv = E_SOURCE_BACKEND_GET_PRIVATE (extension); + extension->priv = e_source_backend_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-camel.c b/src/libedataserver/e-source-camel.c index 631f06fa5..05bd5f1f1 100644 --- a/src/libedataserver/e-source-camel.c +++ b/src/libedataserver/e-source-camel.c @@ -47,10 +47,6 @@ #include <libedataserver/e-source-offline.h> #include <libedataserver/e-source-security.h> -#define E_SOURCE_CAMEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_CAMEL, ESourceCamelPrivate)) - struct _ESourceCamelPrivate { CamelSettings *settings; GArray *value_array; @@ -121,7 +117,7 @@ static BindingData bindings[] = { e_binding_transform_enum_value_to_nick } }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( ESourceCamel, e_source_camel, E_TYPE_SOURCE_EXTENSION) @@ -431,7 +427,7 @@ source_camel_dispose (GObject *object) { ESourceCamelPrivate *priv; - priv = E_SOURCE_CAMEL_GET_PRIVATE (object); + priv = E_SOURCE_CAMEL (object)->priv; if (priv->settings != NULL) { g_object_unref (priv->settings); @@ -448,7 +444,7 @@ source_camel_finalize (GObject *object) ESourceCamelPrivate *priv; guint ii; - priv = E_SOURCE_CAMEL_GET_PRIVATE (object); + priv = E_SOURCE_CAMEL (object)->priv; for (ii = 0; ii < priv->value_array->len; ii++) g_value_unset (&g_array_index (priv->value_array, GValue, ii)); @@ -474,7 +470,7 @@ source_camel_constructed (GObject *object) G_OBJECT_CLASS (e_source_camel_parent_class)->constructed (object); class = E_SOURCE_CAMEL_GET_CLASS (object); - priv = E_SOURCE_CAMEL_GET_PRIVATE (object); + priv = E_SOURCE_CAMEL (object)->priv; source = e_source_extension_ref_source (E_SOURCE_EXTENSION (object)); @@ -566,8 +562,6 @@ e_source_camel_class_init (ESourceCamelClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourceCamelPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->get_property = source_camel_get_property; object_class->dispose = source_camel_dispose; @@ -600,7 +594,7 @@ e_source_camel_init (ESourceCamel *extension) /* Zero-fill array elements when they are allocated. */ value_array = g_array_new (FALSE, TRUE, sizeof (GValue)); - extension->priv = E_SOURCE_CAMEL_GET_PRIVATE (extension); + extension->priv = e_source_camel_get_instance_private (extension); extension->priv->value_array = value_array; } diff --git a/src/libedataserver/e-source-collection.c b/src/libedataserver/e-source-collection.c index 4e95765a0..f9888e6be 100644 --- a/src/libedataserver/e-source-collection.c +++ b/src/libedataserver/e-source-collection.c @@ -45,10 +45,6 @@ #include "e-source-collection.h" -#define E_SOURCE_COLLECTION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_COLLECTION, ESourceCollectionPrivate)) - struct _ESourceCollectionPrivate { gchar *identity; gboolean calendar_enabled; @@ -68,7 +64,7 @@ enum { PROP_CONTACTS_URL }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceCollection, e_source_collection, E_TYPE_SOURCE_BACKEND) @@ -178,7 +174,7 @@ source_collection_finalize (GObject *object) { ESourceCollectionPrivate *priv; - priv = E_SOURCE_COLLECTION_GET_PRIVATE (object); + priv = E_SOURCE_COLLECTION (object)->priv; g_free (priv->identity); g_free (priv->calendar_url); @@ -194,8 +190,6 @@ e_source_collection_class_init (ESourceCollectionClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceCollectionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_collection_set_property; object_class->get_property = source_collection_get_property; @@ -293,7 +287,7 @@ e_source_collection_class_init (ESourceCollectionClass *class) static void e_source_collection_init (ESourceCollection *extension) { - extension->priv = E_SOURCE_COLLECTION_GET_PRIVATE (extension); + extension->priv = e_source_collection_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-contacts.c b/src/libedataserver/e-source-contacts.c index d12931d6c..b4560c103 100644 --- a/src/libedataserver/e-source-contacts.c +++ b/src/libedataserver/e-source-contacts.c @@ -21,10 +21,6 @@ #include "e-source-contacts.h" -#define E_SOURCE_CONTACTS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_CONTACTS, ESourceContactsPrivate)) - struct _ESourceContactsPrivate { gboolean include_me; }; @@ -34,7 +30,7 @@ enum { PROP_INCLUDE_ME }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceContacts, e_source_contacts, E_TYPE_SOURCE_EXTENSION) @@ -110,8 +106,6 @@ e_source_contacts_class_init (ESourceContactsClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceContactsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_contacts_set_property; object_class->get_property = source_contacts_get_property; @@ -136,7 +130,7 @@ e_source_contacts_class_init (ESourceContactsClass *class) static void e_source_contacts_init (ESourceContacts *extension) { - extension->priv = E_SOURCE_CONTACTS_GET_PRIVATE (extension); + extension->priv = e_source_contacts_get_instance_private (extension); } gboolean diff --git a/src/libedataserver/e-source-credentials-provider-impl-oauth2.c b/src/libedataserver/e-source-credentials-provider-impl-oauth2.c index 1915a51c2..45a5f02d3 100644 --- a/src/libedataserver/e-source-credentials-provider-impl-oauth2.c +++ b/src/libedataserver/e-source-credentials-provider-impl-oauth2.c @@ -29,7 +29,7 @@ struct _ESourceCredentialsProviderImplOAuth2Private { EOAuth2Services *services; }; -G_DEFINE_TYPE (ESourceCredentialsProviderImplOAuth2, e_source_credentials_provider_impl_oauth2, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL) +G_DEFINE_TYPE_WITH_PRIVATE (ESourceCredentialsProviderImplOAuth2, e_source_credentials_provider_impl_oauth2, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL) static gboolean e_source_credentials_provider_impl_oauth2_can_process (ESourceCredentialsProviderImpl *provider_impl, @@ -87,8 +87,6 @@ e_source_credentials_provider_impl_oauth2_class_init (ESourceCredentialsProvider ESourceCredentialsProviderImplClass *impl_class; GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (ESourceCredentialsProviderImplOAuth2Private)); - impl_class = E_SOURCE_CREDENTIALS_PROVIDER_IMPL_CLASS (klass); impl_class->can_process = e_source_credentials_provider_impl_oauth2_can_process; impl_class->can_store = e_source_credentials_provider_impl_oauth2_can_store; @@ -101,8 +99,7 @@ e_source_credentials_provider_impl_oauth2_class_init (ESourceCredentialsProvider static void e_source_credentials_provider_impl_oauth2_init (ESourceCredentialsProviderImplOAuth2 *provider_impl) { - provider_impl->priv = G_TYPE_INSTANCE_GET_PRIVATE (provider_impl, - E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL_OAUTH2, ESourceCredentialsProviderImplOAuth2Private); + provider_impl->priv = e_source_credentials_provider_impl_oauth2_get_instance_private (provider_impl); if (e_oauth2_services_is_supported ()) provider_impl->priv->services = e_oauth2_services_new (); diff --git a/src/libedataserver/e-source-credentials-provider-impl-password.c b/src/libedataserver/e-source-credentials-provider-impl-password.c index d9e71d589..46630dd3b 100644 --- a/src/libedataserver/e-source-credentials-provider-impl-password.c +++ b/src/libedataserver/e-source-credentials-provider-impl-password.c @@ -28,7 +28,7 @@ struct _ESourceCredentialsProviderImplPasswordPrivate { gboolean dummy; }; -G_DEFINE_TYPE (ESourceCredentialsProviderImplPassword, e_source_credentials_provider_impl_password, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL) +G_DEFINE_TYPE_WITH_PRIVATE (ESourceCredentialsProviderImplPassword, e_source_credentials_provider_impl_password, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL) static gboolean e_source_credentials_provider_impl_password_can_process (ESourceCredentialsProviderImpl *provider_impl, @@ -123,8 +123,6 @@ e_source_credentials_provider_impl_password_class_init (ESourceCredentialsProvid { ESourceCredentialsProviderImplClass *impl_class; - g_type_class_add_private (klass, sizeof (ESourceCredentialsProviderImplPasswordPrivate)); - impl_class = E_SOURCE_CREDENTIALS_PROVIDER_IMPL_CLASS (klass); impl_class->can_process = e_source_credentials_provider_impl_password_can_process; impl_class->can_store = e_source_credentials_provider_impl_password_can_store; @@ -137,6 +135,5 @@ e_source_credentials_provider_impl_password_class_init (ESourceCredentialsProvid static void e_source_credentials_provider_impl_password_init (ESourceCredentialsProviderImplPassword *provider_impl) { - provider_impl->priv = G_TYPE_INSTANCE_GET_PRIVATE (provider_impl, - E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL_PASSWORD, ESourceCredentialsProviderImplPasswordPrivate); + provider_impl->priv = e_source_credentials_provider_impl_password_get_instance_private (provider_impl); } diff --git a/src/libedataserver/e-source-credentials-provider-impl.c b/src/libedataserver/e-source-credentials-provider-impl.c index 8e3b438dd..bd5c48586 100644 --- a/src/libedataserver/e-source-credentials-provider-impl.c +++ b/src/libedataserver/e-source-credentials-provider-impl.c @@ -27,7 +27,7 @@ struct _ESourceCredentialsProviderImplPrivate { gboolean dummy; }; -G_DEFINE_ABSTRACT_TYPE (ESourceCredentialsProviderImpl, e_source_credentials_provider_impl, E_TYPE_EXTENSION) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ESourceCredentialsProviderImpl, e_source_credentials_provider_impl, E_TYPE_EXTENSION) static gboolean source_credentials_provider_impl_lookup_sync (ESourceCredentialsProviderImpl *provider_impl, @@ -86,8 +86,6 @@ e_source_credentials_provider_impl_class_init (ESourceCredentialsProviderImplCla EExtensionClass *extension_class; ESourceCredentialsProviderImplClass *provider_impl_class; - g_type_class_add_private (klass, sizeof (ESourceCredentialsProviderImplPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->constructed = e_source_credentials_provider_impl_constructed; @@ -103,8 +101,7 @@ e_source_credentials_provider_impl_class_init (ESourceCredentialsProviderImplCla static void e_source_credentials_provider_impl_init (ESourceCredentialsProviderImpl *provider_impl) { - provider_impl->priv = G_TYPE_INSTANCE_GET_PRIVATE (provider_impl, - E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL, ESourceCredentialsProviderImplPrivate); + provider_impl->priv = e_source_credentials_provider_impl_get_instance_private (provider_impl); } /** diff --git a/src/libedataserver/e-source-credentials-provider.c b/src/libedataserver/e-source-credentials-provider.c index 06b706d64..e3057aeba 100644 --- a/src/libedataserver/e-source-credentials-provider.c +++ b/src/libedataserver/e-source-credentials-provider.c @@ -48,6 +48,7 @@ enum { }; G_DEFINE_TYPE_WITH_CODE (ESourceCredentialsProvider, e_source_credentials_provider, G_TYPE_OBJECT, + G_ADD_PRIVATE (ESourceCredentialsProvider) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) static ESource * @@ -170,8 +171,6 @@ e_source_credentials_provider_class_init (ESourceCredentialsProviderClass *class GObjectClass *object_class; ESourceCredentialsProviderClass *provider_class; - g_type_class_add_private (class, sizeof (ESourceCredentialsProviderPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_credentials_provider_set_property; object_class->get_property = source_credentials_provider_get_property; @@ -206,7 +205,7 @@ e_source_credentials_provider_class_init (ESourceCredentialsProviderClass *class static void e_source_credentials_provider_init (ESourceCredentialsProvider *provider) { - provider->priv = G_TYPE_INSTANCE_GET_PRIVATE (provider, E_TYPE_SOURCE_CREDENTIALS_PROVIDER, ESourceCredentialsProviderPrivate); + provider->priv = e_source_credentials_provider_get_instance_private (provider); g_weak_ref_init (&provider->priv->registry, NULL); provider->priv->providers = NULL; diff --git a/src/libedataserver/e-source-extension.c b/src/libedataserver/e-source-extension.c index 3545e6fe8..44007aa42 100644 --- a/src/libedataserver/e-source-extension.c +++ b/src/libedataserver/e-source-extension.c @@ -30,10 +30,6 @@ #include "e-source-extension.h" -#define E_SOURCE_EXTENSION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_EXTENSION, ESourceExtensionPrivate)) - struct _ESourceExtensionPrivate { GWeakRef source; GRecMutex property_lock; @@ -44,7 +40,7 @@ enum { PROP_SOURCE }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( ESourceExtension, e_source_extension, G_TYPE_OBJECT) @@ -97,7 +93,7 @@ source_extension_dispose (GObject *object) { ESourceExtensionPrivate *priv; - priv = E_SOURCE_EXTENSION_GET_PRIVATE (object); + priv = E_SOURCE_EXTENSION (object)->priv; g_weak_ref_set (&priv->source, NULL); @@ -110,7 +106,7 @@ source_extension_finalize (GObject *object) { ESourceExtensionPrivate *priv; - priv = E_SOURCE_EXTENSION_GET_PRIVATE (object); + priv = E_SOURCE_EXTENSION (object)->priv; g_weak_ref_clear (&priv->source); g_rec_mutex_clear (&priv->property_lock); @@ -141,8 +137,6 @@ e_source_extension_class_init (ESourceExtensionClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourceExtensionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_extension_set_property; object_class->get_property = source_extension_get_property; @@ -166,7 +160,7 @@ e_source_extension_class_init (ESourceExtensionClass *class) static void e_source_extension_init (ESourceExtension *extension) { - extension->priv = E_SOURCE_EXTENSION_GET_PRIVATE (extension); + extension->priv = e_source_extension_get_instance_private (extension); g_weak_ref_init (&extension->priv->source, NULL); g_rec_mutex_init (&extension->priv->property_lock); } diff --git a/src/libedataserver/e-source-goa.c b/src/libedataserver/e-source-goa.c index 06e723aff..3b36011cf 100644 --- a/src/libedataserver/e-source-goa.c +++ b/src/libedataserver/e-source-goa.c @@ -39,10 +39,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_GOA_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_GOA, ESourceGoaPrivate)) - struct _ESourceGoaPrivate { gchar *account_id; gchar *calendar_url; @@ -60,7 +56,7 @@ enum { PROP_ADDRESS }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceGoa, e_source_goa, E_TYPE_SOURCE_EXTENSION) @@ -157,7 +153,7 @@ source_goa_finalize (GObject *object) { ESourceGoaPrivate *priv; - priv = E_SOURCE_GOA_GET_PRIVATE (object); + priv = E_SOURCE_GOA (object)->priv; g_free (priv->account_id); g_free (priv->calendar_url); @@ -175,8 +171,6 @@ e_source_goa_class_init (ESourceGoaClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceGoaPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_goa_set_property; object_class->get_property = source_goa_get_property; @@ -259,7 +253,7 @@ e_source_goa_class_init (ESourceGoaClass *class) static void e_source_goa_init (ESourceGoa *extension) { - extension->priv = E_SOURCE_GOA_GET_PRIVATE (extension); + extension->priv = e_source_goa_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-ldap.c b/src/libedataserver/e-source-ldap.c index 751a6585c..cfeebad7e 100644 --- a/src/libedataserver/e-source-ldap.c +++ b/src/libedataserver/e-source-ldap.c @@ -23,10 +23,6 @@ #include "e-source-ldap.h" -#define E_SOURCE_LDAP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_LDAP, ESourceLDAPPrivate)) - struct _ESourceLDAPPrivate { gboolean can_browse; gchar *filter; @@ -50,7 +46,7 @@ enum { PROP_SECURITY }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceLDAP, e_source_ldap, E_TYPE_SOURCE_EXTENSION) @@ -284,7 +280,7 @@ source_ldap_finalize (GObject *object) { ESourceLDAPPrivate *priv; - priv = E_SOURCE_LDAP_GET_PRIVATE (object); + priv = E_SOURCE_LDAP (object)->priv; g_free (priv->filter); g_free (priv->root_dn); @@ -340,8 +336,6 @@ e_source_ldap_class_init (ESourceLDAPClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceLDAPPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_ldap_set_property; object_class->get_property = source_ldap_get_property; @@ -449,7 +443,7 @@ e_source_ldap_class_init (ESourceLDAPClass *class) static void e_source_ldap_init (ESourceLDAP *extension) { - extension->priv = E_SOURCE_LDAP_GET_PRIVATE (extension); + extension->priv = e_source_ldap_get_instance_private (extension); } ESourceLDAPAuthentication diff --git a/src/libedataserver/e-source-local.c b/src/libedataserver/e-source-local.c index 4d379cb15..67e50bb62 100644 --- a/src/libedataserver/e-source-local.c +++ b/src/libedataserver/e-source-local.c @@ -19,10 +19,6 @@ #include "e-source-local.h" -#define E_SOURCE_LOCAL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_LOCAL, ESourceLocalPrivate)) - struct _ESourceLocalPrivate { GFile *custom_file; gboolean writable; @@ -34,7 +30,7 @@ enum { PROP_WRITABLE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceLocal, e_source_local, E_TYPE_SOURCE_EXTENSION) @@ -92,7 +88,7 @@ source_local_finalize (GObject *object) { ESourceLocalPrivate *priv; - priv = E_SOURCE_LOCAL_GET_PRIVATE (object); + priv = E_SOURCE_LOCAL (object)->priv; if (priv->custom_file != NULL) { g_object_unref (priv->custom_file); @@ -109,8 +105,6 @@ e_source_local_class_init (ESourceLocalClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceLocalPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_local_set_property; object_class->get_property = source_local_get_property; @@ -149,7 +143,7 @@ e_source_local_class_init (ESourceLocalClass *class) static void e_source_local_init (ESourceLocal *extension) { - extension->priv = E_SOURCE_LOCAL_GET_PRIVATE (extension); + extension->priv = e_source_local_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-account.c b/src/libedataserver/e-source-mail-account.c index 5dab9c7fc..9c9cac434 100644 --- a/src/libedataserver/e-source-mail-account.c +++ b/src/libedataserver/e-source-mail-account.c @@ -40,10 +40,6 @@ #include <libedataserver/e-source-enumtypes.h> #include <libedataserver/e-source-mail-identity.h> -#define E_SOURCE_MAIL_ACCOUNT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_ACCOUNT, ESourceMailAccountPrivate)) - struct _ESourceMailAccountPrivate { gchar *identity_uid; gchar *archive_folder; @@ -61,7 +57,7 @@ enum { PROP_MARK_SEEN_TIMEOUT }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMailAccount, e_source_mail_account, E_TYPE_SOURCE_BACKEND) @@ -158,7 +154,7 @@ source_mail_account_finalize (GObject *object) { ESourceMailAccountPrivate *priv; - priv = E_SOURCE_MAIL_ACCOUNT_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_ACCOUNT (object)->priv; g_free (priv->identity_uid); g_free (priv->archive_folder); @@ -173,8 +169,6 @@ e_source_mail_account_class_init (ESourceMailAccountClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceMailAccountPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mail_account_set_property; object_class->get_property = source_mail_account_get_property; @@ -259,7 +253,7 @@ e_source_mail_account_class_init (ESourceMailAccountClass *class) static void e_source_mail_account_init (ESourceMailAccount *extension) { - extension->priv = E_SOURCE_MAIL_ACCOUNT_GET_PRIVATE (extension); + extension->priv = e_source_mail_account_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-composition.c b/src/libedataserver/e-source-mail-composition.c index 7c14474ed..1fe90d7d8 100644 --- a/src/libedataserver/e-source-mail-composition.c +++ b/src/libedataserver/e-source-mail-composition.c @@ -41,10 +41,6 @@ #include "e-source-enumtypes.h" #include "e-source-mail-composition.h" -#define E_SOURCE_MAIL_COMPOSITION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_COMPOSITION, ESourceMailCompositionPrivate)) - struct _ESourceMailCompositionPrivate { gchar **bcc; gchar **cc; @@ -70,7 +66,7 @@ enum { PROP_LANGUAGE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMailComposition, e_source_mail_composition, E_TYPE_SOURCE_EXTENSION) @@ -219,7 +215,7 @@ source_mail_composition_finalize (GObject *object) { ESourceMailCompositionPrivate *priv; - priv = E_SOURCE_MAIL_COMPOSITION_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_COMPOSITION (object)->priv; g_strfreev (priv->bcc); g_strfreev (priv->cc); @@ -238,9 +234,6 @@ e_source_mail_composition_class_init (ESourceMailCompositionClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private ( - class, sizeof (ESourceMailCompositionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mail_composition_set_property; object_class->get_property = source_mail_composition_get_property; @@ -382,7 +375,7 @@ e_source_mail_composition_class_init (ESourceMailCompositionClass *class) static void e_source_mail_composition_init (ESourceMailComposition *extension) { - extension->priv = E_SOURCE_MAIL_COMPOSITION_GET_PRIVATE (extension); + extension->priv = e_source_mail_composition_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-identity.c b/src/libedataserver/e-source-mail-identity.c index 61bd241d1..3fcb927bf 100644 --- a/src/libedataserver/e-source-mail-identity.c +++ b/src/libedataserver/e-source-mail-identity.c @@ -43,10 +43,6 @@ #include "e-source-mail-identity.h" -#define E_SOURCE_MAIL_IDENTITY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_IDENTITY, ESourceMailIdentityPrivate)) - struct _ESourceMailIdentityPrivate { gchar *address; gchar *name; @@ -66,7 +62,7 @@ enum { PROP_SIGNATURE_UID }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMailIdentity, e_source_mail_identity, E_TYPE_SOURCE_EXTENSION) @@ -176,7 +172,7 @@ source_mail_identity_finalize (GObject *object) { ESourceMailIdentityPrivate *priv; - priv = E_SOURCE_MAIL_IDENTITY_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_IDENTITY (object)->priv; g_free (priv->address); g_free (priv->name); @@ -195,8 +191,6 @@ e_source_mail_identity_class_init (ESourceMailIdentityClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceMailIdentityPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mail_identity_set_property; object_class->get_property = source_mail_identity_get_property; @@ -293,7 +287,7 @@ e_source_mail_identity_class_init (ESourceMailIdentityClass *class) static void e_source_mail_identity_init (ESourceMailIdentity *extension) { - extension->priv = E_SOURCE_MAIL_IDENTITY_GET_PRIVATE (extension); + extension->priv = e_source_mail_identity_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-signature.c b/src/libedataserver/e-source-mail-signature.c index ded4d2e55..a1f4f41ee 100644 --- a/src/libedataserver/e-source-mail-signature.c +++ b/src/libedataserver/e-source-mail-signature.c @@ -43,10 +43,6 @@ #include "e-source-mail-signature.h" -#define E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_SIGNATURE, ESourceMailSignaturePrivate)) - typedef struct _AsyncContext AsyncContext; struct _ESourceMailSignaturePrivate { @@ -66,7 +62,7 @@ enum { PROP_MIME_TYPE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMailSignature, e_source_mail_signature, E_TYPE_SOURCE_EXTENSION) @@ -127,7 +123,7 @@ source_mail_signature_dispose (GObject *object) { ESourceMailSignaturePrivate *priv; - priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_SIGNATURE (object)->priv; if (priv->file != NULL) { g_object_unref (priv->file); @@ -144,7 +140,7 @@ source_mail_signature_finalize (GObject *object) { ESourceMailSignaturePrivate *priv; - priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_SIGNATURE (object)->priv; g_free (priv->mime_type); @@ -164,7 +160,7 @@ source_mail_signature_constructed (GObject *object) gchar *base_dir; gchar *path; - priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_SIGNATURE (object)->priv; /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_source_mail_signature_parent_class)->constructed (object); @@ -190,9 +186,6 @@ e_source_mail_signature_class_init (ESourceMailSignatureClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private ( - class, sizeof (ESourceMailSignaturePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mail_signature_set_property; object_class->get_property = source_mail_signature_get_property; @@ -232,7 +225,7 @@ e_source_mail_signature_class_init (ESourceMailSignatureClass *class) static void e_source_mail_signature_init (ESourceMailSignature *extension) { - extension->priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (extension); + extension->priv = e_source_mail_signature_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-submission.c b/src/libedataserver/e-source-mail-submission.c index 954367b28..b5d77f453 100644 --- a/src/libedataserver/e-source-mail-submission.c +++ b/src/libedataserver/e-source-mail-submission.c @@ -38,10 +38,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_MAIL_SUBMISSION_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_SUBMISSION, ESourceMailSubmissionPrivate)) - struct _ESourceMailSubmissionPrivate { gchar *sent_folder; gchar *transport_uid; @@ -57,7 +53,7 @@ enum { PROP_USE_SENT_FOLDER }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMailSubmission, e_source_mail_submission, E_TYPE_SOURCE_EXTENSION) @@ -141,7 +137,7 @@ source_mail_submission_finalize (GObject *object) { ESourceMailSubmissionPrivate *priv; - priv = E_SOURCE_MAIL_SUBMISSION_GET_PRIVATE (object); + priv = E_SOURCE_MAIL_SUBMISSION (object)->priv; g_free (priv->sent_folder); g_free (priv->transport_uid); @@ -157,9 +153,6 @@ e_source_mail_submission_class_init (ESourceMailSubmissionClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private ( - class, sizeof (ESourceMailSubmissionPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mail_submission_set_property; object_class->get_property = source_mail_submission_get_property; @@ -229,7 +222,7 @@ e_source_mail_submission_class_init (ESourceMailSubmissionClass *class) static void e_source_mail_submission_init (ESourceMailSubmission *extension) { - extension->priv = E_SOURCE_MAIL_SUBMISSION_GET_PRIVATE (extension); + extension->priv = e_source_mail_submission_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-mail-transport.c b/src/libedataserver/e-source-mail-transport.c index 43cb63183..48772861a 100644 --- a/src/libedataserver/e-source-mail-transport.c +++ b/src/libedataserver/e-source-mail-transport.c @@ -36,10 +36,6 @@ #include "e-source-mail-transport.h" -#define E_SOURCE_MAIL_TRANSPORT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MAIL_TRANSPORT, ESourceMailTransportPrivate)) - G_DEFINE_TYPE ( ESourceMailTransport, e_source_mail_transport, diff --git a/src/libedataserver/e-source-mdn.c b/src/libedataserver/e-source-mdn.c index 1cdf27c3a..2ca2175a3 100644 --- a/src/libedataserver/e-source-mdn.c +++ b/src/libedataserver/e-source-mdn.c @@ -39,10 +39,6 @@ #include <libedataserver/e-source-enumtypes.h> -#define E_SOURCE_MDN_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_MDN, ESourceMDNPrivate)) - struct _ESourceMDNPrivate { EMdnResponsePolicy response_policy; }; @@ -52,7 +48,7 @@ enum { PROP_RESPONSE_POLICY }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceMDN, e_source_mdn, E_TYPE_SOURCE_EXTENSION) @@ -98,8 +94,6 @@ e_source_mdn_class_init (ESourceMDNClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceMDNPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_mdn_set_property; object_class->get_property = source_mdn_get_property; @@ -126,7 +120,7 @@ e_source_mdn_class_init (ESourceMDNClass *class) static void e_source_mdn_init (ESourceMDN *extension) { - extension->priv = E_SOURCE_MDN_GET_PRIVATE (extension); + extension->priv = e_source_mdn_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-offline.c b/src/libedataserver/e-source-offline.c index a974ff5db..b626cdd31 100644 --- a/src/libedataserver/e-source-offline.c +++ b/src/libedataserver/e-source-offline.c @@ -36,10 +36,6 @@ #include "e-source-offline.h" -#define E_SOURCE_OFFLINE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_OFFLINE, ESourceOfflinePrivate)) - struct _ESourceOfflinePrivate { gboolean stay_synchronized; }; @@ -49,7 +45,7 @@ enum { PROP_STAY_SYNCHRONIZED }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceOffline, e_source_offline, E_TYPE_SOURCE_EXTENSION) @@ -95,8 +91,6 @@ e_source_offline_class_init (ESourceOfflineClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceOfflinePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_offline_set_property; object_class->get_property = source_offline_get_property; @@ -122,7 +116,7 @@ e_source_offline_class_init (ESourceOfflineClass *class) static void e_source_offline_init (ESourceOffline *extension) { - extension->priv = E_SOURCE_OFFLINE_GET_PRIVATE (extension); + extension->priv = e_source_offline_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-openpgp.c b/src/libedataserver/e-source-openpgp.c index 59678ce5a..a9ac320c6 100644 --- a/src/libedataserver/e-source-openpgp.c +++ b/src/libedataserver/e-source-openpgp.c @@ -38,10 +38,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_OPENPGP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_OPENPGP, ESourceOpenPGPPrivate)) - struct _ESourceOpenPGPPrivate { gchar *key_id; gchar *signing_algorithm; @@ -64,7 +60,7 @@ enum { PROP_PREFER_INLINE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceOpenPGP, e_source_openpgp, E_TYPE_SOURCE_EXTENSION) @@ -187,7 +183,7 @@ source_openpgp_finalize (GObject *object) { ESourceOpenPGPPrivate *priv; - priv = E_SOURCE_OPENPGP_GET_PRIVATE (object); + priv = E_SOURCE_OPENPGP (object)->priv; g_free (priv->key_id); g_free (priv->signing_algorithm); @@ -202,8 +198,6 @@ e_source_openpgp_class_init (ESourceOpenPGPClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceOpenPGPPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_openpgp_set_property; object_class->get_property = source_openpgp_get_property; @@ -314,7 +308,7 @@ e_source_openpgp_class_init (ESourceOpenPGPClass *class) static void e_source_openpgp_init (ESourceOpenPGP *extension) { - extension->priv = E_SOURCE_OPENPGP_GET_PRIVATE (extension); + extension->priv = e_source_openpgp_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-proxy.c b/src/libedataserver/e-source-proxy.c index cd6194943..dad8826ee 100644 --- a/src/libedataserver/e-source-proxy.c +++ b/src/libedataserver/e-source-proxy.c @@ -44,10 +44,6 @@ #include "e-source-proxy.h" -#define E_SOURCE_PROXY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_PROXY, ESourceProxyPrivate)) - typedef struct _AsyncContext AsyncContext; struct _ESourceProxyPrivate { @@ -94,7 +90,7 @@ enum { PROP_SOCKS_PORT }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceProxy, e_source_proxy, E_TYPE_SOURCE_EXTENSION) @@ -419,7 +415,7 @@ source_proxy_finalize (GObject *object) { ESourceProxyPrivate *priv; - priv = E_SOURCE_PROXY_GET_PRIVATE (object); + priv = E_SOURCE_PROXY (object)->priv; g_free (priv->autoconfig_url); g_strfreev (priv->ignore_hosts); @@ -440,8 +436,6 @@ e_source_proxy_class_init (ESourceProxyClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceProxyPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_proxy_set_property; object_class->get_property = source_proxy_get_property; @@ -652,7 +646,7 @@ e_source_proxy_class_init (ESourceProxyClass *class) static void e_source_proxy_init (ESourceProxy *extension) { - extension->priv = E_SOURCE_PROXY_GET_PRIVATE (extension); + extension->priv = e_source_proxy_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-refresh.c b/src/libedataserver/e-source-refresh.c index b7c1a029b..828e2354e 100644 --- a/src/libedataserver/e-source-refresh.c +++ b/src/libedataserver/e-source-refresh.c @@ -36,10 +36,6 @@ #include "e-source-refresh.h" -#define E_SOURCE_REFRESH_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_REFRESH, ESourceRefreshPrivate)) - typedef struct _TimeoutNode TimeoutNode; struct _ESourceRefreshPrivate { @@ -67,7 +63,7 @@ enum { PROP_INTERVAL_MINUTES }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceRefresh, e_source_refresh, E_TYPE_SOURCE_EXTENSION) @@ -279,7 +275,7 @@ source_refresh_dispose (GObject *object) { ESourceRefreshPrivate *priv; - priv = E_SOURCE_REFRESH_GET_PRIVATE (object); + priv = E_SOURCE_REFRESH (object)->priv; g_hash_table_remove_all (priv->timeout_table); @@ -292,7 +288,7 @@ source_refresh_finalize (GObject *object) { ESourceRefreshPrivate *priv; - priv = E_SOURCE_REFRESH_GET_PRIVATE (object); + priv = E_SOURCE_REFRESH (object)->priv; g_mutex_clear (&priv->timeout_lock); g_hash_table_destroy (priv->timeout_table); @@ -329,8 +325,6 @@ e_source_refresh_class_init (ESourceRefreshClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceRefreshPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_refresh_set_property; object_class->get_property = source_refresh_get_property; @@ -381,7 +375,7 @@ e_source_refresh_init (ESourceRefresh *extension) (GDestroyNotify) NULL, (GDestroyNotify) timeout_node_free); - extension->priv = E_SOURCE_REFRESH_GET_PRIVATE (extension); + extension->priv = e_source_refresh_get_instance_private (extension); g_mutex_init (&extension->priv->timeout_lock); extension->priv->timeout_table = timeout_table; extension->priv->next_timeout_id = 1; diff --git a/src/libedataserver/e-source-registry-watcher.c b/src/libedataserver/e-source-registry-watcher.c index 241307784..0ad4692ad 100644 --- a/src/libedataserver/e-source-registry-watcher.c +++ b/src/libedataserver/e-source-registry-watcher.c @@ -56,7 +56,7 @@ struct _ESourceRegistryWatcherPrivate { gulong changed_id; }; -G_DEFINE_TYPE (ESourceRegistryWatcher, e_source_registry_watcher, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (ESourceRegistryWatcher, e_source_registry_watcher, G_TYPE_OBJECT) enum { PROP_0, @@ -370,8 +370,6 @@ e_source_registry_watcher_class_init (ESourceRegistryWatcherClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (ESourceRegistryWatcherPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->set_property = source_registry_watcher_set_property; object_class->get_property = source_registry_watcher_get_property; @@ -485,7 +483,7 @@ e_source_registry_watcher_class_init (ESourceRegistryWatcherClass *klass) static void e_source_registry_watcher_init (ESourceRegistryWatcher *watcher) { - watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_SOURCE_REGISTRY_WATCHER, ESourceRegistryWatcherPrivate); + watcher->priv = e_source_registry_watcher_get_instance_private (watcher); g_rec_mutex_init (&watcher->priv->lock); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c index abe5c7e73..51b23dbd1 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c @@ -69,10 +69,6 @@ #include "e-source-registry.h" -#define E_SOURCE_REGISTRY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_REGISTRY, ESourceRegistryPrivate)) - #define DBUS_OBJECT_PATH "/org/gnome/evolution/dataserver/SourceManager" #define GSETTINGS_SCHEMA "org.gnome.Evolution.DefaultSources" @@ -198,6 +194,7 @@ G_DEFINE_TYPE_WITH_CODE ( ESourceRegistry, e_source_registry, G_TYPE_OBJECT, + G_ADD_PRIVATE (ESourceRegistry) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_source_registry_initable_init) G_IMPLEMENT_INTERFACE ( @@ -1299,7 +1296,7 @@ source_registry_dispose (GObject *object) { ESourceRegistryPrivate *priv; - priv = E_SOURCE_REGISTRY_GET_PRIVATE (object); + priv = E_SOURCE_REGISTRY (object)->priv; if (priv->dbus_object_manager != NULL) { g_object_unref (priv->dbus_object_manager); @@ -1351,7 +1348,7 @@ source_registry_finalize (GObject *object) { ESourceRegistryPrivate *priv; - priv = E_SOURCE_REGISTRY_GET_PRIVATE (object); + priv = E_SOURCE_REGISTRY (object)->priv; g_hash_table_destroy (priv->object_path_table); g_mutex_clear (&priv->object_path_table_lock); @@ -1480,8 +1477,6 @@ e_source_registry_class_init (ESourceRegistryClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourceRegistryPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_registry_set_property; object_class->get_property = source_registry_get_property; @@ -1714,7 +1709,7 @@ e_source_registry_initable_init (GInitableIface *iface) static void e_source_registry_init (ESourceRegistry *registry) { - registry->priv = E_SOURCE_REGISTRY_GET_PRIVATE (registry); + registry->priv = e_source_registry_get_instance_private (registry); /* This is so the object manager thread can schedule signal * emissions on the thread-default context for this thread. */ diff --git a/src/libedataserver/e-source-resource.c b/src/libedataserver/e-source-resource.c index 669a59893..f632ff01b 100644 --- a/src/libedataserver/e-source-resource.c +++ b/src/libedataserver/e-source-resource.c @@ -44,10 +44,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_RESOURCE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_RESOURCE, ESourceResourcePrivate)) - struct _ESourceResourcePrivate { gchar *identity; }; @@ -57,7 +53,7 @@ enum { PROP_IDENTITY }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceResource, e_source_resource, E_TYPE_SOURCE_EXTENSION) @@ -102,7 +98,7 @@ source_resource_finalize (GObject *object) { ESourceResourcePrivate *priv; - priv = E_SOURCE_RESOURCE_GET_PRIVATE (object); + priv = E_SOURCE_RESOURCE (object)->priv; g_free (priv->identity); @@ -116,8 +112,6 @@ e_source_resource_class_init (ESourceResourceClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceResourcePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_resource_set_property; object_class->get_property = source_resource_get_property; @@ -144,7 +138,7 @@ e_source_resource_class_init (ESourceResourceClass *class) static void e_source_resource_init (ESourceResource *extension) { - extension->priv = E_SOURCE_RESOURCE_GET_PRIVATE (extension); + extension->priv = e_source_resource_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-revision-guards.c b/src/libedataserver/e-source-revision-guards.c index b7f21f605..66589a86b 100644 --- a/src/libedataserver/e-source-revision-guards.c +++ b/src/libedataserver/e-source-revision-guards.c @@ -44,10 +44,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_REVISION_GUARDS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_REVISION_GUARDS, ESourceRevisionGuardsPrivate)) - struct _ESourceRevisionGuardsPrivate { gboolean enabled; }; @@ -57,7 +53,7 @@ enum { PROP_ENABLED }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceRevisionGuards, e_source_revision_guards, E_TYPE_SOURCE_EXTENSION) @@ -103,9 +99,6 @@ e_source_revision_guards_class_init (ESourceRevisionGuardsClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private ( - class, sizeof (ESourceRevisionGuardsPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_revision_guards_set_property; object_class->get_property = source_revision_guards_get_property; @@ -130,7 +123,7 @@ e_source_revision_guards_class_init (ESourceRevisionGuardsClass *class) static void e_source_revision_guards_init (ESourceRevisionGuards *extension) { - extension->priv = E_SOURCE_REVISION_GUARDS_GET_PRIVATE (extension); + extension->priv = e_source_revision_guards_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-security.c b/src/libedataserver/e-source-security.c index de61428f0..e3ca75a9a 100644 --- a/src/libedataserver/e-source-security.c +++ b/src/libedataserver/e-source-security.c @@ -38,10 +38,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_SECURITY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_SECURITY, ESourceSecurityPrivate)) - #define SECURE_METHOD "tls" struct _ESourceSecurityPrivate { @@ -54,7 +50,7 @@ enum { PROP_SECURE }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceSecurity, e_source_security, E_TYPE_SOURCE_EXTENSION) @@ -112,7 +108,7 @@ source_security_finalize (GObject *object) { ESourceSecurityPrivate *priv; - priv = E_SOURCE_SECURITY_GET_PRIVATE (object); + priv = E_SOURCE_SECURITY (object)->priv; g_free (priv->method); @@ -126,8 +122,6 @@ e_source_security_class_init (ESourceSecurityClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceSecurityPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_security_set_property; object_class->get_property = source_security_get_property; @@ -166,7 +160,7 @@ e_source_security_class_init (ESourceSecurityClass *class) static void e_source_security_init (ESourceSecurity *extension) { - extension->priv = E_SOURCE_SECURITY_GET_PRIVATE (extension); + extension->priv = e_source_security_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-selectable.c b/src/libedataserver/e-source-selectable.c index c7b86988c..76a92961f 100644 --- a/src/libedataserver/e-source-selectable.c +++ b/src/libedataserver/e-source-selectable.c @@ -29,10 +29,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_SELECTABLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_SELECTABLE, ESourceSelectablePrivate)) - struct _ESourceSelectablePrivate { gchar *color; gboolean selected; @@ -44,7 +40,7 @@ enum { PROP_SELECTED }; -G_DEFINE_ABSTRACT_TYPE ( +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE ( ESourceSelectable, e_source_selectable, E_TYPE_SOURCE_BACKEND) @@ -102,7 +98,7 @@ source_selectable_finalize (GObject *object) { ESourceSelectablePrivate *priv; - priv = E_SOURCE_SELECTABLE_GET_PRIVATE (object); + priv = E_SOURCE_SELECTABLE (object)->priv; g_free (priv->color); @@ -115,8 +111,6 @@ e_source_selectable_class_init (ESourceSelectableClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourceSelectablePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_selectable_set_property; object_class->get_property = source_selectable_get_property; @@ -157,7 +151,7 @@ e_source_selectable_class_init (ESourceSelectableClass *class) static void e_source_selectable_init (ESourceSelectable *extension) { - extension->priv = E_SOURCE_SELECTABLE_GET_PRIVATE (extension); + extension->priv = e_source_selectable_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-smime.c b/src/libedataserver/e-source-smime.c index 3b60da489..4ce4fea9d 100644 --- a/src/libedataserver/e-source-smime.c +++ b/src/libedataserver/e-source-smime.c @@ -38,10 +38,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_SMIME_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_SMIME, ESourceSMIMEPrivate)) - struct _ESourceSMIMEPrivate { gchar *encryption_certificate; gchar *signing_algorithm; @@ -62,7 +58,7 @@ enum { PROP_SIGN_BY_DEFAULT }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceSMIME, e_source_smime, E_TYPE_SOURCE_EXTENSION) @@ -172,7 +168,7 @@ source_smime_finalize (GObject *object) { ESourceSMIMEPrivate *priv; - priv = E_SOURCE_SMIME_GET_PRIVATE (object); + priv = E_SOURCE_SMIME (object)->priv; g_free (priv->encryption_certificate); g_free (priv->signing_algorithm); @@ -188,8 +184,6 @@ e_source_smime_class_init (ESourceSMIMEClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceSMIMEPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_smime_set_property; object_class->get_property = source_smime_get_property; @@ -286,7 +280,7 @@ e_source_smime_class_init (ESourceSMIMEClass *class) static void e_source_smime_init (ESourceSMIME *extension) { - extension->priv = E_SOURCE_SMIME_GET_PRIVATE (extension); + extension->priv = e_source_smime_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-uoa.c b/src/libedataserver/e-source-uoa.c index 6aeab764f..ed4cf80b8 100644 --- a/src/libedataserver/e-source-uoa.c +++ b/src/libedataserver/e-source-uoa.c @@ -39,10 +39,6 @@ #include <libedataserver/e-data-server-util.h> -#define E_SOURCE_UOA_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_UOA, ESourceUoaPrivate)) - struct _ESourceUoaPrivate { guint account_id; }; @@ -52,7 +48,7 @@ enum { PROP_ACCOUNT_ID }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceUoa, e_source_uoa, E_TYPE_SOURCE_EXTENSION) @@ -98,8 +94,6 @@ e_source_uoa_class_init (ESourceUoaClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceUoaPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_uoa_set_property; object_class->get_property = source_uoa_get_property; @@ -125,7 +119,7 @@ e_source_uoa_class_init (ESourceUoaClass *class) static void e_source_uoa_init (ESourceUoa *extension) { - extension->priv = E_SOURCE_UOA_GET_PRIVATE (extension); + extension->priv = e_source_uoa_get_instance_private (extension); } /** diff --git a/src/libedataserver/e-source-weather.c b/src/libedataserver/e-source-weather.c index c164480f6..b33732da4 100644 --- a/src/libedataserver/e-source-weather.c +++ b/src/libedataserver/e-source-weather.c @@ -20,10 +20,6 @@ #include "e-source-enumtypes.h" #include "e-source-weather.h" -#define E_SOURCE_WEATHER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_WEATHER, ESourceWeatherPrivate)) - struct _ESourceWeatherPrivate { ESourceWeatherUnits units; gchar *location; @@ -35,7 +31,7 @@ enum { PROP_UNITS }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceWeather, e_source_weather, E_TYPE_SOURCE_EXTENSION) @@ -93,7 +89,7 @@ source_weather_finalize (GObject *object) { ESourceWeatherPrivate *priv; - priv = E_SOURCE_WEATHER_GET_PRIVATE (object); + priv = E_SOURCE_WEATHER (object)->priv; g_free (priv->location); @@ -107,8 +103,6 @@ e_source_weather_class_init (ESourceWeatherClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceWeatherPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_weather_set_property; object_class->get_property = source_weather_get_property; @@ -148,7 +142,7 @@ e_source_weather_class_init (ESourceWeatherClass *class) static void e_source_weather_init (ESourceWeather *extension) { - extension->priv = E_SOURCE_WEATHER_GET_PRIVATE (extension); + extension->priv = e_source_weather_get_instance_private (extension); } const gchar * diff --git a/src/libedataserver/e-source-webdav.c b/src/libedataserver/e-source-webdav.c index dfc679add..84e2dbfa5 100644 --- a/src/libedataserver/e-source-webdav.c +++ b/src/libedataserver/e-source-webdav.c @@ -58,10 +58,6 @@ #include "e-source-webdav.h" -#define E_SOURCE_WEBDAV_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE_WEBDAV, ESourceWebdavPrivate)) - struct _ESourceWebdavPrivate { gchar *display_name; gchar *color; @@ -87,7 +83,7 @@ enum { PROP_SSL_TRUST }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ESourceWebdav, e_source_webdav, E_TYPE_SOURCE_EXTENSION) @@ -410,7 +406,7 @@ source_webdav_finalize (GObject *object) { ESourceWebdavPrivate *priv; - priv = E_SOURCE_WEBDAV_GET_PRIVATE (object); + priv = E_SOURCE_WEBDAV (object)->priv; g_free (priv->color); g_free (priv->display_name); @@ -492,8 +488,6 @@ e_source_webdav_class_init (ESourceWebdavClass *class) GObjectClass *object_class; ESourceExtensionClass *extension_class; - g_type_class_add_private (class, sizeof (ESourceWebdavPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_webdav_set_property; object_class->get_property = source_webdav_get_property; @@ -623,7 +617,7 @@ e_source_webdav_class_init (ESourceWebdavClass *class) static void e_source_webdav_init (ESourceWebdav *extension) { - extension->priv = E_SOURCE_WEBDAV_GET_PRIVATE (extension); + extension->priv = e_source_webdav_get_instance_private (extension); /* Initialize this enough for SOUP_URI_IS_VALID() to pass. */ extension->priv->soup_uri = soup_uri_new (NULL); diff --git a/src/libedataserver/e-source.c b/src/libedataserver/e-source.c index 6c3aaae14..ba3a56111 100644 --- a/src/libedataserver/e-source.c +++ b/src/libedataserver/e-source.c @@ -116,10 +116,6 @@ #include "e-source.h" -#define E_SOURCE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SOURCE, ESourcePrivate)) - #define PRIMARY_GROUP_NAME "Data Source" typedef struct _AsyncContext AsyncContext; @@ -206,6 +202,7 @@ G_DEFINE_TYPE_WITH_CODE ( ESource, e_source, G_TYPE_OBJECT, + G_ADD_PRIVATE (ESource) G_IMPLEMENT_INTERFACE ( G_TYPE_INITABLE, e_source_initable_init) @@ -1209,7 +1206,7 @@ source_dispose (GObject *object) { ESourcePrivate *priv; - priv = E_SOURCE_GET_PRIVATE (object); + priv = E_SOURCE (object)->priv; /* Lock & unlock to make sure any pending operations in other threads which use this lock are already done */ @@ -1271,7 +1268,7 @@ source_finalize (GObject *object) { ESourcePrivate *priv; - priv = E_SOURCE_GET_PRIVATE (object); + priv = E_SOURCE (object)->priv; g_mutex_clear (&priv->changed_lock); g_mutex_clear (&priv->connection_status_change_lock); @@ -2123,8 +2120,6 @@ e_source_class_init (ESourceClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ESourcePrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = source_set_property; object_class->get_property = source_get_property; @@ -2411,7 +2406,7 @@ e_source_init (ESource *source) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - source->priv = E_SOURCE_GET_PRIVATE (source); + source->priv = e_source_get_instance_private (source); g_mutex_init (&source->priv->changed_lock); g_mutex_init (&source->priv->connection_status_change_lock); g_mutex_init (&source->priv->property_lock); diff --git a/src/libedataserver/e-webdav-session.c b/src/libedataserver/e-webdav-session.c index 721eff64e..12090ca3d 100644 --- a/src/libedataserver/e-webdav-session.c +++ b/src/libedataserver/e-webdav-session.c @@ -45,7 +45,7 @@ struct _EWebDAVSessionPrivate { gboolean dummy; }; -G_DEFINE_TYPE (EWebDAVSession, e_webdav_session, E_TYPE_SOUP_SESSION) +G_DEFINE_TYPE_WITH_PRIVATE (EWebDAVSession, e_webdav_session, E_TYPE_SOUP_SESSION) G_DEFINE_BOXED_TYPE (EWebDAVResource, e_webdav_resource, e_webdav_resource_copy, e_webdav_resource_free) G_DEFINE_BOXED_TYPE (EWebDAVPropertyChange, e_webdav_property_change, e_webdav_property_change_copy, e_webdav_property_change_free) @@ -598,13 +598,12 @@ e_webdav_access_control_entry_get_privileges (EWebDAVAccessControlEntry *ace) static void e_webdav_session_class_init (EWebDAVSessionClass *klass) { - g_type_class_add_private (klass, sizeof (EWebDAVSessionPrivate)); } static void e_webdav_session_init (EWebDAVSession *webdav) { - webdav->priv = G_TYPE_INSTANCE_GET_PRIVATE (webdav, E_TYPE_WEBDAV_SESSION, EWebDAVSessionPrivate); + webdav->priv = e_webdav_session_get_instance_private (webdav); } /** diff --git a/src/libedataserver/e-xml-document.c b/src/libedataserver/e-xml-document.c index 9bb54e7da..e5e51f63a 100644 --- a/src/libedataserver/e-xml-document.c +++ b/src/libedataserver/e-xml-document.c @@ -37,7 +37,7 @@ struct _EXmlDocumentPrivate { GHashTable *namespaces_by_href; /* gchar *ns_href ~> xmlNsPtr */ }; -G_DEFINE_TYPE (EXmlDocument, e_xml_document, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EXmlDocument, e_xml_document, G_TYPE_OBJECT) static void e_xml_document_finalize (GObject *object) @@ -66,8 +66,6 @@ e_xml_document_class_init (EXmlDocumentClass *klass) { GObjectClass *object_class; - g_type_class_add_private (klass, sizeof (EXmlDocumentPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->finalize = e_xml_document_finalize; } @@ -75,7 +73,7 @@ e_xml_document_class_init (EXmlDocumentClass *klass) static void e_xml_document_init (EXmlDocument *xml) { - xml->priv = G_TYPE_INSTANCE_GET_PRIVATE (xml, E_TYPE_XML_DOCUMENT, EXmlDocumentPrivate); + xml->priv = e_xml_document_get_instance_private (xml); xml->priv->doc = xmlNewDoc ((const xmlChar *) "1.0"); g_return_if_fail (xml->priv->doc != NULL); diff --git a/src/libedataserverui/e-cell-renderer-color.c b/src/libedataserverui/e-cell-renderer-color.c index 2f35064c2..3dafaffaf 100644 --- a/src/libedataserverui/e-cell-renderer-color.c +++ b/src/libedataserverui/e-cell-renderer-color.c @@ -23,10 +23,6 @@ #include <string.h> #include <glib/gi18n-lib.h> -#define E_CELL_RENDERER_COLOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate)) - enum { PROP_0, PROP_RGBA @@ -36,7 +32,7 @@ struct _ECellRendererColorPrivate { GdkRGBA rgba; }; -G_DEFINE_TYPE ( +G_DEFINE_TYPE_WITH_PRIVATE ( ECellRendererColor, e_cell_renderer_color, GTK_TYPE_CELL_RENDERER) @@ -105,7 +101,7 @@ cell_renderer_color_render (GtkCellRenderer *cell, guint xpad; guint ypad; - priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell); + priv = E_CELL_RENDERER_COLOR (cell)->priv; cell_renderer_color_get_size ( cell, widget, cell_area, @@ -137,7 +133,7 @@ cell_renderer_color_set_property (GObject *object, ECellRendererColorPrivate *priv; GdkRGBA *rgba; - priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); + priv = E_CELL_RENDERER_COLOR (object)->priv; switch (property_id) { case PROP_RGBA: @@ -165,7 +161,7 @@ cell_renderer_color_get_property (GObject *object, { ECellRendererColorPrivate *priv; - priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); + priv = E_CELL_RENDERER_COLOR (object)->priv; switch (property_id) { case PROP_RGBA: @@ -182,8 +178,6 @@ e_cell_renderer_color_class_init (ECellRendererColorClass *class) GObjectClass *object_class; GtkCellRendererClass *cell_class; - g_type_class_add_private (class, sizeof (ECellRendererColorPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = cell_renderer_color_set_property; object_class->get_property = cell_renderer_color_get_property; @@ -206,7 +200,7 @@ e_cell_renderer_color_class_init (ECellRendererColorClass *class) static void e_cell_renderer_color_init (ECellRendererColor *cellcolor) { - cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor); + cellcolor->priv = e_cell_renderer_color_get_instance_private (cellcolor); g_object_set (cellcolor, "xpad", 4, NULL); } diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c index 77c745fa0..bcc7ce1dd 100644 --- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c +++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c @@ -53,7 +53,7 @@ struct _ECredentialsPrompterImplOAuth2Private { GCancellable *cancellable; }; -G_DEFINE_TYPE (ECredentialsPrompterImplOAuth2, e_credentials_prompter_impl_oauth2, E_TYPE_CREDENTIALS_PROMPTER_IMPL) +G_DEFINE_TYPE_WITH_PRIVATE (ECredentialsPrompterImplOAuth2, e_credentials_prompter_impl_oauth2, E_TYPE_CREDENTIALS_PROMPTER_IMPL) #ifdef ENABLE_OAUTH2 @@ -1019,8 +1019,6 @@ e_credentials_prompter_impl_oauth2_class_init (ECredentialsPrompterImplOAuth2Cla GObjectClass *object_class; ECredentialsPrompterImplClass *prompter_impl_class; - g_type_class_add_private (class, sizeof (ECredentialsPrompterImplOAuth2Private)); - object_class = G_OBJECT_CLASS (class); object_class->constructed = e_credentials_prompter_impl_oauth2_constructed; object_class->dispose = e_credentials_prompter_impl_oauth2_dispose; @@ -1035,8 +1033,7 @@ e_credentials_prompter_impl_oauth2_class_init (ECredentialsPrompterImplOAuth2Cla static void e_credentials_prompter_impl_oauth2_init (ECredentialsPrompterImplOAuth2 *prompter_oauth2) { - prompter_oauth2->priv = G_TYPE_INSTANCE_GET_PRIVATE (prompter_oauth2, - E_TYPE_CREDENTIALS_PROMPTER_IMPL_OAUTH2, ECredentialsPrompterImplOAuth2Private); + prompter_oauth2->priv = e_credentials_prompter_impl_oauth2_get_instance_private (prompter_oauth2); g_mutex_init (&prompter_oauth2->priv->property_lock); diff --git a/src/libedataserverui/e-credentials-prompter-impl-password.c b/src/libedataserverui/e-credentials-prompter-impl-password.c index 96a92b935..3706cd25e 100644 --- a/src/libedataserverui/e-credentials-prompter-impl-password.c +++ b/src/libedataserverui/e-credentials-prompter-impl-password.c @@ -38,7 +38,7 @@ struct _ECredentialsPrompterImplPasswordPrivate { gulong show_dialog_idle_id; }; -G_DEFINE_TYPE (ECredentialsPrompterImplPassword, e_credentials_prompter_impl_password, E_TYPE_CREDENTIALS_PROMPTER_IMPL) +G_DEFINE_TYPE_WITH_PRIVATE (ECredentialsPrompterImplPassword, e_credentials_prompter_impl_password, E_TYPE_CREDENTIALS_PROMPTER_IMPL) static gboolean password_dialog_map_event_cb (GtkWidget *dialog, @@ -531,8 +531,6 @@ e_credentials_prompter_impl_password_class_init (ECredentialsPrompterImplPasswor GObjectClass *object_class; ECredentialsPrompterImplClass *prompter_impl_class; - g_type_class_add_private (class, sizeof (ECredentialsPrompterImplPasswordPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->dispose = e_credentials_prompter_impl_password_dispose; @@ -545,8 +543,7 @@ e_credentials_prompter_impl_password_class_init (ECredentialsPrompterImplPasswor static void e_credentials_prompter_impl_password_init (ECredentialsPrompterImplPassword *prompter_password) { - prompter_password->priv = G_TYPE_INSTANCE_GET_PRIVATE (prompter_password, - E_TYPE_CREDENTIALS_PROMPTER_IMPL_PASSWORD, ECredentialsPrompterImplPasswordPrivate); + prompter_password->priv = e_credentials_prompter_impl_password_get_instance_private (prompter_password); } /** diff --git a/src/libedataserverui/e-credentials-prompter-impl.c b/src/libedataserverui/e-credentials-prompter-impl.c index e339bfc8b..54e2db1bf 100644 --- a/src/libedataserverui/e-credentials-prompter-impl.c +++ b/src/libedataserverui/e-credentials-prompter-impl.c @@ -31,7 +31,7 @@ enum { static guint signals[LAST_SIGNAL]; -G_DEFINE_ABSTRACT_TYPE (ECredentialsPrompterImpl, e_credentials_prompter_impl, E_TYPE_EXTENSION) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ECredentialsPrompterImpl, e_credentials_prompter_impl, E_TYPE_EXTENSION) static void e_credentials_prompter_impl_constructed (GObject *object) @@ -75,8 +75,6 @@ e_credentials_prompter_impl_class_init (ECredentialsPrompterImplClass *klass) GObjectClass *object_class; EExtensionClass *extension_class; - g_type_class_add_private (klass, sizeof (ECredentialsPrompterImplPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->dispose = e_credentials_prompter_impl_dispose; object_class->constructed = e_credentials_prompter_impl_constructed; @@ -106,8 +104,7 @@ e_credentials_prompter_impl_class_init (ECredentialsPrompterImplClass *klass) static void e_credentials_prompter_impl_init (ECredentialsPrompterImpl *prompter_impl) { - prompter_impl->priv = G_TYPE_INSTANCE_GET_PRIVATE (prompter_impl, - E_TYPE_CREDENTIALS_PROMPTER_IMPL, ECredentialsPrompterImplPrivate); + prompter_impl->priv = e_credentials_prompter_impl_get_instance_private (prompter_impl); prompter_impl->priv->cancellable = g_cancellable_new (); } diff --git a/src/libedataserverui/e-credentials-prompter.c b/src/libedataserverui/e-credentials-prompter.c index a104a772d..a0aa64e94 100644 --- a/src/libedataserverui/e-credentials-prompter.c +++ b/src/libedataserverui/e-credentials-prompter.c @@ -77,6 +77,7 @@ enum { static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_CODE (ECredentialsPrompter, e_credentials_prompter, G_TYPE_OBJECT, + G_ADD_PRIVATE (ECredentialsPrompter) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) static void @@ -1071,8 +1072,6 @@ e_credentials_prompter_class_init (ECredentialsPrompterClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (ECredentialsPrompterPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->set_property = credentials_prompter_set_property; object_class->get_property = credentials_prompter_get_property; @@ -1167,7 +1166,7 @@ e_credentials_prompter_class_init (ECredentialsPrompterClass *class) static void e_credentials_prompter_init (ECredentialsPrompter *prompter) { - prompter->priv = G_TYPE_INSTANCE_GET_PRIVATE (prompter, E_TYPE_CREDENTIALS_PROMPTER, ECredentialsPrompterPrivate); + prompter->priv = e_credentials_prompter_get_instance_private (prompter); prompter->priv->auto_prompt = TRUE; prompter->priv->provider = NULL; diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c index 496f45370..1f4ae561c 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c @@ -90,6 +90,7 @@ enum { static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_CODE (ERemindersWidget, e_reminders_widget, GTK_TYPE_GRID, + G_ADD_PRIVATE (ERemindersWidget) G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) static gboolean @@ -1554,8 +1555,6 @@ e_reminders_widget_class_init (ERemindersWidgetClass *klass) GObjectClass *object_class; GtkWidgetClass *widget_class; - g_type_class_add_private (klass, sizeof (ERemindersWidgetPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->set_property = reminders_widget_set_property; object_class->get_property = reminders_widget_get_property; @@ -1650,7 +1649,7 @@ e_reminders_widget_class_init (ERemindersWidgetClass *klass) static void e_reminders_widget_init (ERemindersWidget *reminders) { - reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate); + reminders->priv = e_reminders_widget_get_instance_private (reminders); reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); reminders->priv->cancellable = g_cancellable_new (); reminders->priv->is_empty = TRUE; diff --git a/src/modules/gnome-online-accounts/e-goa-client.c b/src/modules/gnome-online-accounts/e-goa-client.c index 48e3953e9..aa72e6434 100644 --- a/src/modules/gnome-online-accounts/e-goa-client.c +++ b/src/modules/gnome-online-accounts/e-goa-client.c @@ -21,10 +21,6 @@ #include "e-goa-client.h" -#define E_GOA_CLIENT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_GOA_CLIENT, EGoaClientPrivate)) - struct _EGoaClientPrivate { GDBusObjectManager *object_manager; gulong object_added_handler_id; @@ -60,6 +56,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( e_goa_client, G_TYPE_OBJECT, 0, + G_ADD_PRIVATE_DYNAMIC (EGoaClient) G_IMPLEMENT_INTERFACE_DYNAMIC ( G_TYPE_INITABLE, e_goa_client_interface_init) @@ -269,7 +266,7 @@ e_goa_client_dispose (GObject *object) { EGoaClientPrivate *priv; - priv = E_GOA_CLIENT_GET_PRIVATE (object); + priv = E_GOA_CLIENT (object)->priv; if (priv->object_added_handler_id > 0) { g_signal_handler_disconnect ( @@ -305,7 +302,7 @@ e_goa_client_finalize (GObject *object) { EGoaClientPrivate *priv; - priv = E_GOA_CLIENT_GET_PRIVATE (object); + priv = E_GOA_CLIENT (object)->priv; g_hash_table_destroy (priv->orphans); g_mutex_clear (&priv->orphans_lock); @@ -322,7 +319,7 @@ e_goa_client_initable_init (GInitable *initable, EGoaClientPrivate *priv; gulong handler_id; - priv = E_GOA_CLIENT_GET_PRIVATE (initable); + priv = E_GOA_CLIENT (initable)->priv; priv->object_manager = goa_object_manager_client_new_for_bus_sync ( G_BUS_TYPE_SESSION, @@ -360,8 +357,6 @@ e_goa_client_class_init (EGoaClientClass *class) { GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EGoaClientPrivate)); - object_class = G_OBJECT_CLASS (class); object_class->get_property = e_goa_client_get_property; object_class->dispose = e_goa_client_dispose; @@ -420,7 +415,7 @@ e_goa_client_interface_init (GInitableIface *iface) static void e_goa_client_init (EGoaClient *client) { - client->priv = E_GOA_CLIENT_GET_PRIVATE (client); + client->priv = e_goa_client_get_instance_private (client); client->priv->orphans = g_hash_table_new_full ( (GHashFunc) g_str_hash, diff --git a/src/modules/gnome-online-accounts/e-goa-password-based.c b/src/modules/gnome-online-accounts/e-goa-password-based.c index 4444d0b56..c5949aee0 100644 --- a/src/modules/gnome-online-accounts/e-goa-password-based.c +++ b/src/modules/gnome-online-accounts/e-goa-password-based.c @@ -25,16 +25,16 @@ #include "e-goa-password-based.h" -#define E_GOA_PASSWORD_BASED_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_GOA_PASSWORD_BASED, EGoaPasswordBasedPrivate)) - struct _EGoaPasswordBasedPrivate { GoaClient *goa_client; GMutex lock; }; -G_DEFINE_DYNAMIC_TYPE (EGoaPasswordBased, e_goa_password_based, E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL) +G_DEFINE_DYNAMIC_TYPE_EXTENDED (EGoaPasswordBased, + e_goa_password_based, + E_TYPE_SOURCE_CREDENTIALS_PROVIDER_IMPL, + 0, + G_ADD_PRIVATE_DYNAMIC (EGoaPasswordBased)) static GoaClient * e_goa_password_based_ref_goa_client_sync (EGoaPasswordBased *goa_password_based, @@ -350,8 +350,6 @@ e_goa_password_based_class_init (EGoaPasswordBasedClass *class) ESourceCredentialsProviderImplClass *provider_impl_class; GObjectClass *object_class; - g_type_class_add_private (class, sizeof (EGoaPasswordBasedPrivate)); - provider_impl_class = E_SOURCE_CREDENTIALS_PROVIDER_IMPL_CLASS (class); provider_impl_class->can_process = e_goa_password_based_can_process; provider_impl_class->can_store = e_goa_password_based_can_store; @@ -371,7 +369,7 @@ e_goa_password_based_class_finalize (EGoaPasswordBasedClass *class) static void e_goa_password_based_init (EGoaPasswordBased *session) { - session->priv = E_GOA_PASSWORD_BASED_GET_PRIVATE (session); + session->priv = e_goa_password_based_get_instance_private (session); g_mutex_init (&session->priv->lock); } @@ -379,7 +377,7 @@ e_goa_password_based_init (EGoaPasswordBased *session) void e_goa_password_based_type_register (GTypeModule *type_module) { - /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration + /* XXX G_DEFINE_DYNAMIC_TYPE_EXTENDED declares a static type registration * function, so we have to wrap it with a public function in * order to register types from a separate compilation unit. */ e_goa_password_based_register_type (type_module); diff --git a/src/services/evolution-alarm-notify/e-alarm-notify.c b/src/services/evolution-alarm-notify/e-alarm-notify.c index a97e258b4..4b4712fda 100644 --- a/src/services/evolution-alarm-notify/e-alarm-notify.c +++ b/src/services/evolution-alarm-notify/e-alarm-notify.c @@ -69,6 +69,7 @@ struct _EAlarmNotifyPrivate { static void e_alarm_notify_initable_init (GInitableIface *iface); G_DEFINE_TYPE_WITH_CODE (EAlarmNotify, e_alarm_notify, GTK_TYPE_APPLICATION, + G_ADD_PRIVATE (EAlarmNotify) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, e_alarm_notify_initable_init)) static void @@ -1079,8 +1080,6 @@ e_alarm_notify_class_init (EAlarmNotifyClass *klass) GObjectClass *object_class; GApplicationClass *application_class; - g_type_class_add_private (klass, sizeof (EAlarmNotifyPrivate)); - object_class = G_OBJECT_CLASS (klass); object_class->dispose = e_alarm_notify_dispose; object_class->finalize = e_alarm_notify_finalize; @@ -1099,7 +1098,7 @@ e_alarm_notify_initable_init (GInitableIface *iface) static void e_alarm_notify_init (EAlarmNotify *an) { - an->priv = G_TYPE_INSTANCE_GET_PRIVATE (an, E_TYPE_ALARM_NOTIFY, EAlarmNotifyPrivate); + an->priv = e_alarm_notify_get_instance_private (an); an->priv->notification_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); an->priv->last_n_reminders = G_MAXINT32; |