From 7aacf983b32ecac26bc9707697da622b3ef164a3 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 5 Mar 2011 12:33:49 -0500
Subject: Coding style and whitespace cleanup.

---
 modules/addressbook/e-book-shell-backend.c  |  4 +++-
 modules/addressbook/e-book-shell-content.c  |  4 +++-
 modules/addressbook/e-book-shell-sidebar.c  |  4 +++-
 modules/addressbook/e-book-shell-view.c     |  4 +++-
 modules/calendar/e-cal-attachment-handler.c |  4 +++-
 modules/calendar/e-cal-shell-backend.c      |  4 +++-
 modules/calendar/e-cal-shell-content.c      |  4 +++-
 modules/calendar/e-cal-shell-sidebar.c      |  4 +++-
 modules/calendar/e-cal-shell-view.c         |  3 ++-
 modules/calendar/e-memo-shell-backend.c     |  4 +++-
 modules/calendar/e-memo-shell-content.c     |  4 +++-
 modules/calendar/e-memo-shell-sidebar.c     |  4 +++-
 modules/calendar/e-memo-shell-view.c        |  4 +++-
 modules/calendar/e-task-shell-backend.c     |  4 +++-
 modules/calendar/e-task-shell-content.c     |  4 +++-
 modules/calendar/e-task-shell-sidebar.c     |  4 +++-
 modules/calendar/e-task-shell-view.c        |  4 +++-
 modules/connman/evolution-connman.c         | 12 +++++++++---
 modules/mail/e-mail-attachment-handler.c    |  4 +++-
 modules/mail/e-mail-junk-hook.c             |  3 ++-
 modules/mail/e-mail-shell-backend.c         |  4 +++-
 modules/mail/e-mail-shell-content.c         |  4 +++-
 modules/mail/e-mail-shell-sidebar.c         |  4 +++-
 modules/mail/e-mail-shell-view.c            |  4 +++-
 modules/mail/em-account-prefs.c             |  3 ++-
 modules/plugin-mono/e-plugin-mono.c         |  3 ++-
 modules/plugin-python/e-plugin-python.c     |  3 ++-
 27 files changed, 82 insertions(+), 29 deletions(-)

(limited to 'modules')

diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index cf9011a021..4de5d1ecf9 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -551,7 +551,9 @@ book_shell_backend_class_init (EBookShellBackendClass *class)
 static void
 book_shell_backend_init (EBookShellBackend *book_shell_backend)
 {
-	book_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_backend, E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackendPrivate);
+	book_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_shell_backend, E_TYPE_BOOK_SHELL_BACKEND,
+		EBookShellBackendPrivate);
 }
 
 GType
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 2077510056..4f3905181e 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -452,7 +452,9 @@ book_shell_content_class_init (EBookShellContentClass *class)
 static void
 book_shell_content_init (EBookShellContent *book_shell_content)
 {
-	book_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_content, E_TYPE_BOOK_SHELL_CONTENT, EBookShellContentPrivate);
+	book_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_shell_content, E_TYPE_BOOK_SHELL_CONTENT,
+		EBookShellContentPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index 57f3b288df..55055638c7 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -200,7 +200,9 @@ book_shell_sidebar_class_init (EBookShellSidebarClass *class)
 static void
 book_shell_sidebar_init (EBookShellSidebar *book_shell_sidebar)
 {
-	book_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_sidebar, E_TYPE_BOOK_SHELL_SIDEBAR, EBookShellSidebarPrivate);
+	book_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_shell_sidebar, E_TYPE_BOOK_SHELL_SIDEBAR,
+		EBookShellSidebarPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 777793ad45..4f0d349ba6 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -414,7 +414,9 @@ static void
 book_shell_view_init (EBookShellView *book_shell_view,
                       EShellViewClass *shell_view_class)
 {
-	book_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_view, E_TYPE_BOOK_SHELL_VIEW, EBookShellViewPrivate);
+	book_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_shell_view, E_TYPE_BOOK_SHELL_VIEW,
+		EBookShellViewPrivate);
 
 	e_book_shell_view_private_init (book_shell_view, shell_view_class);
 }
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 25677877fc..14c9efbe4d 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -488,7 +488,9 @@ cal_attachment_handler_class_init (ECalAttachmentHandlerClass *class)
 static void
 cal_attachment_handler_init (ECalAttachmentHandler *handler)
 {
-	handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandlerPrivate);
+	handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		handler, E_TYPE_CAL_ATTACHMENT_HANDLER,
+		ECalAttachmentHandlerPrivate);
 }
 
 GType
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index b9cb894c50..d0f97caae2 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -796,7 +796,9 @@ cal_shell_backend_init (ECalShellBackend *cal_shell_backend)
 	icalarray *builtin_timezones;
 	gint ii;
 
