diff options
Diffstat (limited to 'widgets/misc/e-attachment.c')
| -rw-r--r-- | widgets/misc/e-attachment.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 166020596e..0678296767 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -36,6 +36,10 @@ #include "e-util/e-mktemp.h" #include "e-attachment-store.h" +#define E_ATTACHMENT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_ATTACHMENT, EAttachmentPrivate)) + /* Fallback Icon */ #define DEFAULT_ICON_NAME "mail-attachment" @@ -162,7 +166,8 @@ attachment_get_default_charset (void) charset = g_settings_get_string (settings, "composer-charset"); if (charset == NULL || *charset == '\0') { g_free (charset); - /* FIXME: this was "/apps/evolution/mail/format/charset", not sure it relates to "charset" */ + /* FIXME This was "/apps/evolution/mail/format/charset", + * not sure it relates to "charset" */ charset = g_settings_get_string (settings, "charset"); if (charset == NULL || *charset == '\0') { g_free (charset); @@ -665,7 +670,7 @@ attachment_dispose (GObject *object) { EAttachmentPrivate *priv; - priv = E_ATTACHMENT (object)->priv; + priv = E_ATTACHMENT_GET_PRIVATE (object); if (priv->file != NULL) { g_object_unref (priv->file); @@ -710,7 +715,7 @@ attachment_finalize (GObject *object) { EAttachmentPrivate *priv; - priv = E_ATTACHMENT (object)->priv; + priv = E_ATTACHMENT_GET_PRIVATE (object); g_free (priv->disposition); @@ -879,8 +884,7 @@ e_attachment_class_init (EAttachmentClass *class) static void e_attachment_init (EAttachment *attachment) { - attachment->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - attachment, E_TYPE_ATTACHMENT, EAttachmentPrivate); + attachment->priv = E_ATTACHMENT_GET_PRIVATE (attachment); attachment->priv->cancellable = g_cancellable_new (); attachment->priv->encrypted = CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE; attachment->priv->signed_ = CAMEL_CIPHER_VALIDITY_SIGN_NONE; |