From 23f5773903d64a554d977ae7d0ebbaca73528f1f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 30 Nov 2011 20:53:20 -0600
Subject: Coding style and whitespace cleanup.

---
 composer/e-composer-header-table.c | 4 ++++
 composer/e-composer-header.c       | 4 ++++
 composer/e-msg-composer.c          | 9 +++------
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'composer')

diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 2479eebab7..f2a9356a90 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -34,6 +34,10 @@
 #include "e-composer-post-header.h"
 #include "e-composer-text-header.h"
 
+#define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate))
+
 #define HEADER_TOOLTIP_TO \
 	_("Enter the recipients of the message")
 #define HEADER_TOOLTIP_CC \
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index ebfe564dcb..c92b069113 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -47,6 +47,10 @@ struct _EComposerHeaderPrivate {
 	guint visible   : 1;
 };
 
+#define E_COMPOSER_HEADER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate))
+
 enum {
 	PROP_0,
 	PROP_BUTTON,
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6a48950912..9f32d8cabe 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1394,7 +1394,7 @@ is_top_signature (EMsgComposer *composer)
 {
 	EShell *shell;
 	EShellSettings *shell_settings;
-	EMsgComposerPrivate *priv = composer->priv;
+	EMsgComposerPrivate *priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
 
 	g_return_val_if_fail (priv != NULL, FALSE);
 
@@ -2540,12 +2540,9 @@ e_msg_composer_alert_sink_init (EAlertSinkInterface *interface)
 static void
 e_msg_composer_init (EMsgComposer *composer)
 {
-	composer->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		composer, E_TYPE_MSG_COMPOSER, EMsgComposerPrivate);
+	composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
 }
 
-/* Callbacks.  */
-
 /**
  * e_msg_composer_new:
  * @shell: an #EShell
@@ -3082,7 +3079,7 @@ e_msg_composer_new_with_message (EShell *shell,
 	}
 
 	composer = e_msg_composer_new (shell);
-	priv = composer->priv;
+	priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
 	table = e_msg_composer_get_header_table (composer);
 
 	if (postto) {
-- 
cgit v1.2.3