aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail/e-mail-attachment-handler.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-12-01 10:53:20 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-02-20 23:04:25 +0800
commit23f5773903d64a554d977ae7d0ebbaca73528f1f (patch)
tree104e1a59da8bf96b004bce204b79f47bbe0a6d13 /modules/mail/e-mail-attachment-handler.c
parent49bc4c2d765ee1780c23fdc9f42152850dabb220 (diff)
downloadgsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.gz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.bz2
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.lz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.xz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.zst
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'modules/mail/e-mail-attachment-handler.c')
-rw-r--r--modules/mail/e-mail-attachment-handler.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 0c00279028..69d8898fc8 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -31,6 +31,10 @@
#include "mail/e-mail-backend.h"
#include "mail/em-composer-utils.h"
+#define E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_MAIL_ATTACHMENT_HANDLER, EMailAttachmentHandlerPrivate))
+
struct _EMailAttachmentHandlerPrivate {
EShell *shell;
EMailSession *session;
@@ -71,7 +75,7 @@ mail_attachment_handler_forward (GtkAction *action,
GList *selected;
view = e_attachment_handler_get_view (handler);
- priv = E_MAIL_ATTACHMENT_HANDLER (handler)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
selected = e_attachment_view_get_selected_attachments (view);
g_return_if_fail (g_list_length (selected) == 1);
@@ -106,7 +110,7 @@ mail_attachment_handler_reply_all (GtkAction *action,
GList *selected;
view = e_attachment_handler_get_view (handler);
- priv = E_MAIL_ATTACHMENT_HANDLER (handler)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
selected = e_attachment_view_get_selected_attachments (view);
g_return_if_fail (g_list_length (selected) == 1);
@@ -142,7 +146,7 @@ mail_attachment_handler_reply_sender (GtkAction *action,
GList *selected;
view = e_attachment_handler_get_view (handler);
- priv = E_MAIL_ATTACHMENT_HANDLER (handler)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
selected = e_attachment_view_get_selected_attachments (view);
g_return_if_fail (g_list_length (selected) == 1);
@@ -286,7 +290,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
return;
store = e_attachment_view_get_store (view);
- priv = E_MAIL_ATTACHMENT_HANDLER (handler)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
@@ -461,7 +465,7 @@ mail_attachment_handler_dispose (GObject *object)
{
EMailAttachmentHandlerPrivate *priv;
- priv = E_MAIL_ATTACHMENT_HANDLER (object)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (object);
if (priv->shell != NULL) {
g_object_unref (priv->shell);
@@ -491,7 +495,7 @@ mail_attachment_handler_constructed (GObject *object)
GError *error = NULL;
handler = E_ATTACHMENT_HANDLER (object);
- priv = E_MAIL_ATTACHMENT_HANDLER (object)->priv;
+ priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (object);
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (parent_class)->constructed (object);
@@ -571,9 +575,7 @@ mail_attachment_handler_class_init (EMailAttachmentHandlerClass *class)
static void
mail_attachment_handler_init (EMailAttachmentHandler *handler)
{
- handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- handler, E_TYPE_MAIL_ATTACHMENT_HANDLER,
- EMailAttachmentHandlerPrivate);
+ handler->priv = E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
}
GType