4 files changed, 26 insertions, 14 deletions
diff --git a/libemail-utils/e-signature-list.c b/libemail-utils/e-signature-list.c
index afc1d9eefd..5be5d31ca1 100644
--- a/libemail-utils/e-signature-list.c
+++ b/libemail-utils/e-signature-list.c
@@ -31,6 +31,10 @@
 
 #include <libedataserver/e-uid.h>
 
+#define E_SIGNATURE_LIST_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SIGNATURE_LIST, ESignatureListPrivate))
+
 struct _ESignatureListPrivate {
 	GConfClient *gconf;
 	guint notify_id;
@@ -112,8 +116,7 @@ e_signature_list_class_init (ESignatureListClass *class)
 static void
 e_signature_list_init (ESignatureList *signature_list)
 {
-	signature_list->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		signature_list, E_TYPE_SIGNATURE_LIST, ESignatureListPrivate);
+	signature_list->priv = E_SIGNATURE_LIST_GET_PRIVATE (signature_list);
 }
 
 static GSList *
diff --git a/libemail-utils/e-signature.c b/libemail-utils/e-signature.c
index 1b49389a82..e568c63bd2 100644
--- a/libemail-utils/e-signature.c
+++ b/libemail-utils/e-signature.c
@@ -35,6 +35,10 @@
 
 #include "e-signature.h"
 
+#define E_SIGNATURE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SIGNATURE, ESignaturePrivate))
+
 struct _ESignaturePrivate {
 	gchar *filename;
 	gchar *name;
@@ -318,8 +322,7 @@ e_signature_class_init (ESignatureClass *class)
 static void
 e_signature_init (ESignature *signature)
 {
-	signature->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		signature, E_TYPE_SIGNATURE, ESignaturePrivate);
+	signature->priv = E_SIGNATURE_GET_PRIVATE (signature);
 }
 
 /**
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index cad4859cd1..ec2c52944a 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -51,14 +51,16 @@ static MailMsgCompleteActivityFunc complete_activity = NULL;
 static MailMsgAlertErrorFunc alert_error = NULL;
 static MailMsgCancelActivityFunc cancel_activity = NULL;
 
-void mail_msg_register_activities (MailMsgCreateActivityFunc acreate,
-				   MailMsgSubmitActivityFunc asubmit,
-				   MailMsgFreeActivityFunc freeact,
-				   MailMsgCompleteActivityFunc comp_act,
-				   MailMsgCancelActivityFunc cancel_act,
-				   MailMsgAlertErrorFunc ealert)
+void
+mail_msg_register_activities (MailMsgCreateActivityFunc acreate,
+                              MailMsgSubmitActivityFunc asubmit,
+                              MailMsgFreeActivityFunc freeact,
+                              MailMsgCompleteActivityFunc comp_act,
+                              MailMsgCancelActivityFunc cancel_act,
+                              MailMsgAlertErrorFunc ealert)
 {
-	/* This is a utter hack to keep EActivity out of EDS and still let Evolution do EActivity */
+	/* XXX This is an utter hack to keep EActivity out
+	 *     of EDS and still let Evolution do EActivity. */
 	create_activity = acreate;
 	submit_acitivity = asubmit;
 	free_activity = freeact;
@@ -232,8 +234,10 @@ mail_msg_check_error (gpointer msg)
 	/* XXX Hmm, no explanation of why this is needed.  It looks like
 	 *     a lame hack and will be removed at some point, if only to
 	 *     reintroduce whatever issue made this necessary so we can
-	 *     document it the source code this time. */
-	if (g_error_matches (m->error, CAMEL_FOLDER_ERROR, CAMEL_FOLDER_ERROR_INVALID_UID))
+	 *     document it in the source code this time. */
+	if (g_error_matches (
+		m->error, CAMEL_FOLDER_ERROR,
+		CAMEL_FOLDER_ERROR_INVALID_UID))
 		return;
 
 	/* FIXME: Submit an error on the dbus */
diff --git a/libemail-utils/mail-mt.h b/libemail-utils/mail-mt.h
index 36865fe8e9..055464b886 100644
--- a/libemail-utils/mail-mt.h
+++ b/libemail-utils/mail-mt.h
@@ -41,7 +41,9 @@ typedef void    (*MailMsgSubmitActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgFreeActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgCompleteActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgCancelActivityFunc)	(GCancellable *cancellable);
-typedef void    (*MailMsgAlertErrorFunc)	(GCancellable *cancellable, const gchar *what, const gchar *message);
+typedef void    (*MailMsgAlertErrorFunc)	(GCancellable *cancellable,
+						 const gchar *what,
+						 const gchar *message);
 
 struct _MailMsg {
 	MailMsgInfo *info;