-	cal_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_backend, E_TYPE_CAL_SHELL_BACKEND, ECalShellBackendPrivate);
+	cal_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cal_shell_backend, E_TYPE_CAL_SHELL_BACKEND,
+		ECalShellBackendPrivate);
 
 	/* XXX Pre-load all built-in timezones in libical.
 	 *
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 1fbedd22b1..e35057bacb 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -620,7 +620,9 @@ cal_shell_content_class_init (ECalShellContentClass *class)
 static void
 cal_shell_content_init (ECalShellContent *cal_shell_content)
 {
-	cal_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_content, E_TYPE_CAL_SHELL_CONTENT, ECalShellContentPrivate);
+	cal_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cal_shell_content, E_TYPE_CAL_SHELL_CONTENT,
+		ECalShellContentPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 21c630b549..9f9bc454e1 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -845,7 +845,9 @@ cal_shell_sidebar_init (ECalShellSidebar *cal_shell_sidebar)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) g_object_unref);
 
-	cal_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_sidebar, E_TYPE_CAL_SHELL_SIDEBAR, ECalShellSidebarPrivate);
+	cal_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cal_shell_sidebar, E_TYPE_CAL_SHELL_SIDEBAR,
+		ECalShellSidebarPrivate);
 
 	cal_shell_sidebar->priv->client_table = client_table;
 
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 72ce261a6a..ce2e258441 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -517,7 +517,8 @@ static void
 cal_shell_view_init (ECalShellView *cal_shell_view,
                      EShellViewClass *shell_view_class)
 {
-	cal_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_view, E_TYPE_CAL_SHELL_VIEW, ECalShellViewPrivate);
+	cal_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cal_shell_view, E_TYPE_CAL_SHELL_VIEW, ECalShellViewPrivate);
 
 	e_cal_shell_view_private_init (cal_shell_view, shell_view_class);
 }
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index 5c02cdd98a..488f300340 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -559,7 +559,9 @@ memo_shell_backend_class_init (EMemoShellBackendClass *class)
 static void
 memo_shell_backend_init (EMemoShellBackend *memo_shell_backend)
 {
-	memo_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_backend, E_TYPE_MEMO_SHELL_BACKEND, EMemoShellBackendPrivate);
+	memo_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		memo_shell_backend, E_TYPE_MEMO_SHELL_BACKEND,
+		EMemoShellBackendPrivate);
 }
 
 GType
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 37e96fe47a..bbf12de7db 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -655,7 +655,9 @@ memo_shell_content_class_init (EMemoShellContentClass *class)
 static void
 memo_shell_content_init (EMemoShellContent *memo_shell_content)
 {
-	memo_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_content, E_TYPE_MEMO_SHELL_CONTENT, EMemoShellContentPrivate);
+	memo_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		memo_shell_content, E_TYPE_MEMO_SHELL_CONTENT,
+		EMemoShellContentPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 4c9e2544ba..4ad5d44ded 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -741,7 +741,9 @@ memo_shell_sidebar_init (EMemoShellSidebar *memo_shell_sidebar)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) g_object_unref);
 
-	memo_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_sidebar, E_TYPE_MEMO_SHELL_SIDEBAR, EMemoShellSidebarPrivate);
+	memo_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		memo_shell_sidebar, E_TYPE_MEMO_SHELL_SIDEBAR,
+		EMemoShellSidebarPrivate);
 
 	memo_shell_sidebar->priv->client_table = client_table;
 
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index 4cef169ae8..d0986e7a17 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -302,7 +302,9 @@ static void
 memo_shell_view_init (EMemoShellView *memo_shell_view,
                       EShellViewClass *shell_view_class)
 {
-	memo_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_view, E_TYPE_MEMO_SHELL_VIEW, EMemoShellViewPrivate);
+	memo_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		memo_shell_view, E_TYPE_MEMO_SHELL_VIEW,
+		EMemoShellViewPrivate);
 
 	e_memo_shell_view_private_init (memo_shell_view, shell_view_class);
 }
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 9d85dc87b8..193f3bea23 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -564,7 +564,9 @@ task_shell_backend_class_init (ETaskShellBackendClass *class)
 static void
 task_shell_backend_init (ETaskShellBackend *task_shell_backend)
 {
-	task_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_backend, E_TYPE_TASK_SHELL_BACKEND, ETaskShellBackendPrivate);
+	task_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		task_shell_backend, E_TYPE_TASK_SHELL_BACKEND,
+		ETaskShellBackendPrivate);
 }
 
 GType
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 78680bc307..f2d10e4a4d 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -676,7 +676,9 @@ task_shell_content_class_init (ETaskShellContentClass *class)
 static void
 task_shell_content_init (ETaskShellContent *task_shell_content)
 {
-	task_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_content, E_TYPE_TASK_SHELL_CONTENT, ETaskShellContentPrivate);
+	task_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		task_shell_content, E_TYPE_TASK_SHELL_CONTENT,
+		ETaskShellContentPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 99df3b6ab5..f152acf976 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -741,7 +741,9 @@ task_shell_sidebar_init (ETaskShellSidebar *task_shell_sidebar)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) g_object_unref);
 
-	task_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_sidebar, E_TYPE_TASK_SHELL_SIDEBAR, ETaskShellSidebarPrivate);
+	task_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		task_shell_sidebar, E_TYPE_TASK_SHELL_SIDEBAR,
+		ETaskShellSidebarPrivate);
 
 	task_shell_sidebar->priv->client_table = client_table;
 
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index e4b5e03a5b..76410b3184 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -467,7 +467,9 @@ static void
 task_shell_view_init (ETaskShellView *task_shell_view,
                       EShellViewClass *shell_view_class)
 {
-	task_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_view, E_TYPE_TASK_SHELL_VIEW, ETaskShellViewPrivate);
+	task_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		task_shell_view, E_TYPE_TASK_SHELL_VIEW,
+		ETaskShellViewPrivate);
 
 	e_task_shell_view_private_init (task_shell_view, shell_view_class);
 }
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index 30155c9ed3..184ad23fdd 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -60,7 +60,10 @@ extension_set_state (EConnMan *extension, const gchar *state)
 }
 
 static void
-cm_connection_closed_cb (GDBusConnection *pconnection, gboolean remote_peer_vanished, GError *error, gpointer user_data)
+cm_connection_closed_cb (GDBusConnection *pconnection,
+                         gboolean remote_peer_vanished,
+                         GError *error,
+                         gpointer user_data)
 {
 	EConnMan *extension = user_data;
 
@@ -105,7 +108,8 @@ connman_check_initial_state (EConnMan *extension)
 
 	/* XXX Assuming this should be safe to call synchronously. */
 	response = g_dbus_connection_send_message_with_reply_sync (
-		extension->connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error);
+		extension->connection, message,
+		G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error);
 
 	if (response != NULL) {
 		gchar *state = NULL;
@@ -162,7 +166,9 @@ network_manager_connect (EConnMan *extension)
 		goto fail;
 	}
 
