diff options
Diffstat (limited to 'src/libedataserver/e-source-mail-composition.c')
| -rw-r--r-- | src/libedataserver/e-source-mail-composition.c | 13 |
1 files changed, 3 insertions, 10 deletions
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); } /** |