Whitespace and coding style cleanups.

3 files changed, 19 insertions, 11 deletions

diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 41d829b9e6..6874c2e304 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -809,8 +809,9 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
 		GSList *sources;
 		ESourceGroup *group = iter->data;
 
-		if (!group || !e_source_group_peek_base_uri (group)
-		    || g_ascii_strncasecmp (e_source_group_peek_base_uri (group), "local:", 6) != 0)
+		if (!group || !e_source_group_peek_base_uri (group) ||
+			g_ascii_strncasecmp (
+			e_source_group_peek_base_uri (group), "local:", 6) != 0)
 			continue;
 
 		if (!first_local) {
@@ -819,14 +820,16 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
 		}
 
 		/* merging respective sources */
-		for (sources = e_source_group_peek_sources (group); sources != NULL; sources = sources->next) {
+		for (sources = e_source_group_peek_sources (group);
+				sources != NULL; sources = sources->next) {
 			GSList *liter;
 			ESource *dupe_source = sources->data;
 
 			if (!dupe_source)
 				continue;
 
-			for (liter = e_source_group_peek_sources (first_local); liter != NULL; liter = liter->next) {
+			for (liter = e_source_group_peek_sources (first_local);
+					liter != NULL; liter = liter->next) {
 				ESource *my_source = liter->data;
 				const gchar *val1, *val2;
 
@@ -862,7 +865,8 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
 	if (first_local) {
 		GSList *sources;
 
-		for (sources = e_source_group_peek_sources (first_local); sources != NULL; sources = sources->next) {
+		for (sources = e_source_group_peek_sources (first_local);
+				sources != NULL; sources = sources->next) {
 			ESource *source = sources->data;
 			const gchar *relative_uri;
 
diff --git a/shell/es-event.c b/shell/es-event.c
index c260faebee..6fc6751d3a 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -220,8 +220,12 @@ es_event_hook_get_type (void)
 
 	if (!type) {
 		static const GTypeInfo info = {
-			sizeof (ESEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
-			sizeof (ESEventHook), 0, (GInstanceInitFunc) NULL,
+			sizeof (ESEventHookClass),
+			NULL, NULL,
+			(GClassInitFunc) emeh_class_init,
+			NULL, NULL,
+			sizeof (ESEventHook),
+			0, (GInstanceInitFunc) NULL
 		};
 
 		emeh_parent_class = g_type_class_ref (e_event_hook_get_type ());
diff --git a/shell/main.c b/shell/main.c
index 001d6bd843..62d19259aa 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -350,16 +350,16 @@ setup_quit_signal (void)
 
 static GOptionEntry entries[] = {
 #ifdef G_OS_WIN32
-	{ "register-handlers", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &register_handlers,
-	  NULL, NULL },
+	{ "register-handlers", '\0', G_OPTION_FLAG_HIDDEN,
+	  G_OPTION_ARG_NONE, &register_handlers, NULL, NULL },
 	{ "reinstall", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &reinstall,
 	  NULL, NULL },
 	{ "show-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_icons,
 	  NULL, NULL },
 	{ "hide-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &hide_icons,
 	  NULL, NULL },
-	{ "unregister-handlers", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unregister_handlers,
-	  NULL, NULL },
+	{ "unregister-handlers", '\0', G_OPTION_FLAG_HIDDEN,
+	  G_OPTION_ARG_NONE, &unregister_handlers, NULL, NULL },
 #endif /* G_OS_WIN32 */
 	{ "component", 'c', 0, G_OPTION_ARG_STRING, &requested_view,
 	/* Translators: Do NOT translate the five component