-	g_signal_connect (extension->connection, "closed", G_CALLBACK (cm_connection_closed_cb), extension);
+	g_signal_connect (
+		extension->connection, "closed",
+		G_CALLBACK (cm_connection_closed_cb), extension);
 
 	connman_check_initial_state (extension);
 
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 7f51274a5c..70ef327aaf 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -565,7 +565,9 @@ 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 = G_TYPE_INSTANCE_GET_PRIVATE (
+		handler, E_TYPE_MAIL_ATTACHMENT_HANDLER,
+		EMailAttachmentHandlerPrivate);
 }
 
 GType
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index 5ee982f27f..ac5919597b 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -298,7 +298,8 @@ mail_junk_hook_init (EMailJunkHook *mail_junk_hook)
 {
 	EMJunkInterface *interface;
 
-	mail_junk_hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_junk_hook, E_TYPE_MAIL_JUNK_HOOK, EMailJunkHookPrivate);
+	mail_junk_hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mail_junk_hook, E_TYPE_MAIL_JUNK_HOOK, EMailJunkHookPrivate);
 
 	interface = &mail_junk_hook->priv->interface;
 	interface->camel.get_name = mail_junk_hook_get_name;
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index d30dd2efda..af4af565f7 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -702,7 +702,9 @@ mail_shell_backend_class_init (EMailShellBackendClass *class)
 static void
 mail_shell_backend_init (EMailShellBackend *mail_shell_backend)
 {
-	mail_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_backend, E_TYPE_MAIL_SHELL_BACKEND, EMailShellBackendPrivate);
+	mail_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mail_shell_backend, E_TYPE_MAIL_SHELL_BACKEND,
+		EMailShellBackendPrivate);
 }
 
 GType
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index d367994086..c3b6cf978b 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -440,7 +440,9 @@ mail_shell_content_class_init (EMailShellContentClass *class)
 static void
 mail_shell_content_init (EMailShellContent *mail_shell_content)
 {
-	mail_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_content, E_TYPE_MAIL_SHELL_CONTENT, EMailShellContentPrivate);
+	mail_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mail_shell_content, E_TYPE_MAIL_SHELL_CONTENT,
+		EMailShellContentPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 5e5e515a9a..c910310010 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -332,7 +332,9 @@ mail_shell_sidebar_class_init (EMailShellSidebarClass *class)
 static void
 mail_shell_sidebar_init (EMailShellSidebar *mail_shell_sidebar)
 {
-	mail_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_sidebar, E_TYPE_MAIL_SHELL_SIDEBAR, EMailShellSidebarPrivate);
+	mail_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mail_shell_sidebar, E_TYPE_MAIL_SHELL_SIDEBAR,
+		EMailShellSidebarPrivate);
 
 	/* Postpone widget construction until we have a shell view. */
 }
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index c808ea3d7a..0c7feba0cf 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -1059,7 +1059,9 @@ static void
 mail_shell_view_init (EMailShellView *mail_shell_view,
                       EShellViewClass *shell_view_class)
 {
-	mail_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_view, E_TYPE_MAIL_SHELL_VIEW, EMailShellViewPrivate);
+	mail_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mail_shell_view, E_TYPE_MAIL_SHELL_VIEW,
+		EMailShellViewPrivate);
 
 	e_mail_shell_view_private_init (mail_shell_view, shell_view_class);
 }
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 378207c365..79d64eaf3e 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -360,7 +360,8 @@ em_account_prefs_init (EMAccountPrefs *prefs)
 	EAccountManager *manager;
 	EAccountTreeView *tree_view;
 
-	prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE (prefs, EM_TYPE_ACCOUNT_PREFS, EMAccountPrefsPrivate);
+	prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		prefs, EM_TYPE_ACCOUNT_PREFS, EMAccountPrefsPrivate);
 
 	manager = E_ACCOUNT_MANAGER (prefs);
 	tree_view = e_account_manager_get_tree_view (manager);
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index 8fc3fc02c1..d09cf1bb56 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -230,7 +230,8 @@ plugin_mono_init (EPluginMono *plugin_mono)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) NULL);
 
-	plugin_mono->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin_mono, E_TYPE_PLUGIN_MONO, EPluginMonoPrivate);
+	plugin_mono->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		plugin_mono, E_TYPE_PLUGIN_MONO, EPluginMonoPrivate);
 	plugin_mono->priv->methods = methods;
 }
 
diff --git a/modules/plugin-python/e-plugin-python.c b/modules/plugin-python/e-plugin-python.c
index 2cbee6512f..c4bb9e6c13 100644
--- a/modules/plugin-python/e-plugin-python.c
+++ b/modules/plugin-python/e-plugin-python.c
@@ -193,7 +193,8 @@ plugin_python_init (EPluginPython *plugin_python)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) NULL);
 
-	plugin_python->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin_python, E_TYPE_PLUGIN_PYTHON, EPluginPythonPrivate);
+	plugin_python->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		plugin_python, E_TYPE_PLUGIN_PYTHON, EPluginPythonPrivate);
 	plugin_python->priv->methods = methods;
 }
 
-- 
cgit v1.2.3