Coding style and whitespace cleanup.

40 files changed, 761 insertions, 641 deletions

diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index ce0de8d960..360deb9bb9 100644
--- a/modules/addressbook/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
@@ -451,8 +451,9 @@ book_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for address book");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for address book");
 	g_free (filename);
 
 	factory = gal_view_factory_etable_new (spec);
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index d03fb915d9..76c70eb5cc 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -62,7 +62,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_FORMATTER_EXTENSION,
 		e_mail_formatter_formatter_extension_interface_init));
 
-static const gchar* formatter_mime_types[] = { "application/vnd.evolution.widget.audio-inline",
+static const gchar * formatter_mime_types[] = { "application/vnd.evolution.widget.audio-inline",
 					       "audio/ac3", "audio/x-ac3",
 					       "audio/basic", "audio/mpeg",
 					       "audio/x-mpeg", "audio/mpeg3",
@@ -172,19 +172,19 @@ play_clicked (GtkWidget *button,
 {
 	GstState cur_state;
 
-	d(printf ("audio inline formatter: play\n"));
+	d (printf ("audio inline formatter: play\n"));
 
 	if (!part->filename) {
 		CamelStream *stream;
 		CamelDataWrapper *data;
 		GError *error = NULL;
 		gint argc = 1;
-		const gchar *argv [] = { "org_gnome_audio_inline", NULL };
+		const gchar *argv[] = { "org_gnome_audio_inline", NULL };
 
 		/* FIXME this is ugly, we should stream this directly to gstreamer */
 		part->filename = e_mktemp ("org-gnome-audio-inline-file-XXXXXX");
 
-		d(printf ("audio inline formatter: write to temp file %s\n", po->filename));
+		d (printf ("audio inline formatter: write to temp file %s\n", po->filename));
 
 		stream = camel_stream_fs_new_with_name (
 			part->filename, O_RDWR | O_CREAT | O_TRUNC, 0600, NULL);
@@ -193,7 +193,7 @@ play_clicked (GtkWidget *button,
 		camel_stream_flush (stream, NULL, NULL);
 		g_object_unref (stream);
 
-		d(printf ("audio inline formatter: init gst playbin\n"));
+		d (printf ("audio inline formatter: init gst playbin\n"));
 
 		if (gst_init_check (&argc, (gchar ***) &argv, &error)) {
 			gchar *uri;
@@ -291,13 +291,13 @@ emfe_audio_inline_get_widget (EMailFormatterExtension *extension,
 	box = gtk_hbutton_box_new ();
 	ai_part->play_button = g_object_ref (
 		add_button (box, GTK_STOCK_MEDIA_PLAY,
-			    G_CALLBACK (play_clicked), part, TRUE));
+		G_CALLBACK (play_clicked), part, TRUE));
 	ai_part->pause_button = g_object_ref (
 		add_button (box, GTK_STOCK_MEDIA_PAUSE,
-			    G_CALLBACK (pause_clicked), part, FALSE));
+		G_CALLBACK (pause_clicked), part, FALSE));
 	ai_part->stop_button = g_object_ref (
 		add_button (box, GTK_STOCK_MEDIA_STOP,
-			    G_CALLBACK (stop_clicked), part, FALSE));
+		G_CALLBACK (stop_clicked), part, FALSE));
 
 	gtk_widget_show (box);
 
diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c b/modules/audio-inline/e-mail-parser-audio-inline.c
index 95926bae29..5509306118 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -62,7 +62,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "audio/ac3", "audio/x-ac3",
+static const gchar * parser_mime_types[] = { "audio/ac3", "audio/x-ac3",
 					    "audio/basic", "audio/mpeg",
 					    "audio/x-mpeg", "audio/mpeg3",
 					    "audio/x-mpeg3", "audio/mp3",
@@ -114,7 +114,7 @@ empe_audio_inline_parse (EMailParserExtension *extension,
 	len = part_id->len;
 	g_string_append (part_id, ".org-gnome-audio-inline-button-panel");
 
-	d(printf ("audio inline formatter: format classid %s\n", part_id->str));
+	d (printf ("audio inline formatter: format classid %s\n", part_id->str));
 
 	mail_part = (EMailPartAudioInline *) e_mail_part_subclass_new (
 			part, part_id->str, sizeof (EMailPartAudioInline),
diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c
index fa1a6fd25e..7a997661e3 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -362,7 +362,7 @@ evolution_backup_restore_validate_backup_file (const gchar *filename)
 	quotedfname = g_shell_quote (filename);
 	toolfname = g_build_filename (basedir, "evolution-backup", NULL);
 
-	command =  g_strdup_printf("%s --check %s", toolfname, quotedfname);
+	command =  g_strdup_printf ("%s --check %s", toolfname, quotedfname);
 	result = system (command);
 
 	g_free (command);
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 974dd293c3..9f46d90626 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -868,7 +868,7 @@ main (gint argc,
 				res_file = g_strdup ((gchar *) opt_remaining[ii]);
 				file = res_file;
 			} else if (check_op) {
-				d(g_message ("Checking %s", (gchar *) opt_remaining[ii]));
+				d (g_message ("Checking %s", (gchar *) opt_remaining[ii]));
 				chk_file = g_strdup ((gchar *) opt_remaining[ii]);
 			}
 		}
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 203142ace4..933fa6f774 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -214,7 +214,7 @@ bogofilter_command (const gchar **argv,
 		g_set_error_literal (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
 			_("Bogofilter either crashed or "
-			  "failed to process a mail message"));
+			"failed to process a mail message"));
 
 	return source_data.exit_code;
 }
diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c
index 5387fe16c4..d5a4e2ca8d 100644
--- a/modules/cal-config-weather/evolution-cal-config-weather.c
+++ b/modules/cal-config-weather/evolution-cal-config-weather.c
@@ -118,7 +118,7 @@ cal_config_weather_string_to_location (GBinding *binding,
 
 	match = start = gweather_location_find_by_station_code (world, code);
 	while (match) {
-		char *cmp_city_name;
+		gchar *cmp_city_name;
 
 		/* Does the city name match? */
 		cmp_city_name = gweather_location_get_city_name (match);
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index f5a04d7d2f..f72e765b3b 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -321,8 +321,8 @@ action_calendar_purge_cb (GtkAction *action,
 		GTK_MESSAGE_WARNING,
 		GTK_BUTTONS_OK_CANCEL,
 		_("This operation will permanently erase all events older "
-		  "than the selected amount of time. If you continue, you "
-		  "will not be able to recover these events."));
+		"than the selected amount of time. If you continue, you "
+		"will not be able to recover these events."));
 
 	gtk_dialog_set_default_response (
 		GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 721a8c9ba0..2b5aa7e4f5 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -360,7 +360,7 @@ cal_shell_view_taskpad_popup_event_cb (EShellView *shell_view,
 
 static void
 cal_shell_view_user_created_cb (ECalShellView *cal_shell_view,
-				ECalClient *where_was_created,
+                                ECalClient *where_was_created,
                                 ECalendarView *calendar_view)
 {
 	ECalShellSidebar *cal_shell_sidebar;
@@ -389,8 +389,9 @@ cal_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for calendars");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for calendars");
 	g_free (filename);
 
 	factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);
@@ -506,9 +507,8 @@ init_timezone_monitors (ECalShellView *view)
 		GFile *file;
 
 		file = g_file_new_for_path (files_to_check[i]);
-		priv->monitors[i] = g_file_monitor_file (file,
-				G_FILE_MONITOR_NONE,
-				NULL, NULL);
+		priv->monitors[i] = g_file_monitor_file (
+			file, G_FILE_MONITOR_NONE, NULL, NULL);
 		g_object_unref (file);
 
 		if (priv->monitors[i])
@@ -1203,8 +1203,7 @@ cal_time_t_ptr_compare (gconstpointer a,
 
 static void cal_iterate_searching (ECalShellView *cal_shell_view);
 
-struct GenerateInstancesData
-{
+struct GenerateInstancesData {
 	ECalClient *client;
 	ECalShellView *cal_shell_view;
 	GCancellable *cancellable;
@@ -1222,7 +1221,9 @@ cal_searching_instances_done_cb (gpointer user_data)
 		gid->cal_shell_view->priv->search_pending_count--;
 		if (!gid->cal_shell_view->priv->search_pending_count) {
 			gid->cal_shell_view->priv->search_hit_cache =
-				g_slist_sort (gid->cal_shell_view->priv->search_hit_cache, cal_time_t_ptr_compare);
+				g_slist_sort (
+					gid->cal_shell_view->priv->search_hit_cache,
+					cal_time_t_ptr_compare);
 			cal_iterate_searching (gid->cal_shell_view);
 		}
 	}
@@ -1303,7 +1304,9 @@ cal_search_get_object_list_cb (GObject *source,
 		cal_shell_view->priv->search_pending_count--;
 		if (!cal_shell_view->priv->search_pending_count) {
 			cal_shell_view->priv->search_hit_cache =
-				g_slist_sort (cal_shell_view->priv->search_hit_cache, cal_time_t_ptr_compare);
+				g_slist_sort (
+					cal_shell_view->priv->search_hit_cache,
+					cal_time_t_ptr_compare);
 			cal_iterate_searching (cal_shell_view);
 		}
 	} else {
@@ -1311,8 +1314,11 @@ cal_search_get_object_list_cb (GObject *source,
 		GCancellable *cancellable;
 		time_t start, end;
 
-		cancellable = e_activity_get_cancellable (cal_shell_view->priv->searching_activity);
-		start = time_add_day (cal_shell_view->priv->search_time, (-1) * cal_shell_view->priv->search_direction);
+		cancellable = e_activity_get_cancellable (
+			cal_shell_view->priv->searching_activity);
+		start = time_add_day (
+			cal_shell_view->priv->search_time,
+			(-1) * cal_shell_view->priv->search_direction);
 		end = cal_shell_view->priv->search_time;
 		if (start > end) {
 			time_t tmp = start;
@@ -1322,14 +1328,17 @@ cal_search_get_object_list_cb (GObject *source,
 
 		for (iter = icalcomps; iter; iter = iter->next) {
 			icalcomponent *icalcomp = iter->data;
-			struct GenerateInstancesData *gid = g_new0 (struct GenerateInstancesData, 1);
+			struct GenerateInstancesData *gid;
 
+			gid = g_new0 (struct GenerateInstancesData, 1);
 			gid->client = client;
 			gid->cal_shell_view = cal_shell_view;
 			gid->cancellable = g_object_ref (cancellable);
 
-			e_cal_client_generate_instances_for_object (client, icalcomp, start, end, cancellable,
-				cal_searching_got_instance_cb, gid, cal_searching_instances_done_cb);
+			e_cal_client_generate_instances_for_object (
+				client, icalcomp, start, end, cancellable,
+				cal_searching_got_instance_cb, gid,
+				cal_searching_instances_done_cb);
 		}
 
 		e_cal_client_free_icalcomp_slist (icalcomps);
@@ -1394,7 +1403,9 @@ cal_searching_update_alert (ECalShellView *cal_shell_view,
 	priv = cal_shell_view->priv;
 
 	if (priv->search_alert) {
-		e_alert_response (priv->search_alert, e_alert_get_default_response (priv->search_alert));
+		e_alert_response (
+			priv->search_alert,
+			e_alert_get_default_response (priv->search_alert));
 		priv->search_alert = NULL;
 	}
 
@@ -1408,8 +1419,10 @@ cal_searching_update_alert (ECalShellView *cal_shell_view,
 	g_object_add_weak_pointer (G_OBJECT (alert), &priv->search_alert);
 	e_alert_start_timer (priv->search_alert, 5);
 
-	shell_content = e_shell_view_get_shell_content (E_SHELL_VIEW (cal_shell_view));
-	e_alert_sink_submit_alert (E_ALERT_SINK (shell_content), priv->search_alert);
+	shell_content = e_shell_view_get_shell_content (
+		E_SHELL_VIEW (cal_shell_view));
+	e_alert_sink_submit_alert (
+		E_ALERT_SINK (shell_content), priv->search_alert);
 	g_object_unref (priv->search_alert);
 }
 
@@ -1436,7 +1449,9 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
 
 	if (cal_searching_check_candidates (cal_shell_view)) {
 		if (priv->searching_activity) {
-			e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+			e_activity_set_state (
+				priv->searching_activity,
+				E_ACTIVITY_COMPLETED);
 			g_object_unref (priv->searching_activity);
 			priv->searching_activity = NULL;
 		}
@@ -1445,18 +1460,25 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
 	}
 
 	if (!priv->searching_activity) {
-		EShellBackend *shell_backend = e_shell_view_get_shell_backend (E_SHELL_VIEW (cal_shell_view));
+		EShellBackend *shell_backend;
+
+		shell_backend = e_shell_view_get_shell_backend (
+			E_SHELL_VIEW (cal_shell_view));
 
 		cancellable = g_cancellable_new ();
 		priv->searching_activity = e_activity_new ();
-		e_activity_set_cancellable (priv->searching_activity, cancellable);
-		e_activity_set_state (priv->searching_activity, E_ACTIVITY_RUNNING);
-		e_activity_set_text (priv->searching_activity,
+		e_activity_set_cancellable (
+			priv->searching_activity, cancellable);
+		e_activity_set_state (
+			priv->searching_activity, E_ACTIVITY_RUNNING);
+		e_activity_set_text (
+			priv->searching_activity,
 			priv->search_direction > 0 ?
 			_("Searching next matching event") :
 			_("Searching previous matching event"));
 
-		e_shell_backend_add_activity (shell_backend, priv->searching_activity);
+		e_shell_backend_add_activity (
+			shell_backend, priv->searching_activity);
 	}
 
 	new_time = time_add_day (priv->search_time, priv->search_direction);
@@ -1465,19 +1487,22 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
 		gint range_years;
 
 		/* would get out of bounds, stop searching */
-		e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+		e_activity_set_state (
+			priv->searching_activity, E_ACTIVITY_COMPLETED);
 		g_object_unref (priv->searching_activity);
 		priv->searching_activity = NULL;
 
 		range_years = cal_searching_get_search_range_years (cal_shell_view);
 		alert_msg = g_strdup_printf (
 			priv->search_direction > 0 ?
-			ngettext ("Cannot find matching event in the next %d year",
-				  "Cannot find matching event in the next %d years",
-				  range_years) :
-			ngettext ("Cannot find matching event in the previous %d year",
-				  "Cannot find matching event in the previous %d years",
-				  range_years),
+			ngettext (
+			"Cannot find matching event in the next %d year",
+			"Cannot find matching event in the next %d years",
+			range_years) :
+			ngettext (
+			"Cannot find matching event in the previous %d year",
+			"Cannot find matching event in the previous %d years",
+			range_years),
 			range_years);
 		cal_searching_update_alert (cal_shell_view, alert_msg);
 		g_free (alert_msg);
@@ -1488,15 +1513,19 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
 	}
 
 	model = gnome_calendar_get_model (
-		e_cal_shell_content_get_calendar (cal_shell_view->priv->cal_shell_content));
+		e_cal_shell_content_get_calendar (
+		cal_shell_view->priv->cal_shell_content));
 	clients = e_cal_model_get_client_list (model);
 
 	if (!clients) {
-		e_activity_set_state (priv->searching_activity, E_ACTIVITY_COMPLETED);
+		e_activity_set_state (
+			priv->searching_activity, E_ACTIVITY_COMPLETED);
 		g_object_unref (priv->searching_activity);
 		priv->searching_activity = NULL;
 
-		cal_searching_update_alert (cal_shell_view, _("Cannot search with no active calendar"));
+		cal_searching_update_alert (
+			cal_shell_view,
+			_("Cannot search with no active calendar"));
 
 		e_shell_view_update_actions (E_SHELL_VIEW (cal_shell_view));
 
@@ -1536,7 +1565,9 @@ cal_iterate_searching (ECalShellView *cal_shell_view)
 	for (iter = clients; iter; iter = iter->next) {
 		ECalClient *client = iter->data;
 
-		e_cal_client_get_object_list (client, sexp, cancellable, cal_search_get_object_list_cb, cal_shell_view);
+		e_cal_client_get_object_list (
+			client, sexp, cancellable,
+			cal_search_get_object_list_cb, cal_shell_view);
 	}
 
 	g_list_free_full (clients, g_object_unref);
@@ -1573,7 +1604,8 @@ e_cal_shell_view_search_events (ECalShellView *cal_shell_view,
 		time_t cached_start, cached_end, tmp;
 
 		cached_start = priv->search_time;
-		cached_end = time_add_day (cached_start, (-1) * priv->search_direction);
+		cached_end = time_add_day (
+			cached_start, (-1) * priv->search_direction);
 
 		if (priv->search_direction > 0) {
 			tmp = cached_start;
@@ -1621,8 +1653,10 @@ e_cal_shell_view_search_stop (ECalShellView *cal_shell_view)
 	cal_searching_update_alert (cal_shell_view, NULL);
 
 	if (priv->searching_activity) {
-		g_cancellable_cancel (e_activity_get_cancellable (priv->searching_activity));
-		e_activity_set_state (priv->searching_activity, E_ACTIVITY_CANCELLED);
+		g_cancellable_cancel (
+			e_activity_get_cancellable (priv->searching_activity));
+		e_activity_set_state (
+			priv->searching_activity, E_ACTIVITY_CANCELLED);
 		g_object_unref (priv->searching_activity);
 		priv->searching_activity = NULL;
 	}
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index ef8b6c5e60..afa30c3da8 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -75,7 +75,8 @@ cal_shell_view_add_action_button (GtkBox *box,
 		button, "tooltip-text",
 		G_BINDING_SYNC_CREATE);
 
-	g_signal_connect_swapped (button, "clicked",
+	g_signal_connect_swapped (
+		button, "clicked",
 		G_CALLBACK (gtk_action_activate), action);
 }
 
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index a1655fa324..b11a943957 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -273,8 +273,9 @@ day_second_zone_clicked (GtkWidget *widget,
 
 	gtk_widget_show_all (menu);
 
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-			0, gtk_get_current_event_time ());
+	gtk_menu_popup (
+		GTK_MENU (menu), NULL, NULL, NULL, NULL,
+		0, gtk_get_current_event_time ());
 }
 
 static void
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index f87c91ff79..5e7c7552cc 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -115,8 +115,9 @@ memo_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for memos");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for memos");
 	g_free (filename);
 
 	factory = gal_view_factory_etable_new (spec);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index f9a36c69f5..b77317a1dd 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -183,8 +183,9 @@ task_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for tasks");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for tasks");
 	g_free (filename);
 
 	factory = gal_view_factory_etable_new (spec);
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index c129c89150..3b761276a1 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -58,7 +58,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_FORMATTER_EXTENSION,
 		e_mail_formatter_formatter_extension_interface_init));
 
-static const gchar* formatter_mime_types[] = { "text/calendar" , NULL };
+static const gchar * formatter_mime_types[] = { "text/calendar" , NULL };
 
 static gboolean
 emfe_itip_format (EMailFormatterExtension *extension,
@@ -105,15 +105,17 @@ emfe_itip_format (EMailFormatterExtension *extension,
 		itip_part->uid = g_strdup (context->message_uid);
 		itip_part->msg = g_object_ref (context->message);
 
-		uri = e_mail_part_build_uri (context->folder, context->message_uid,
+		uri = e_mail_part_build_uri (
+			context->folder, context->message_uid,
 			"part_id", G_TYPE_STRING, part->id,
 			"mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW,
 			NULL);
 
 		buffer = g_string_sized_new (256);
-		g_string_append_printf (buffer,
+		g_string_append_printf (
+			buffer,
 			"<div class=\"part-container\" "
-			     "style=\"border: none; background: none;\">"
+			"style=\"border: none; background: none;\">"
 			"<iframe width=\"100%%\" height=\"auto\""
 			" frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>"
 			"</div>",
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 53630b5a88..6c740ada75 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -68,7 +68,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "text/calendar", NULL };
+static const gchar * parser_mime_types[] = { "text/calendar", NULL };
 
 static void
 mail_part_itip_free (EMailPart *mail_part)
@@ -169,8 +169,8 @@ bind_itip_view (EMailPart *part,
 		G_OBJECT (element), "view", view,
 		(GDestroyNotify) g_object_unref);
 
-	itip_view_create_dom_bindings (view,
-		webkit_dom_document_get_document_element (document));
+	itip_view_create_dom_bindings (
+		view, webkit_dom_document_get_document_element (document));
 
 	itip_view_init_view (view);
 	g_string_free (buffer, TRUE);
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index bbbd57569e..5c8279aa8a 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -760,7 +760,7 @@ button_clicked_cb (WebKitDOMElement *element,
 
 	response = atoi (responseStr);
 
-	//d(printf("Clicked btton %d\n", response));
+	//d (printf ("Clicked btton %d\n", response));
 	g_signal_emit (G_OBJECT (data), signals[RESPONSE], 0, response);
 }
 
@@ -830,7 +830,7 @@ source_changed_cb (WebKitDOMElement *select,
 
 	source = itip_view_ref_source (view);
 
-	d(printf("Source changed to '%s'\n", e_source_get_display_name (source)));
+	d (printf ("Source changed to '%s'\n", e_source_get_display_name (source)));
 	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
 
 	g_object_unref (source);
@@ -868,7 +868,8 @@ append_text_table_row (GString *buffer,
 {
 	if (label && *label) {
 
-		g_string_append_printf (buffer,
+		g_string_append_printf (
+			buffer,
 			"<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n",
 			id, (value && *value) ? "" : "hidden=\"\"", label, value);
 
@@ -945,7 +946,7 @@ append_info_item_row (ItipView *view,
 
 	webkit_dom_html_element_set_inner_html (cell, item->message, NULL);
 
-	d(printf("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
+	d (printf ("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
 }
 
 static void
@@ -966,7 +967,7 @@ remove_info_item_row (ItipView *view,
 		WEBKIT_DOM_NODE (row),
 		NULL);
 
-	d(printf("Removed row %s_row_%d\n", table_id, id));
+	d (printf ("Removed row %s_row_%d\n", table_id, id));
 }
 
 static void
@@ -997,11 +998,12 @@ buttons_table_write_button (GString *buffer,
 static void
 append_buttons_table (GString *buffer)
 {
-	g_string_append (buffer,
-			 "<table class=\"itip buttons\" border=\"0\" "
-				"id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
-				"cellpadding=\"0\" >"
-			 "<tr id=\"" TABLE_ROW_BUTTONS "\">");
+	g_string_append (
+		buffer,
+		"<table class=\"itip buttons\" border=\"0\" "
+		"id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
+		"cellpadding=\"0\" >"
+		"<tr id=\"" TABLE_ROW_BUTTONS "\">");
 
         /* Everything gets the open button */
 	buttons_table_write_button (
@@ -1047,7 +1049,7 @@ itip_view_rebuild_source_list (ItipView *view)
 	const gchar *extension_name;
 	GHashTable *groups;
 
-	d(printf("Assigning a new source list!\n"));
+	d (printf ("Assigning a new source list!\n"));
 
 	if (!view->priv->dom_document)
 		return;
@@ -1262,7 +1264,7 @@ itip_view_finalize (GObject *object)
 
 	priv = ITIP_VIEW_GET_PRIVATE (object);
 
-	d(printf("Itip view finalized!\n"));
+	d (printf ("Itip view finalized!\n"));
 
 	g_clear_object (&priv->dom_document);
 	g_free (priv->extension_name);
@@ -1425,30 +1427,34 @@ itip_view_set_extension_name (ItipView *view,
 
 void
 itip_view_write (EMailFormatter *formatter,
-		 GString *buffer)
+                 GString *buffer)
 {
 	gchar *header = e_mail_formatter_get_html_header (formatter);
 	g_string_append (buffer, header);
 	g_free (header);
 
-	g_string_append_printf (buffer,
+	g_string_append_printf (
+		buffer,
 		"<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
 			MEETING_ICON, GTK_ICON_SIZE_BUTTON);
 
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n");
 
         /* The first section listing the sender */
         /* FIXME What to do if the send and organizer do not match */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n");
 
 	g_string_append (buffer, "<hr>\n");
 
         /* Elementary event information */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<table class=\"itip table\" border=\"0\" "
-		       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"cellspacing=\"5\" cellpadding=\"0\">\n");
 
 	append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL);
 	append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL);
@@ -1460,26 +1466,31 @@ itip_view_write (EMailFormatter *formatter,
 	g_string_append (buffer, "</table>\n");
 
 	/* Upper Info items */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" "
-		       "cellspacing=\"5\" cellpadding=\"0\">");
+		"cellspacing=\"5\" cellpadding=\"0\">");
 
         /* Description */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n");
 
 	g_string_append (buffer, "<hr>\n");
 
 	/* Lower Info items */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" "
-		       "cellspacing=\"5\" cellpadding=\"0\">");
+		"cellspacing=\"5\" cellpadding=\"0\">");
 
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<table class=\"itip table\" border=\"0\" "
-		       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"cellspacing=\"5\" cellpadding=\"0\">\n");
 
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">"
 		"<th><label id=\"" TABLE_ROW_ESCB_LABEL "\" for=\"" SELECT_ESOURCE "\"></label></th>"
 		"<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>"
@@ -1489,12 +1500,13 @@ itip_view_write (EMailFormatter *formatter,
 	append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender"));
 
         /* Comments */
-	g_string_append_printf (buffer,
+	g_string_append_printf (
+		buffer,
 		"<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">"
 		"<th>%s</th>"
 		"<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" "
-			      "id=\"" TEXTAREA_RSVP_COMMENT "\" "
-			      "rows=\"3\" cols=\"40\" disabled=\"\">"
+		"id=\"" TEXTAREA_RSVP_COMMENT "\" "
+		"rows=\"3\" cols=\"40\" disabled=\"\">"
 		"</textarea></td>\n"
 		"</tr>\n",
 		_("Comment:"));
@@ -1530,21 +1542,24 @@ itip_view_write_for_printing (ItipView *view,
 		return;
 	}
 
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n");
 
         /* The first section listing the sender */
         /* FIXME What to do if the send and organizer do not match */
-	g_string_append_printf (buffer,
+	g_string_append_printf (
+		buffer,
 		"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n",
 		view->priv->sender ? view->priv->sender : "");
 
 	g_string_append (buffer, "<hr>\n");
 
         /* Elementary event information */
-	g_string_append (buffer,
+	g_string_append (
+		buffer,
 		"<table class=\"itip table\" border=\"0\" "
-		       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"cellspacing=\"5\" cellpadding=\"0\">\n");
 
 	append_text_table_row (
 		buffer, TABLE_ROW_SUMMARY,
@@ -1571,7 +1586,7 @@ itip_view_write_for_printing (ItipView *view,
 	g_string_append_printf (
 		buffer,
 		"<div id=\"" TABLE_ROW_DESCRIPTION "\" "
-		     "class=\"itip description\" %s>%s</div>\n",
+		"class=\"itip description\" %s>%s</div>\n",
 		view->priv->description ? "" : "hidden=\"\"", view->priv->description);
 
 	g_string_append (buffer, "</div>");
@@ -2467,7 +2482,7 @@ itip_view_set_source (ItipView *view,
 
 	g_return_if_fail (ITIP_IS_VIEW (view));
 
-	d(printf("Settings default source '%s'\n", e_source_get_display_name (source)));
+	d (printf ("Settings default source '%s'\n", e_source_get_display_name (source)));
 
 	if (!view->priv->dom_document)
 		return;
@@ -2784,7 +2799,7 @@ itip_view_set_buttons_sensitive (ItipView *view,
 
 	g_return_if_fail (ITIP_IS_VIEW (view));
 
-	d(printf("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
+	d (printf ("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
 
 	view->priv->buttons_sensitive = sensitive;
 
@@ -3054,7 +3069,8 @@ itip_view_set_error (ItipView *view,
 	str = g_string_new (error_html);
 
 	if (show_save_btn) {
-		g_string_append (str,
+		g_string_append (
+			str,
 			"<table border=\"0\" width=\"100%\">"
 			"<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">");
 
@@ -3570,7 +3586,8 @@ start_calendar_server (EMailPartItip *pitip,
 		return;
 	}
 
-	e_client_utils_open_new (source,
+	e_client_utils_open_new (
+		source,
 		type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? E_CLIENT_SOURCE_TYPE_EVENTS :
 		type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS ? E_CLIENT_SOURCE_TYPE_MEMOS :
 		type == E_CAL_CLIENT_SOURCE_TYPE_TASKS ? E_CLIENT_SOURCE_TYPE_TASKS : E_CLIENT_SOURCE_TYPE_LAST,
@@ -3630,8 +3647,11 @@ find_cal_update_ui (FormatItipFindData *fd,
 	source = cal_client ? e_client_get_source (E_CLIENT (cal_client)) : NULL;
 
 	if (cal_client && g_hash_table_lookup (fd->conflicts, cal_client)) {
-		itip_view_add_upper_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
-						      _("An appointment in the calendar '%s' conflicts with this meeting"), e_source_get_display_name (source));
+		itip_view_add_upper_info_item_printf (
+			view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+			_("An appointment in the calendar "
+			"'%s' conflicts with this meeting"),
+			e_source_get_display_name (source));
 	}
 
 	/* search for a master object if the detached object doesn't exist in the calendar */
@@ -3654,7 +3674,8 @@ find_cal_update_ui (FormatItipFindData *fd,
 		pitip->progress_info_id = 0;
 
 		/* FIXME Check read only state of calendar? */
-		itip_view_add_lower_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+		itip_view_add_lower_info_item_printf (
+			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 			_("Found the appointment in the calendar '%s'"), e_source_get_display_name (source));
 
 		set_buttons_sensitive (pitip, view);
@@ -3689,7 +3710,7 @@ decrease_find_data (FormatItipFindData *fd)
 	g_return_if_fail (fd != NULL);
 
 	fd->count--;
-	d(printf ("Decreasing itip formatter search count to %d\n", fd->count));
+	d (printf ("Decreasing itip formatter search count to %d\n", fd->count));
 
 	if (fd->count == 0 && !g_cancellable_is_cancelled (fd->cancellable)) {
 		gboolean rsvp_enabled = FALSE;
@@ -3741,7 +3762,7 @@ decrease_find_data (FormatItipFindData *fd)
 			itip_view_set_extension_name (view, extension_name);
 
 			g_signal_connect (
- 				view, "source_selected",
+				view, "source_selected",
 				G_CALLBACK (source_selected_cb), pitip);
 
 			if (source != NULL) {
@@ -4108,12 +4129,12 @@ find_server (EMailPartItip *pitip,
 
 		pitip->progress_info_id = itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
- 			_("Opening the calendar. Please wait..."));
+			_("Opening the calendar. Please wait..."));
 	} else {
 		link = list;
 		pitip->progress_info_id = itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
- 			_("Searching for an existing version of this appointment"));
+			_("Searching for an existing version of this appointment"));
 	}
 
 	for (; link != NULL; link = g_list_next (link)) {
@@ -4136,15 +4157,20 @@ find_server (EMailPartItip *pitip,
 				start = isodate_from_time_t (pitip->start_time);
 				end = isodate_from_time_t (pitip->end_time);
 
-				fd->sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") (make-time \"%s\")) (not (uid? \"%s\")))",
-						start, end, icalcomponent_get_uid (pitip->ical_comp));
+				fd->sexp = g_strdup_printf (
+					"(and (occur-in-time-range? "
+					"(make-time \"%s\") "
+					"(make-time \"%s\")) "
+					"(not (uid? \"%s\")))",
+					start, end,
+					icalcomponent_get_uid (pitip->ical_comp));
 			}
 
 			g_free (start);
 			g_free (end);
 		}
 		fd->count++;
-		d(printf ("Increasing itip formatter search count to %d\n", fd->count));
+		d (printf ("Increasing itip formatter search count to %d\n", fd->count));
 
 		if (current_source == source)
 			start_calendar_server (
@@ -4585,8 +4611,10 @@ update_item (EMailPartItip *pitip,
 	clone_comp = e_cal_component_new ();
 	if (!e_cal_component_set_icalcomponent (clone_comp, clone)) {
 		update_item_progress_info (pitip, view, NULL);
-		pitip->update_item_error_info_id = itip_view_add_lower_info_item (view,
-			ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to parse item"));
+		pitip->update_item_error_info_id =
+			itip_view_add_lower_info_item (
+				view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+				_("Unable to parse item"));
 		goto cleanup;
 	}
 
@@ -4600,7 +4628,8 @@ update_item (EMailPartItip *pitip,
 			alarms = e_cal_component_get_alarm_uids (real_comp);
 
 			for (l = alarms; l; l = l->next) {
-				alarm = e_cal_component_get_alarm (real_comp, (const gchar *) l->data);
+				alarm = e_cal_component_get_alarm (
+					real_comp, (const gchar *) l->data);
 
 				if (alarm) {
 					ECalComponentAlarm *aclone = e_cal_component_alarm_clone (alarm);
@@ -4786,7 +4815,7 @@ remove_delegate (EMailPartItip *pitip,
 		send_comp_to_attendee (
 			pitip->registry,
 			E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp,
-			 delegator, pitip->current_client, comment);
+			delegator, pitip->current_client, comment);
 	if (status) {
 		itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
@@ -4841,16 +4870,16 @@ modify_object_cb (GObject *ecalclient,
 		update_item_progress_info (pitip, view, NULL);
 		pitip->update_item_error_info_id =
 			itip_view_add_lower_info_item_printf (
-				view,
-				ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
+				view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
 				_("Unable to update attendee. %s"),
 				error ? error->message : _("Unknown error"));
 
 		g_clear_error (&error);
 	} else {
 		update_item_progress_info (pitip, view, NULL);
-		itip_view_add_lower_info_item (view,
-			ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Attendee status updated"));
+		itip_view_add_lower_info_item (
+			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+			_("Attendee status updated"));
 	}
 }
 
@@ -4890,10 +4919,11 @@ update_attendee_status_icalcomp (EMailPartItip *pitip,
 			if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) {
 				gint response;
 				delegate = icalproperty_get_attendee (del_prop);
-				response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell),
-									"org.gnome.itip-formatter:add-delegate",
-									itip_strip_mailto (a->value),
-									itip_strip_mailto (delegate), NULL);
+				response = e_alert_run_dialog_for_args (
+					e_shell_get_active_window (shell),
+					"org.gnome.itip-formatter:add-delegate",
+					itip_strip_mailto (a->value),
+					itip_strip_mailto (delegate), NULL);
 				if (response == GTK_RESPONSE_YES) {
 					icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop));
 					e_cal_component_rescan (comp);
@@ -4909,21 +4939,23 @@ update_attendee_status_icalcomp (EMailPartItip *pitip,
 				gint response;
 
 				if (a->delfrom && *a->delfrom) {
-					response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell),
-										"org.gnome.itip-formatter:add-delegate",
-										itip_strip_mailto (a->delfrom),
-										itip_strip_mailto (a->value), NULL);
+					response = e_alert_run_dialog_for_args (
+						e_shell_get_active_window (shell),
+						"org.gnome.itip-formatter:add-delegate",
+						itip_strip_mailto (a->delfrom),
+						itip_strip_mailto (a->value), NULL);
 					if (response == GTK_RESPONSE_YES) {
 						/* Already declared in this function */
 						icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
 						icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop));
 						e_cal_component_rescan (comp);
 					} else if (response == GTK_RESPONSE_NO) {
-						remove_delegate (pitip,
-								 view,
-								 itip_strip_mailto (a->value),
-								 itip_strip_mailto (a->delfrom),
-								 comp);
+						remove_delegate (
+							pitip,
+							view,
+							itip_strip_mailto (a->value),
+							itip_strip_mailto (a->delfrom),
+							comp);
 						goto cleanup;
 					} else {
 						goto cleanup;
@@ -5273,7 +5305,8 @@ extract_itip_data (EMailPartItip *pitip,
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	if (!pitip->vcalendar) {
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The calendar attached is not valid"),
 			_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
 			FALSE);
@@ -5285,7 +5318,8 @@ extract_itip_data (EMailPartItip *pitip,
 
 	pitip->main_comp = icalparser_parse_string (pitip->vcalendar);
 	if (pitip->main_comp == NULL || !is_icalcomp_valid (pitip->main_comp)) {
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The calendar attached is not valid"),
 			_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
 			FALSE);
@@ -5327,7 +5361,8 @@ extract_itip_data (EMailPartItip *pitip,
 	}
 
 	if (pitip->ical_comp == NULL) {
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The item in the calendar is not valid"),
 			_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
 			FALSE);
@@ -5356,7 +5391,8 @@ extract_itip_data (EMailPartItip *pitip,
 		pitip->type = E_CAL_CLIENT_SOURCE_TYPE_MEMOS;
 		break;
 	default:
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The item in the calendar is not valid"),
 			_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
 			FALSE);
@@ -5371,7 +5407,8 @@ extract_itip_data (EMailPartItip *pitip,
 
 	if (pitip->total > 1) {
 
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The calendar attached contains multiple items"),
 			_("To process all of these items, the file should be saved and the calendar imported"),
 			TRUE);
@@ -5454,7 +5491,8 @@ extract_itip_data (EMailPartItip *pitip,
 		g_object_unref (pitip->comp);
 		pitip->comp = NULL;
 
-		set_itip_error (view,
+		set_itip_error (
+			view,
 			_("The item in the calendar is not valid"),
 			_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"),
 			FALSE);
@@ -5797,10 +5835,11 @@ itip_view_init_view (ItipView *view)
                                  * we show the "accept/tentative/decline" choice.
                                  * Otherwise only show "accept".
                                  */
-				itip_view_set_mode (view,
-						    info->has_organizer ?
-						    ITIP_VIEW_MODE_REQUEST :
-						    ITIP_VIEW_MODE_PUBLISH);
+				itip_view_set_mode (
+					view,
+					info->has_organizer ?
+					ITIP_VIEW_MODE_REQUEST :
+					ITIP_VIEW_MODE_PUBLISH);
 				break;
 			case ICAL_METHOD_REPLY:
 				itip_view_set_mode (view, ITIP_VIEW_MODE_REPLY);
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 2099511d62..2e9946d47f 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -57,7 +57,8 @@ fix_color_string (gchar *color_string)
 	if (!gdk_color_parse (color_string, &color))
 		return;
 
-	sprintf (color_string, "#%02x%02x%02x",
+	sprintf (
+		color_string, "#%02x%02x%02x",
 		(gint) color.red * 256 / 65536,
 		(gint) color.green * 256 / 65536,
 		(gint) color.blue * 256 / 65536);
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 7472a50f35..7db1b13b86 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -923,7 +923,6 @@ mail_labels_get_filter_options (gboolean include_none)
 	return g_slist_reverse (list);
 }
 
-
 GSList *
 e_mail_labels_get_filter_options (void)
 {
@@ -938,7 +937,7 @@ e_mail_labels_get_filter_options_without_none (void)
 
 static const gchar *
 get_filter_option_value (EFilterPart *part,
-			 const gchar *name)
+                         const gchar *name)
 {
 	EFilterElement *elem;
 	EFilterOption *opt;
@@ -956,7 +955,7 @@ get_filter_option_value (EFilterPart *part,
 
 static void
 append_one_label_expr (GString *out,
-		       const gchar *versus)
+                       const gchar *versus)
 {
 	GString *encoded;
 
@@ -966,7 +965,8 @@ append_one_label_expr (GString *out,
 	encoded = g_string_new ("");
 	camel_sexp_encode_string (encoded, versus);
 
-	g_string_append_printf (out,
+	g_string_append_printf (
+		out,
 		" (= (user-tag \"label\") %s) (user-flag (+ \"$Label\" %s)) (user-flag %s)",
 		encoded->str, encoded->str, encoded->str);
 
@@ -975,8 +975,8 @@ append_one_label_expr (GString *out,
 
 void
 e_mail_labels_get_filter_code (EFilterElement *element,
-			       GString *out,
-			       EFilterPart *part)
+                               GString *out,
+                               EFilterPart *part)
 {
 	const gchar *label_type, *versus;
 	gboolean is_not;
@@ -1013,7 +1013,7 @@ e_mail_labels_get_filter_code (EFilterElement *element,
 		GtkTreeModel *model;
 		GtkTreeIter iter;
 		gboolean valid;
-		
+
 		shell = e_shell_get_default ();
 		shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
@@ -1072,7 +1072,8 @@ message_parsed_cb (GObject *source_object,
 	soup_session = webkit_get_default_session ();
 	mails = g_object_get_data (G_OBJECT (soup_session), "mails");
 	if (!mails) {
-		mails = g_hash_table_new_full (g_str_hash, g_str_equal,
+		mails = g_hash_table_new_full (
+			g_str_hash, g_str_equal,
 			(GDestroyNotify) g_free, NULL);
 		g_object_set_data (
 			G_OBJECT (soup_session), "mails", mails);
@@ -1099,8 +1100,9 @@ mbox_create_preview_cb (GObject *preview,
 	g_return_if_fail (preview_widget != NULL);
 
 	display = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
-	g_object_set_data_full (preview, "mbox-imp-display",
-				g_object_ref (display), g_object_unref);
+	g_object_set_data_full (
+		preview, "mbox-imp-display",
+		g_object_ref (display), g_object_unref);
 
 	*preview_widget = GTK_WIDGET (display);
 }
@@ -1126,7 +1128,8 @@ mbox_fill_preview_cb (GObject *preview,
 	mail_session = e_mail_session_new (registry);
 
 	parser = e_mail_parser_new (CAMEL_SESSION (mail_session));
-	e_mail_parser_parse (parser, NULL, msg->message_id, msg,
+	e_mail_parser_parse (
+		parser, NULL, msg->message_id, msg,
 		message_parsed_cb, NULL, preview);
 
 	g_object_unref (mail_session);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 48f9d74471..123352b181 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -973,7 +973,8 @@ action_mail_smart_backward_cb (GtkAction *action,
 
 	} else {
 
-		gtk_adjustment_set_value (adj,
+		gtk_adjustment_set_value (
+			adj,
 			value - gtk_adjustment_get_page_increment (adj));
 
 		return;
@@ -1059,7 +1060,8 @@ action_mail_smart_forward_cb (GtkAction *action,
 
 	} else {
 
-		gtk_adjustment_set_value (adj,
+		gtk_adjustment_set_value (
+			adj,
 			value + gtk_adjustment_get_page_increment (adj));
 
 		return;
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index e3d7247224..f51f8f1005 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -488,8 +488,9 @@ mail_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for mail");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for mail");
 	g_free (filename);
 
 	factory = gal_view_factory_etable_new (spec);
@@ -1068,8 +1069,8 @@ typedef struct {
 
 static gboolean
 send_receive_can_use_service (EMailAccountStore *account_store,
-			      CamelService *service,
-			      GtkTreeIter *piter)
+                              CamelService *service,
+                              GtkTreeIter *piter)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1089,7 +1090,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
 		do {
 			adept = NULL;
 
-			gtk_tree_model_get (model, &iter,
+			gtk_tree_model_get (
+				model, &iter,
 				E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &adept,
 				-1);
 
@@ -1107,7 +1109,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
 	if (!found)
 		return FALSE;
 
-	gtk_tree_model_get (model, &iter,
+	gtk_tree_model_get (
+		model, &iter,
 		E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED, &enabled,
 		E_MAIL_ACCOUNT_STORE_COLUMN_BUILTIN, &builtin,
 		-1);
@@ -1180,16 +1183,16 @@ send_receive_add_to_menu (SendReceiveData *data,
 
 static void
 send_receive_gather_services (gpointer menu_item,
-			      gpointer service,
-			      gpointer queue)
+                              gpointer service,
+                              gpointer queue)
 {
 	g_queue_push_head (queue, service);
 }
 
 static gint
 sort_services_cb (gconstpointer service1,
-		  gconstpointer service2,
-		  gpointer account_store)
+                  gconstpointer service2,
+                  gpointer account_store)
 {
 	return e_mail_account_store_compare_services (account_store, CAMEL_SERVICE (service1), CAMEL_SERVICE (service2));
 }
@@ -1363,7 +1366,8 @@ create_send_receive_submenu (EMailShellView *mail_shell_view)
 		do {
 			service = NULL;
 
-			gtk_tree_model_get (model, &iter,
+			gtk_tree_model_get (
+				model, &iter,
 				E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &service,
 				-1);
 
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index ebbbcef65f..801362d331 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -46,9 +46,9 @@ static const gchar *SEARCH_RESULTS_STATE =
 
 static void
 add_folders_from_store (GList **folders,
-			CamelStore *store,
-			GCancellable *cancellable,
-			GError **error)
+                        CamelStore *store,
+                        GCancellable *cancellable,
+                        GError **error)
 {
 	CamelFolderInfo *root, *fi;
 
@@ -771,7 +771,8 @@ has_unread_mail (GtkTreeModel *model,
 	if (is_root) {
 		gboolean is_store = FALSE, is_draft = FALSE;
 
-		gtk_tree_model_get (model, parent,
+		gtk_tree_model_get (
+			model, parent,
 			COL_UINT_UNREAD, &unread,
 			COL_BOOL_IS_STORE, &is_store,
 			COL_BOOL_IS_DRAFT, &is_draft,
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 58700f26b1..3a092efe49 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -348,7 +348,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	 *
 	 * The mail composer preferences settings page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emcp_items); i++)
 		l = g_slist_prepend (l, &emcp_items[i]);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 1877e28624..4720470c2a 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -242,7 +242,7 @@ jh_add_cb (GtkWidget *widget,
 		tok = g_strdup_printf ("%s=%s", name, value);
 		g_ptr_array_add (array, tok);
 		g_ptr_array_add (array, NULL);
-		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
 
 		g_ptr_array_free (array, TRUE);
 		g_strfreev (strv);
@@ -290,7 +290,7 @@ jh_remove_cb (GtkWidget *widget,
 
 		g_ptr_array_add (array, NULL);
 
-		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
 
 		g_strfreev (strv);
 		g_ptr_array_free (array, TRUE);
@@ -337,9 +337,10 @@ emmp_header_remove_sensitivity (EMMailerPrefs *prefs)
 	 * disabled
 	*/
 	if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
+			-1);
 		if (is_default)
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->remove_header), FALSE);
 		else
@@ -384,9 +385,10 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs)
 	while (valid) {
 		gchar *header_name;
 
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_HEADER_COLUMN, &header_name,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_HEADER_COLUMN, &header_name,
+			-1);
 		if (g_ascii_strcasecmp (header_name, entry_contents) == 0) {
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->add_header), FALSE);
 			g_free (header_name);
@@ -418,10 +420,11 @@ emmp_save_headers (EMMailerPrefs *prefs)
 
 		h.name = NULL;
 
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_HEADER_COLUMN, &h.name,
-				    HEADER_LIST_ENABLED_COLUMN, &enabled,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_HEADER_COLUMN, &h.name,
+			HEADER_LIST_ENABLED_COLUMN, &enabled,
+			-1);
 		h.enabled = enabled;
 
 		if ((xml = e_mail_reader_header_to_xml (&h)))
@@ -450,10 +453,13 @@ emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell,
 	gint enabled;
 
 	gtk_tree_model_get_iter (model, &iter, path);
-	gtk_tree_model_get (model, &iter, HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
+	gtk_tree_model_get (
+		model, &iter,
+		HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
 	enabled = !enabled;
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, HEADER_LIST_ENABLED_COLUMN,
-			    enabled, -1);
+	gtk_list_store_set (
+		GTK_LIST_STORE (model), &iter,
+		HEADER_LIST_ENABLED_COLUMN, enabled, -1);
 	gtk_tree_path_free (path);
 
 	emmp_save_headers (prefs);
@@ -471,12 +477,13 @@ emmp_header_add_header (GtkWidget *widget,
 
 	if (text && (strlen (text) > 0)) {
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				HEADER_LIST_NAME_COLUMN, text,
-				HEADER_LIST_ENABLED_COLUMN, TRUE,
-				HEADER_LIST_HEADER_COLUMN, text,
-				HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
-				-1);
+		gtk_list_store_set (
+			GTK_LIST_STORE (model), &iter,
+			HEADER_LIST_NAME_COLUMN, text,
+			HEADER_LIST_ENABLED_COLUMN, TRUE,
+			HEADER_LIST_HEADER_COLUMN, text,
+			HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
+			-1);
 		gtk_entry_set_text (prefs->entry_header, "");
 		emmp_header_remove_sensitivity (prefs);
 		emmp_header_add_sensitivity (prefs);
@@ -491,9 +498,11 @@ emmp_header_remove_header (GtkWidget *button,
 {
 	EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
 	GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store);
-	GtkTreeSelection *selection = gtk_tree_view_get_selection (prefs->header_list);
+	GtkTreeSelection *selection;
 	GtkTreeIter iter;
 
+	selection = gtk_tree_view_get_selection (prefs->header_list);
+
 	if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
 		return;
 
@@ -528,7 +537,9 @@ toggle_button_toggled (GtkToggleButton *toggle,
 	const gchar *key;
 
 	key = g_object_get_data ((GObject *) toggle, "key");
-	g_settings_set_boolean (prefs->settings, key, gtk_toggle_button_get_active (toggle));
+	g_settings_set_boolean (
+		prefs->settings, key,
+		gtk_toggle_button_get_active (toggle));
 }
 
 static void
@@ -536,7 +547,9 @@ junk_book_lookup_button_toggled (GtkToggleButton *toggle,
                                  EMMailerPrefs *prefs)
 {
 	toggle_button_toggled (toggle, prefs);
-	gtk_widget_set_sensitive (GTK_WIDGET (prefs->junk_lookup_local_only), gtk_toggle_button_get_active (toggle));
+	gtk_widget_set_sensitive (
+		GTK_WIDGET (prefs->junk_lookup_local_only),
+		gtk_toggle_button_get_active (toggle));
 }
 
 static void
@@ -614,7 +627,8 @@ emmp_empty_trash_init (EMMailerPrefs *prefs,
 			hist = ii;
 
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
+		gtk_list_store_set (
+			store, &iter,
 			0,  gettext (empty_trash_frequency[ii].label),
 			-1);
 	}
@@ -662,7 +676,8 @@ emmp_empty_junk_init (EMMailerPrefs *prefs,
 			hist = ii;
 
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
+		gtk_list_store_set (
+			store, &iter,
 			0, gettext (empty_trash_frequency[ii].label),
 			-1);
 	}
@@ -771,7 +786,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	 *
 	 * The main mail preferences page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emmp_items); i++)
 		l = g_slist_prepend (l, &emmp_items[i]);
@@ -1043,15 +1058,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	g_signal_connect (
 		renderer, "toggled",
 		G_CALLBACK (emmp_header_list_enabled_toggled), prefs);
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
-						     "Enabled", renderer,
-						     "active", HEADER_LIST_ENABLED_COLUMN,
-						     NULL);
+	gtk_tree_view_insert_column_with_attributes (
+		GTK_TREE_VIEW (prefs->header_list), -1,
+		"Enabled", renderer,
+		"active", HEADER_LIST_ENABLED_COLUMN,
+		NULL);
 	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
-						     "Name", renderer,
-						     "text", HEADER_LIST_NAME_COLUMN,
-						     NULL);
+	gtk_tree_view_insert_column_with_attributes (
+		GTK_TREE_VIEW (prefs->header_list), -1,
+		"Name", renderer,
+		"text", HEADER_LIST_NAME_COLUMN,
+		NULL);
 
 	/* populated the listview with entries; firstly we add all the default headers, and then
 	 * we add read header configuration out of settings. If a header in settings is a default header,
@@ -1065,7 +1082,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		h = g_malloc (sizeof (EMailReaderHeader));
 		h->is_default = TRUE;
 		h->name = g_strdup (default_headers[i]);
-		h->enabled = strcmp ((gchar *)default_headers[i], "x-evolution-mailer") != 0;
+		h->enabled = strcmp ((gchar *) default_headers[i], "x-evolution-mailer") != 0;
 		g_hash_table_insert (default_header_hash, (gpointer) default_headers[i], h);
 		header_add_list = g_slist_append (header_add_list, h);
 	}
@@ -1106,12 +1123,13 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 			name = _(h->name);
 
 		gtk_list_store_append (prefs->header_list_store, &iter);
-		gtk_list_store_set (prefs->header_list_store, &iter,
-				    HEADER_LIST_NAME_COLUMN, name,
-				    HEADER_LIST_ENABLED_COLUMN, h->enabled,
-				    HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
-				    HEADER_LIST_HEADER_COLUMN, h->name,
-				    -1);
+		gtk_list_store_set (
+			prefs->header_list_store, &iter,
+			HEADER_LIST_NAME_COLUMN, name,
+			HEADER_LIST_ENABLED_COLUMN, h->enabled,
+			HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
+			HEADER_LIST_HEADER_COLUMN, h->name,
+			-1);
 
 		e_mail_reader_header_free (h);
 		p = p->next;
@@ -1159,12 +1177,12 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	widget = e_builder_get_widget (prefs->builder, "junk-module-options");
 	e_mail_junk_options_set_session (E_MAIL_JUNK_OPTIONS (widget), session);
 
-	prefs->junk_header_check = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_header_check");
-	prefs->junk_header_tree = (GtkTreeView *)e_builder_get_widget (prefs->builder, "junk_header_tree");
-	prefs->junk_header_add = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_add");
-	prefs->junk_header_remove = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_remove");
-	prefs->junk_book_lookup = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "lookup_book");
-	prefs->junk_lookup_local_only = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
+	prefs->junk_header_check = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_header_check");
+	prefs->junk_header_tree = (GtkTreeView *) e_builder_get_widget (prefs->builder, "junk_header_tree");
+	prefs->junk_header_add = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_add");
+	prefs->junk_header_remove = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_remove");
+	prefs->junk_book_lookup = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "lookup_book");
+	prefs->junk_lookup_local_only = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
 	toggle_button_init (
 		prefs, prefs->junk_book_lookup,
 		FALSE, "junk-lookup-addressbook",
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 3a7b335191..b43c8a169f 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -119,7 +119,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
 #if 0
 	if (type == NETWORK_PROXY_AUTOCONFIG) {
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
-		d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
+		d (g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
 	} else
 #endif
 	if (type == NETWORK_PROXY_MANUAL) {
@@ -147,7 +147,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_user, state);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_pwd, state);
 
-		d(g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
+		d (g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
 	}
 }
 
@@ -211,11 +211,11 @@ widget_entry_changed_cb (GtkWidget *widget,
 	if (GTK_IS_SPIN_BUTTON (widget)) {
 		port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
 		g_settings_set_int (proxy_settings, key, port);
-		d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
+		d (g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
 	} else if (GTK_IS_ENTRY (widget)) {
 		value = gtk_entry_get_text (GTK_ENTRY (widget));
 		g_settings_set_string (proxy_settings, key, value);
-		d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
+		d (g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
 	}
 }
 
@@ -331,7 +331,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	 *
 	 * The network preferences settings page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emnp_items); i++)
 		l = g_slist_prepend (l, &emnp_items[i]);
@@ -353,14 +353,14 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->sys_proxy, FALSE);
 
-	d(g_print ("Sys settings ----!!! \n"));
+	d (g_print ("Sys settings ----!!! \n"));
 
 	prefs->no_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoNoProxy"));
 	gtk_toggle_button_set_active (prefs->no_proxy, val == NETWORK_PROXY_DIRECT_CONNECTION);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->no_proxy, FALSE);
 
-	d(g_print ("No proxy settings ----!!! \n"));
+	d (g_print ("No proxy settings ----!!! \n"));
 
 	/* no auto-proxy at the moment */
 #if 0
@@ -377,7 +377,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE);
 #endif
 
-	d(g_print ("Auto config settings ----!!! \n"));
+	d (g_print ("Auto config settings ----!!! \n"));
 
 	prefs->manual_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoManualProxy"));
 	prefs->http_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpHost"));
@@ -466,7 +466,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->manual_proxy, FALSE);
-	d(g_print ("Manual settings ----!!! \n"));
+	d (g_print ("Manual settings ----!!! \n"));
 
 	buf = g_settings_get_string (prefs->proxy_settings, "http-host");
 	gtk_entry_set_text (prefs->http_host, buf ? buf : "");
diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c
index df07b9a7ac..1d8ad23e70 100644
--- a/modules/online-accounts/camel-sasl-xoauth.c
+++ b/modules/online-accounts/camel-sasl-xoauth.c
@@ -415,8 +415,8 @@ sasl_xoauth_challenge_sync (CamelSasl *sasl,
 			error, CAMEL_SERVICE_ERROR,
 			CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
 			_("Cannot find a corresponding account in "
-			  "the org.gnome.OnlineAccounts service from "
-			  "which to obtain an authentication token."));
+			"the org.gnome.OnlineAccounts service from "
+			"which to obtain an authentication token."));
 		g_object_unref (goa_client);
 		return NULL;
 	}
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index 82c8be58fc..f80ddd20e6 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -153,9 +153,10 @@ plugin_lib_construct (EPlugin *plugin,
 #ifdef G_OS_WIN32
 	{
 		gchar *mapped_location =
-			e_util_replace_prefix (EVOLUTION_PREFIX,
-					       e_util_get_prefix (),
-					       plugin_lib->location);
+			e_util_replace_prefix (
+				EVOLUTION_PREFIX,
+				e_util_get_prefix (),
+				plugin_lib->location);
 		g_free (plugin_lib->location);
 		plugin_lib->location = mapped_location;
 	}
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 482f3368fe..39bc9b9ea3 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -98,7 +98,7 @@ static void
 eppm_set_label (GtkLabel *l,
                 const gchar *v)
 {
-	gtk_label_set_label(l, v?v:_("Unknown"));
+	gtk_label_set_label (l, v ? v:_("Unknown"));
 }
 
 static void
diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index 889885cecc..58969a6b19 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -90,10 +90,9 @@ static const gchar *ui_reader =
 "  </popup>"
 "</ui>";
 
-
 static void
 toggle_part (GtkAction *action,
-	     EMailDisplayPopupExtension *extension)
+             EMailDisplayPopupExtension *extension)
 {
 	EMailDisplayPopupPreferPlain *pp_extension = (EMailDisplayPopupPreferPlain *) extension;
 	WebKitDOMDocument *doc = pp_extension->document;
@@ -108,14 +107,16 @@ toggle_part (GtkAction *action,
 	g_free (uri);
 
 	query = soup_form_decode (soup_uri->query);
-	g_hash_table_replace (query, g_strdup ("part_id"),
+	g_hash_table_replace (
+		query, g_strdup ("part_id"),
 		pp_extension->text_html_id ?
 			pp_extension->text_html_id :
 			pp_extension->text_plain_id);
-	g_hash_table_replace (query, g_strdup ("mime_type"),
-			pp_extension->text_html_id ?
-					(gpointer) "text/html" :
-					(gpointer) "text/plain");
+	g_hash_table_replace (
+		query, g_strdup ("mime_type"),
+		pp_extension->text_html_id ?
+			(gpointer) "text/html" :
+			(gpointer) "text/plain");
 
 	soup_uri_set_query_from_form (soup_uri, query);
 	g_hash_table_destroy (query);
@@ -151,11 +152,11 @@ GtkActionEntry entries[] = {
 	}
 };
 
-const gint ID_LEN = G_N_ELEMENTS(".alternative-prefer-plain.");
+const gint ID_LEN = G_N_ELEMENTS (".alternative-prefer-plain.");
 
 static void
 set_text_plain_id (EMailDisplayPopupPreferPlain *extension,
-		   const gchar *id)
+                   const gchar *id)
 {
 	g_free (extension->text_plain_id);
 	extension->text_plain_id = g_strdup (id);
@@ -163,14 +164,13 @@ set_text_plain_id (EMailDisplayPopupPreferPlain *extension,
 
 static void
 set_text_html_id (EMailDisplayPopupPreferPlain *extension,
-		  const gchar *id)
+                  const gchar *id)
 {
 	g_free (extension->text_html_id);
 	extension->text_html_id = g_strdup (id);
 }
 
-
-static GtkActionGroup*
+static GtkActionGroup *
 create_group (EMailDisplayPopupExtension *extension)
 {
 	EExtensible *extensible;
@@ -192,14 +192,15 @@ create_group (EMailDisplayPopupExtension *extension)
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui_webview, -1, NULL);
 
 	action = gtk_action_group_get_action (group, "show-plain-text-part");
-	g_signal_connect (action, "activate",
+	g_signal_connect (
+		action, "activate",
 		G_CALLBACK (toggle_part), extension);
 
 	action = gtk_action_group_get_action (group, "show-text-html-part");
-	g_signal_connect (action, "activate",
+	g_signal_connect (
+		action, "activate",
 		G_CALLBACK (toggle_part), extension);
 
-
 	shell = e_shell_get_default ();
 	shell_window = e_shell_get_active_window (shell);
 	if (E_IS_SHELL_WINDOW (shell_window)) {
@@ -218,7 +219,7 @@ create_group (EMailDisplayPopupExtension *extension)
 
 static void
 mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *extension,
-						WebKitHitTestResult *context)
+                                                WebKitHitTestResult *context)
 {
 	EMailDisplay *display;
 	GtkAction *action;
@@ -413,7 +414,6 @@ e_mail_display_popup_prefer_plain_class_finalize (EMailDisplayPopupPreferPlainCl
 
 }
 
-
 static void
 e_mail_display_popup_prefer_plain_init (EMailDisplayPopupPreferPlain *extension)
 {
diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c
index b5f8db2365..5237831675 100644
--- a/modules/prefer-plain/e-mail-parser-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c
@@ -69,7 +69,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/alternative",
+static const gchar * parser_mime_types[] = { "multipart/alternative",
 					    "text/html",
 					    NULL };
 
@@ -202,7 +202,8 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
 
 		/* Enforcing text/plain, but wants HTML as attachment */
 		if (emp_pp->show_suppressed) {
-			return make_part_attachment (parser, part, part_id,
+			return make_part_attachment (
+				parser, part, part_id,
 				FALSE, cancellable);
 		}
 
@@ -317,7 +318,7 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
 				parser, sp, part_id, cancellable);
 		parts = g_slist_concat (
 				parts,
-			  	e_mail_parser_wrap_as_attachment (
+				e_mail_parser_wrap_as_attachment (
 					parser, sp, sparts, part_id,
 					cancellable));
 	}
@@ -329,7 +330,6 @@ empe_prefer_plain_parse (EMailParserExtension *extension,
 
 	parts = g_slist_concat (parts, plain_text_parts);
 
-
 	g_string_truncate (part_id, partidlen);
 
 	return parts;
diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c
index 29b81a60fe..411ef24dbd 100644
--- a/modules/prefer-plain/plugin/config-ui.c
+++ b/modules/prefer-plain/plugin/config-ui.c
@@ -120,7 +120,7 @@ prefer_plain_page_factory (EPlugin *epl,
 	}
 
 	gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE);
-	gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL);
+	gtk_cell_layout_set_attributes ((GtkCellLayout *) dropdown, cell, "text", 0, NULL);
 	gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store);
 	/*gtk_combo_box_set_active(dropdown, -1);*/
 	gtk_combo_box_set_active (dropdown, epp_mode);
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 3166220dea..98c7dfad8e 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -315,7 +315,7 @@ spam_assassin_command_full (const gchar **argv,
 		g_set_error_literal (
 			error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
 			_("SpamAssassin either crashed or "
-			  "failed to process a mail message"));
+			"failed to process a mail message"));
 
 	return source_data.exit_code;
 }
diff --git a/modules/startup-wizard/e-startup-assistant.c b/modules/startup-wizard/e-startup-assistant.c
index f29ed692ef..86d6de17b5 100644
--- a/modules/startup-wizard/e-startup-assistant.c
+++ b/modules/startup-wizard/e-startup-assistant.c
@@ -152,8 +152,8 @@ startup_assistant_constructed (GObject *object)
 		e_mail_config_welcome_page_set_text (
 			E_MAIL_CONFIG_WELCOME_PAGE (nth_page),
 			_("Welcome to Evolution.\n\nThe next few screens will "
-			  "allow Evolution to connect to your email accounts, "
-			  "and to import files from other applications."));
+			"allow Evolution to connect to your email accounts, "
+			"and to import files from other applications."));
 	}
 }
 
diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index 18476c17bc..bd5d82a690 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -46,7 +46,7 @@ typedef struct _EMailDisplayPopupTextHighlightClass {
 
 #define E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), e_mail_display_popup_text_highlight_get_type(), EMailDisplayPopupTextHighlight))
+	((obj), e_mail_display_popup_text_highlight_get_type (), EMailDisplayPopupTextHighlight))
 
 GType e_mail_display_popup_text_highlight_get_type (void);
 static void e_mail_display_popup_extension_interface_init (EMailDisplayPopupExtensionInterface *iface);
@@ -109,8 +109,8 @@ static GtkActionEntry entries[] = {
 
 static void
 reformat (GtkAction *old,
-	  GtkAction *action,
-	  gpointer user_data)
+          GtkAction *action,
+          gpointer user_data)
 {
 	EMailDisplayPopupTextHighlight *th_extension;
 	WebKitDOMDocument *doc;
@@ -120,7 +120,6 @@ reformat (GtkAction *old,
 	GHashTable *query;
 	gchar *uri;
 
-
 	th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (user_data);
 	doc = th_extension->document;
 	if (!doc)
@@ -163,7 +162,7 @@ exit:
 	th_extension->document = NULL;
 }
 
-static GtkActionGroup*
+static GtkActionGroup *
 create_group (EMailDisplayPopupExtension *extension)
 {
 	EExtensible *extensible;
@@ -217,7 +216,8 @@ create_group (EMailDisplayPopupExtension *extension)
 				NULL, NULL, action_index);
 		action_index++;
 		gtk_action_group_add_action (group, GTK_ACTION (action));
-		g_signal_connect (action, "changed",
+		g_signal_connect (
+			action, "changed",
 			G_CALLBACK (reformat), extension);
 		gtk_radio_action_set_group (action, radio_group);
 		radio_group = gtk_radio_action_get_group (action);
@@ -226,15 +226,15 @@ create_group (EMailDisplayPopupExtension *extension)
 
 		gtk_ui_manager_add_ui (
 			ui_manager, merge_id,
-			 "/context/custom-actions-2/format-as-menu/format-as-actions",
+			"/context/custom-actions-2/format-as-menu/format-as-actions",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 
 		gtk_ui_manager_add_ui (
 			shell_ui_manager, shell_merge_id,
 			"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-actions",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 	}
 
 	languages = get_additinal_languages (&len);
@@ -247,7 +247,8 @@ create_group (EMailDisplayPopupExtension *extension)
 				NULL, NULL, action_index);
 		action_index++;
 		gtk_action_group_add_action (group, GTK_ACTION (action));
-		g_signal_connect (action, "changed",
+		g_signal_connect (
+			action, "changed",
 			G_CALLBACK (reformat), extension);
 
 		gtk_radio_action_set_group (action, radio_group);
@@ -257,15 +258,15 @@ create_group (EMailDisplayPopupExtension *extension)
 
 		gtk_ui_manager_add_ui (
 			ui_manager, merge_id,
-			 "/context/custom-actions-2/format-as-menu/format-as-other-menu",
+			"/context/custom-actions-2/format-as-menu/format-as-other-menu",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 
 		gtk_ui_manager_add_ui (
 			shell_ui_manager, shell_merge_id,
 			"/mail-preview-popup/mail-preview-popup-actions/format-as-menu/format-as-other-menu",
 			languages[i].action_name, languages[i].action_name,
-			 GTK_UI_MANAGER_AUTO, FALSE);
+			GTK_UI_MANAGER_AUTO, FALSE);
 	}
 
 	return group;
@@ -273,7 +274,7 @@ create_group (EMailDisplayPopupExtension *extension)
 
 static void
 update_actions (EMailDisplayPopupExtension *extension,
-		WebKitHitTestResult *context)
+                WebKitHitTestResult *context)
 {
 	EMailDisplayPopupTextHighlight *th_extension;
 	WebKitDOMNode *node;
@@ -283,7 +284,7 @@ update_actions (EMailDisplayPopupExtension *extension,
 	th_extension = E_MAIL_DISPLAY_POPUP_TEXT_HIGHLIGHT (extension);
 
 	if (th_extension->action_group == NULL) {
-		th_extension->action_group = create_group(extension);
+		th_extension->action_group = create_group (extension);
 	}
 
 	th_extension->document = NULL;
@@ -291,7 +292,6 @@ update_actions (EMailDisplayPopupExtension *extension,
 	document = webkit_dom_node_get_owner_document (node);
 	uri = webkit_dom_document_get_document_uri (document);
 
-
 	/* If the part below context menu was made by text-highlight formatter,
 	 * then try to check what formatter it's using at the moment and set
 	 * it as active in the popup menu */
@@ -326,7 +326,7 @@ update_actions (EMailDisplayPopupExtension *extension,
 		}
 
 	} else {
-		gtk_action_group_set_visible(
+		gtk_action_group_set_visible (
 			th_extension->action_group, FALSE);
 	}
 
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 643e54b7f4..b9ce34dc6b 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -82,7 +82,7 @@ get_default_font (void)
 
 static gchar *
 get_syntax (EMailPart *part,
-	    const gchar *uri)
+            const gchar *uri)
 {
 	gchar *syntax = NULL;
 	CamelContentType *ct = NULL;
@@ -152,7 +152,6 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
 			return FALSE;
 	}
 
-
 	if (context->mode == E_MAIL_FORMATTER_MODE_PRINTING) {
 
 		CamelDataWrapper *dw;
@@ -245,10 +244,12 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
 			g_free (font);
 		}
 
-		font_family = g_strdup_printf ("--font='%s'",
-				pango_font_description_get_family (fd));
-		font_size = g_strdup_printf ("--font-size=%d",
-				pango_font_description_get_size (fd) / PANGO_SCALE);
+		font_family = g_strdup_printf (
+			"--font='%s'",
+			pango_font_description_get_family (fd));
+		font_size = g_strdup_printf (
+			"--font-size=%d",
+			pango_font_description_get_size (fd) / PANGO_SCALE);
 
 		argv[1] = font_family;
 		argv[2] = font_size;
diff --git a/modules/text-highlight/e-mail-parser-text-highlight.c b/modules/text-highlight/e-mail-parser-text-highlight.c
index 328e590f6d..69aa1ccff2 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -60,10 +60,10 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 
 static GSList *
 empe_text_highlight_parse (EMailParserExtension *extension,
-			   EMailParser *parser,
-			   CamelMimePart *part,
-			   GString *part_id,
-			   GCancellable *cancellable)
+                           EMailParser *parser,
+                           CamelMimePart *part,
+                           GString *part_id,
+                           GCancellable *cancellable)
 {
 	GSList *parts;
 	gint len;
diff --git a/modules/text-highlight/languages.c b/modules/text-highlight/languages.c
index 957b0aded9..7875cd6e1d 100644
--- a/modules/text-highlight/languages.c
+++ b/modules/text-highlight/languages.c
@@ -30,21 +30,21 @@ G_LOCK_DEFINE_STATIC (mime_types);
 static Language languages[] = {
 
 	{ "txt", N_("_Plain text"),
-	  (const gchar* []) { (gchar[]) { "text" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/plain" },
+	  (const gchar *[]) { (gchar[]) { "text" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/plain" },
 			      (gchar[]) { "text/*" }, NULL }
 	},
 
 	{ "assembler", N_("_Assembler"),
-	  (const gchar* []) { (gchar[]) { "asm" } , NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-asm" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "asm" } , NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-asm" }, NULL }
 	},
 
 	{ "sh", N_("_Bash"),
-	  (const gchar* []) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
+	  (const gchar *[]) { (gchar[]) { "bash" }, (gchar[]) { "sh" },
 			      (gchar[]) { "ebuild" },  (gchar[])  {"eclass" },
 			      NULL },
-	  (const gchar* []) { (gchar[]) { "application/x-bsh" },
+	  (const gchar *[]) { (gchar[]) { "application/x-bsh" },
 			      (gchar[]) { "application/x-sh" },
 			      (gchar[]) { "application/x-shar" },
 			      (gchar[]) { "application/x-shellscript" },
@@ -52,112 +52,112 @@ static Language languages[] = {
 	},
 
 	{ "c", N_("_C/C++"),
-	  (const gchar* []) { (gchar[]) { "c" }, (gchar[]) { "c++" },
+	  (const gchar *[]) { (gchar[]) { "c" }, (gchar[]) { "c++" },
 			      (gchar[]) { "cc" }, (gchar[]) { "cpp" },
 			      (gchar[]) { "cu" }, (gchar[]) { "cxx" },
 			      (gchar[]) { "h" }, (gchar[]) { "hh" },
 			      (gchar[]) { "hpp" }, (gchar[]) { "hxx" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-c" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-c" }, NULL }
 	},
 
 	{ "csharp", N_("_C#"),
-	  (const gchar* []) { (gchar[]) { "cs" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-csharp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "cs" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-csharp" }, NULL }
 	},
 
 	{ "css", N_("_Cascade Style Sheet"),
-	  (const gchar* []) { (gchar[]) { "css" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/css" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "css" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/css" }, NULL }
 	},
 
 	{ "html", N_("_HTML"),
-	  (const gchar* []) { (gchar[]) { "html" }, (gchar[]) { "html" },
+	  (const gchar *[]) { (gchar[]) { "html" }, (gchar[]) { "html" },
 			      (gchar[]) { "xhtml" }, (gchar[]) { "dhtml" }, NULL },
-	  (const gchar* []) { NULL } /* Don't register text-highlight as formatter
-	  				or parser of text/html as it would break
-	  				all text/html emails. */
+	  (const gchar *[]) { NULL } /* Don't register text-highlight as formatter
+					or parser of text / html as it would break
+					all text / html emails. */
 	},
 
 	{ "java", N_("_Java"),
-	  (const gchar* []) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
+	  (const gchar *[]) { (gchar[]) { "java" }, (gchar[]) { "groovy" },
 			      (gchar[]) { "grv" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/java-source" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/java-source" }, NULL }
 	},
 
 	{ "js", N_("_JavaScript"),
-	  (const gchar* []) { (gchar[]) { "js" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/javascript" },
+	  (const gchar *[]) { (gchar[]) { "js" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/javascript" },
 			      (gchar[]) { "application/x-javascript" }, NULL }
 	},
 
 	{ "diff", N_("_Patch/diff"),
-	  (const gchar* []) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-diff" },
-	  		      (gchar[]) { "text/x-patch" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "diff" }, (gchar[]) { "patch" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-diff" },
+			      (gchar[]) { "text/x-patch" }, NULL }
 	},
 
 	{ "perl", N_("_Perl"),
-	  (const gchar* []) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
+	  (const gchar *[]) { (gchar[]) { "perl" }, (gchar[]) { "cgi"},
 			      (gchar[]) { "perl" }, (gchar[]) { "pl" },
 			      (gchar[]) { "plex" }, (gchar[]) { "plx" },
 			      (gchar[]) { "pm" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-script.perl" },
+	  (const gchar *[]) { (gchar[]) { "text/x-script.perl" },
 			      (gchar[]) { "text/x-script.perl-module" },
 			      (gchar[]) { "application/x-pixclscript" },
 			      (gchar[]) { "application/x-xpixmap" }, NULL }
 	},
 
 	{ "php", N_("_PHP"),
-	  (const gchar* []) { (gchar[]) { "php" }, (gchar[]) { "php3" },
+	  (const gchar *[]) { (gchar[]) { "php" }, (gchar[]) { "php3" },
 			      (gchar[]) { "php4" }, (gchar[]) { "php5" },
 			      (gchar[]) { "php6" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/php" },
-	  		      (gchar[]) { "text/x-php" },
-	  		      (gchar[]) { "application/php" },
-	  		      (gchar[]) { "application/x-php" },
-	  		      (gchar[]) { "application/x-httpd-php" },
-	  		      (gchar[]) { "application/x-httpd-php-source" },
-	  		      NULL }
+	  (const gchar *[]) { (gchar[]) { "text/php" },
+			      (gchar[]) { "text/x-php" },
+			      (gchar[]) { "application/php" },
+			      (gchar[]) { "application/x-php" },
+			      (gchar[]) { "application/x-httpd-php" },
+			      (gchar[]) { "application/x-httpd-php-source" },
+			      NULL }
 	},
 
 	{ "python", N_("_Python"),
-	  (const gchar* []) { (gchar[]) { "py" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-script.python" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "py" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-script.python" }, NULL }
 	},
 
 	{ "ruby", N_("_Ruby"),
-	  (const gchar* []) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
+	  (const gchar *[]) { (gchar[]) { "ruby" }, (gchar[]) { "pp" },
 			      (gchar[]) { "rb" }, (gchar[]) { "rjs" },
 			      (gchar[]) { "ruby" }, NULL },
-	  (const gchar* []) { (gchar[]) { "application/x-ruby" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "application/x-ruby" }, NULL }
 	},
 
 	{ "tcl", N_("_Tcl/Tk"),
-	  (const gchar* []) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
+	  (const gchar *[]) { (gchar[]) { "tcl" }, (gchar[]) { "ictl" },
 			      (gchar[]) { "wish" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-tcl" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-tcl" }, NULL }
 	},
 
 	{ "tex", N_("_TeX/LaTeX"),
-	  (const gchar* []) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
+	  (const gchar *[]) { (gchar[]) { "tex" }, (gchar[]) { "csl" },
 			      (gchar[]) { "sty" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-tex" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-tex" }, NULL }
 	},
 
 	{ "vala", N_("_Vala"),
-	  (const gchar* []) { (gchar[]) { "vala" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-vala" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "vala" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-vala" }, NULL }
 	},
 
 	{ "vb", N_("_Visual Basic"),
-	  (const gchar* []) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
+	  (const gchar *[]) { (gchar[]) { "vb" }, (gchar[]) { "bas" },
 			      (gchar[]) { "basic" }, (gchar[]) { "bi" },
 			      (gchar[]) { "vbs" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "xml", N_("_XML"),
-	  (const gchar* []) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
+	  (const gchar *[]) { (gchar[]) { "xml" }, (gchar[]) { "dtd" },
 			      (gchar[]) { "ecf" }, (gchar[]) { "ent" },
 			      (gchar[]) { "hdr" }, (gchar[]) { "hub" },
 			      (gchar[]) { "jnlp" }, (gchar[]) { "nrm" },
@@ -166,7 +166,7 @@ static Language languages[] = {
 			      (gchar[]) { "tld" }, (gchar[]) { "vxml" },
 			      (gchar[]) { "wml" }, (gchar[]) { "xsd" },
 			      (gchar[]) { "xsl" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/xml" },
+	  (const gchar *[]) { (gchar[]) { "text/xml" },
 			      (gchar[]) { "application/xml" },
 			      (gchar[]) { "application/x-xml" }, NULL }
 	}
@@ -175,186 +175,186 @@ static Language languages[] = {
 static struct Language other_languages[] = {
 
 	{ "actionscript", N_("_ActionScript"),
-	  (const gchar* []) { (gchar[]) { "as" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "as" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "ada", N_("_ADA95"),
-	  (const gchar* []) { (gchar[]) { "a" }, (gchar[]) { "adb" },
-		              (gchar[]) { "ads" }, (gchar[]) { "gnad" },
-		              NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-adasrc" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "a" }, (gchar[]) { "adb" },
+			      (gchar[]) { "ads" }, (gchar[]) { "gnad" },
+			      NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-adasrc" }, NULL }
 	},
 
 	{ "algol", N_("_ALGOL 68"),
-	  (const gchar* []) { (gchar[]) { "alg" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "alg" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "awk", N_("(_G)AWK"),
-	  (const gchar* []) { (gchar[]) { "awk" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-awk" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "awk" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-awk" }, NULL }
 	},
 
 	{ "cobol", N_("_COBOL"),
-	  (const gchar* []) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-cobol" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "cbl" }, (gchar[]) { "cob" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-cobol" }, NULL }
 	},
 
 	{ "bat", N_("_DOS Batch"),
-	  (const gchar* []) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "bat" }, (gchar[]) { "cmd" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "d", N_("_D"),
-	  (const gchar* []) { (gchar[]) { "d" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "d" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "erlang", N_("_Erlang"),
-	  (const gchar* []) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-erlang" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "erl" }, (gchar[]) { "hrl" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-erlang" }, NULL }
 	},
 
 	{ "fortran77", N_("_FORTRAN 77"),
-	  (const gchar* []) { (gchar[]) { "f" }, (gchar[]) { "for" },
+	  (const gchar *[]) { (gchar[]) { "f" }, (gchar[]) { "for" },
 			      (gchar[]) { "ftn" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
 	},
 
 	{ "fortran90", N_("_FORTRAN 90"),
-	  (const gchar* []) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-fortran" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "f90" }, (gchar[]) { "f95" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-fortran" }, NULL }
 	},
 
 	{ "fsharp", N_("_F#"),
-	  (const gchar* []) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "fs" }, (gchar[]) { "fsx" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "go", N_("_Go"),
-	  (const gchar* []) { (gchar[]) { "go" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-go" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "go" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-go" }, NULL }
 	},
 
 	{ "haskell", N_("_Haskell"),
-	  (const gchar* []) { (gchar[]) { "hs" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-haskell" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "hs" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-haskell" }, NULL }
 	},
 
 	{ "jsp", N_("_JSP"),
-	  (const gchar* []) { (gchar[]) { "jsp" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-jsp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "jsp" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-jsp" }, NULL }
 	},
 
 	{ "lisp", N_("_Lisp"),
-	  (const gchar* []) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
+	  (const gchar *[]) { (gchar[]) { "cl" }, (gchar[]) { "clisp" },
 			      (gchar[]) { "el" }, (gchar[]) { "lsp" },
 			      (gchar[]) { "sbcl"}, (gchar[]) { "scom" },
 			      NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "text/x-emacs-lisp" }, NULL }
 	},
 
 	{ "lotus", N_("_Lotus"),
-	  (const gchar* []) { (gchar[]) { "ls" }, NULL },
-	  (const gchar* []) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ls" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "application/vnd.lotus-1-2-3" }, NULL }
 	},
 
 	{ "lua", N_("_Lua"),
-	  (const gchar* []) { (gchar[]) { "lua" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-lua" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "lua" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-lua" }, NULL }
 	},
 
 	{ "maple", N_("_Maple"),
-	  (const gchar* []) { (gchar[]) { "mpl" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "mpl" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "matlab", N_("_Matlab"),
-	  (const gchar* []) { (gchar[]) { "m" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-matlab" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "m" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-matlab" }, NULL }
 	},
 
 	{ "maya", N_("_Maya"),
-	  (const gchar* []) { (gchar[]) { "mel" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "mel" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "oberon", N_("_Oberon"),
-	  (const gchar* []) { (gchar[]) { "ooc" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "ooc" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "objc", N_("_Objective C"),
-	  (const gchar* []) { (gchar[]) { "objc" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-objchdr" },
+	  (const gchar *[]) { (gchar[]) { "objc" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-objchdr" },
 			      (gchar[]) { "text/x-objcsrc" }, NULL }
 	},
 
 	{ "ocaml", N_("_OCaml"),
-	  (const gchar* []) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-ocaml" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ml" }, (gchar[]) { "mli" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-ocaml" }, NULL }
 	},
 
 	{ "octave", N_("_Octave"),
-	  (const gchar* []) { (gchar[]) { "octave" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "octave" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "os", N_("_Object Script"),
-	  (const gchar* []) { (gchar[]) { "os" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "os" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "pascal", N_("_Pascal"),
-	  (const gchar* []) { (gchar[]) { "pas" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-pascal" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "pas" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-pascal" }, NULL }
 	},
 
 	{ "pov", N_("_POV-Ray"),
-	  (const gchar* []) { (gchar[]) { "pov" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "pov" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "pro", N_("_Prolog"),
-	  (const gchar* []) { (gchar[]) { "pro" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "pro" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "ps", N_("_PostScript"),
-	  (const gchar* []) { (gchar[]) { "ps" } , NULL },
-	  (const gchar* []) { (gchar[]) { "application/postscript" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "ps" } , NULL },
+	  (const gchar *[]) { (gchar[]) { "application/postscript" }, NULL }
 	},
 
 	{ "r", N_("_R"),
-	  (const gchar* []) { (gchar[]) { "r" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "r" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "spec", N_("_RPM Spec"),
-	  (const gchar* []) { (gchar[]) { "spec" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-rpm-spec" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "spec" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-rpm-spec" }, NULL }
 	},
 
 	{ "scala", N_("_Scala"),
-	  (const gchar* []) { (gchar[]) { "scala" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-scala" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "scala" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-scala" }, NULL }
 	},
 
 	{ "smalltalk", N_("_Smalltalk"),
-	  (const gchar* []) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
+	  (const gchar *[]) { (gchar[]) { "gst" }, (gchar[]) { "sq" },
 			      (gchar[]) { "st" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "tcsh", N_("_TCSH"),
-	  (const gchar* []) { (gchar[]) { "tcsh" }, NULL },
-	  (const gchar* []) { NULL }
+	  (const gchar *[]) { (gchar[]) { "tcsh" }, NULL },
+	  (const gchar *[]) { NULL }
 	},
 
 	{ "vhd", N_("_VHDL"),
-	  (const gchar* []) { (gchar[]) { "vhd" }, NULL },
-	  (const gchar* []) { (gchar[]) { "text/x-vhdl" }, NULL }
+	  (const gchar *[]) { (gchar[]) { "vhd" }, NULL },
+	  (const gchar *[]) { (gchar[]) { "text/x-vhdl" }, NULL }
 	}
 };
 
@@ -379,7 +379,7 @@ get_additinal_languages (gsize *len)
 }
 
 const gchar *
-get_syntax_for_ext(const gchar *extension)
+get_syntax_for_ext (const gchar *extension)
 {
 	gint i;
 	gint j;
@@ -422,7 +422,7 @@ get_syntax_for_ext(const gchar *extension)
 }
 
 const gchar *
-get_syntax_for_mime_type(const gchar *mime_type)
+get_syntax_for_mime_type (const gchar *mime_type)
 {
 	gint i;
 	gint j;
@@ -464,7 +464,6 @@ get_syntax_for_mime_type(const gchar *mime_type)
 	return NULL;
 }
 
-
 const gchar **
 get_mime_types (void)
 {
diff --git a/modules/text-highlight/languages.h b/modules/text-highlight/languages.h
index 03f1442531..c530cc5148 100644
--- a/modules/text-highlight/languages.h
+++ b/modules/text-highlight/languages.h
@@ -28,7 +28,7 @@ typedef struct Language {
 	const gchar **mime_types;
 } Language;
 
-const gchar *	get_syntax_for_ext 		(const gchar *extension);
+const gchar *	get_syntax_for_ext		(const gchar *extension);
 const gchar *	get_syntax_for_mime_type	(const gchar *mime_type);
 
 Language *	get_default_langauges		(gsize *len);
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
index 79089a58af..21bf74d849 100644
--- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
+++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
@@ -77,7 +77,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "application/vnd.ms-tnef",
+static const gchar * parser_mime_types[] = { "application/vnd.ms-tnef",
 					    "application/ms-tnefl",
 					    NULL };
 
@@ -132,11 +132,11 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
 	TNEFStruct tnef;
 	GSList *parts;
 
-	tmpdir = e_mkdtemp("tnef-attachment-XXXXXX");
+	tmpdir = e_mkdtemp ("tnef-attachment-XXXXXX");
 	if (tmpdir == NULL)
 		return NULL;
 
-	name = g_build_filename(tmpdir, ".evo-attachment.tnef", NULL);
+	name = g_build_filename (tmpdir, ".evo-attachment.tnef", NULL);
 
 	out = camel_stream_fs_new_with_name (name, O_RDWR | O_CREAT, 0666, NULL);
 	if (out == NULL) {
@@ -161,7 +161,7 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
 	TNEFInitialize (&tnef);
 	tnef.Debug = verbose;
 	if (TNEFParseFile (name, &tnef) == -1) {
-	    printf("ERROR processing file\n");
+	    printf ("ERROR processing file\n");
 	}
 	processTnef (&tnef, tmpdir);
 
@@ -178,7 +178,7 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
 	mainpart = camel_mime_part_new ();
 
 	mp = camel_multipart_new ();
-	camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed");
+	camel_data_wrapper_set_mime_type ((CamelDataWrapper *) mp, "multipart/mixed");
 	camel_multipart_set_boundary (mp, NULL);
 
 	camel_medium_set_content ((CamelMedium *) mainpart, (CamelDataWrapper *) mp);
@@ -190,9 +190,9 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
 		gchar *path;
 		const gchar *type;
 
-		if (!strcmp(d->d_name, ".")
-		    || !strcmp(d->d_name, "..")
-		    || !strcmp(d->d_name, ".evo-attachment.tnef"))
+		if (!strcmp (d->d_name, ".")
+		    || !strcmp (d->d_name, "..")
+		    || !strcmp (d->d_name, ".evo-attachment.tnef"))
 		    continue;
 
 		path = g_build_filename (tmpdir, d->d_name, NULL);
@@ -224,28 +224,29 @@ empe_tnef_attachment_parse (EMailParserExtension *extension,
 	closedir (dir);
 
 	len = part_id->len;
-	g_string_append_printf(part_id, ".tnef");
+	g_string_append_printf (part_id, ".tnef");
 
 	parts = NULL;
 	if (camel_multipart_get_number (mp) > 0) {
 
 		CamelMimePart *part = camel_mime_part_new ();
 
-		camel_medium_set_content ((CamelMedium *) part,
+		camel_medium_set_content (
+			(CamelMedium *) part,
 			CAMEL_DATA_WRAPPER (mp));
 
-		parts = e_mail_parser_parse_part_as (parser, part,
-				part_id, "multipart/mixed", cancellable);
+		parts = e_mail_parser_parse_part_as (
+			parser, part, part_id,
+			"multipart/mixed", cancellable);
 
 		g_object_unref (part);
 	}
 
 	g_string_truncate (part_id, len);
 
-	if (parts) {
-		parts = e_mail_parser_wrap_as_attachment (parser,
-				part, parts, part_id, cancellable);
-	}
+	if (parts)
+		parts = e_mail_parser_wrap_as_attachment (
+			parser, part, parts, part_id, cancellable);
 
 	g_object_unref (mp);
 	g_object_unref (mainpart);
@@ -334,13 +335,13 @@ processTnef (TNEFStruct *tnef,
     /* First see if this requires special processing. */
     /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */
     if (tnef->messageClass[0] != 0)  {
-	if (strcmp(tnef->messageClass, "IPM.Contact") == 0) {
+	if (strcmp (tnef->messageClass, "IPM.Contact") == 0) {
 	    saveVCard (tnef, tmpdir);
 	}
-	if (strcmp(tnef->messageClass, "IPM.Task") == 0) {
+	if (strcmp (tnef->messageClass, "IPM.Task") == 0) {
 	    saveVTask (tnef, tmpdir);
 	}
-	if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) {
+	if (strcmp (tnef->messageClass, "IPM.Appointment") == 0) {
 	    saveVCalendar (tnef, tmpdir);
 	    foundCal = 1;
 	}
@@ -348,7 +349,7 @@ processTnef (TNEFStruct *tnef,
 
     if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
 			PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) {
-	if (strcmp(filename->data, "IPM.Appointment") == 0) {
+	if (strcmp (filename->data, "IPM.Appointment") == 0) {
              /* If it's "indicated" twice, we don't want to save 2 calendar entries. */
 	    if (foundCal == 0) {
 		saveVCalendar (tnef, tmpdir);
@@ -356,7 +357,7 @@ processTnef (TNEFStruct *tnef,
 	}
     }
 
-    if (strcmp(tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) {
+    if (strcmp (tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) {
 	if ((saveRTF == 1) && (tnef->subject.size > 0)) {
             /*  Description */
 	    if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
@@ -372,10 +373,11 @@ processTnef (TNEFStruct *tnef,
 		    g_free (absfilename);
 		    g_free (file);
 
-		    if ((fptr = fopen(ifilename, "wb"))==NULL) {
-			printf("ERROR: Error writing file to disk!");
+		    if ((fptr = fopen (ifilename, "wb")) == NULL) {
+			printf ("ERROR: Error writing file to disk!");
 		    } else {
-			fwrite (buf.data,
+			fwrite (
+				buf.data,
 				sizeof (BYTE),
 				buf.size,
 				fptr);
@@ -459,7 +461,7 @@ processTnef (TNEFStruct *tnef,
 		}
 		if (filename->size == 1) {
 		    filename->size = 20;
-		    g_sprintf(tmpname, "file_%03i.dat", count);
+		    g_sprintf (tmpname, "file_%03i.dat", count);
 		    filename->data = tmpname;
 		}
 		absfilename = sanitize_filename (filename->data);
@@ -468,19 +470,21 @@ processTnef (TNEFStruct *tnef,
 		ifilename = g_build_filename (tmpdir, absfilename, NULL);
 		g_free (absfilename);
 
-		if ((fptr = fopen(ifilename, "wb"))==NULL) {
-		    printf("ERROR: Error writing file to disk!");
+		if ((fptr = fopen (ifilename, "wb")) == NULL) {
+		    printf ("ERROR: Error writing file to disk!");
 		} else {
 		    if (object == 1) {
-			fwrite (filedata->data + 16,
-			       sizeof (BYTE),
-			       filedata->size - 16,
-			       fptr);
+			fwrite (
+				filedata->data + 16,
+				sizeof (BYTE),
+				filedata->size - 16,
+				fptr);
 		    } else {
-			fwrite (filedata->data,
-			       sizeof (BYTE),
-			       filedata->size,
-			       fptr);
+			fwrite (
+				filedata->data,
+				sizeof (BYTE),
+				filedata->size,
+				fptr);
 		    }
 		    fclose (fptr);
 		}
@@ -529,42 +533,42 @@ saveVCard (TNEFStruct *tnef,
     g_free (file);
     g_free (absfilename);
 
-    if ((fptr = fopen(ifilename, "wb"))==NULL) {
-	    printf("Error writing file to disk!");
+    if ((fptr = fopen (ifilename, "wb")) == NULL) {
+	    printf ("Error writing file to disk!");
     } else {
-	fprintf(fptr, "BEGIN:VCARD\n");
-	fprintf(fptr, "VERSION:2.1\n");
+	fprintf (fptr, "BEGIN:VCARD\n");
+	fprintf (fptr, "VERSION:2.1\n");
 	if (vl != MAPI_UNDEFINED) {
-	    fprintf(fptr, "FN:%s\n", vl->data);
+	    fprintf (fptr, "FN:%s\n", vl->data);
 	}
-	fprintProperty(tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n");
-	fprintUserProp(tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n");
+	fprintUserProp (tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
 
         /* Organizational */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) {
 	    if (vl->size > 0) {
 		if ((vl->size == 1) && (vl->data[0] == 0)) {
 		} else {
-		    fprintf(fptr,"ORG:%s", vl->data);
+		    fprintf (fptr,"ORG:%s", vl->data);
 		    if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) {
-			fprintf(fptr,";%s", vl->data);
+			fprintf (fptr,";%s", vl->data);
 		    }
-		    fprintf(fptr, "\n");
+		    fprintf (fptr, "\n");
 		}
 	    }
 	}
 
-	fprintProperty(tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
 	if (tnef->body.size > 0) {
-	    fprintf(fptr, "NOTE;QUOTED-PRINTABLE:");
+	    fprintf (fptr, "NOTE;QUOTED-PRINTABLE:");
 	    quotedfprint (fptr, &(tnef->body));
-	    fprintf(fptr,"\n");
+	    fprintf (fptr,"\n");
 	}
 
         /* Business Address */
@@ -588,35 +592,35 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:");
+	    fprintf (fptr, "ADR;QUOTED-PRINTABLE;WORK:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-	    fprintf(fptr, ";;");
+	    fprintf (fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-	    fprintf(fptr,"\n");
+	    fprintf (fptr,"\n");
 	    if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) {
-		fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+		fprintf (fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
 		quotedfprint (fptr, vl);
-		fprintf(fptr,"\n");
+		fprintf (fptr,"\n");
 	    }
 	}
 
@@ -641,35 +645,35 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:");
+	    fprintf (fptr, "ADR;QUOTED-PRINTABLE;HOME:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-	    fprintf(fptr, ";;");
+	    fprintf (fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-	    fprintf(fptr,"\n");
+	    fprintf (fptr,"\n");
 	    if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) {
-		fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+		fprintf (fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
 		quotedfprint (fptr, vl);
-		fprintf(fptr,"\n");
+		fprintf (fptr,"\n");
 	    }
 	}
 
@@ -694,52 +698,52 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
+	    fprintf (fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-	    fprintf(fptr, ";;");
+	    fprintf (fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-	    fprintf(fptr, ";");
+	    fprintf (fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-	    fprintf(fptr,"\n");
+	    fprintf (fptr,"\n");
 	}
 
-	fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
-	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
 
         /* Email addresses */
 	if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) {
@@ -747,40 +751,40 @@ saveVCard (TNEFStruct *tnef,
 	}
 	if (vl != MAPI_UNDEFINED) {
 	    if (vl->size > 0)
-		fprintf(fptr, "EMAIL:%s\n", vl->data);
+		fprintf (fptr, "EMAIL:%s\n", vl->data);
 	}
 	if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8093))) == MAPI_UNDEFINED) {
 	    vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8094));
 	}
 	if (vl != MAPI_UNDEFINED) {
 	    if (vl->size > 0)
-		fprintf(fptr, "EMAIL:%s\n", vl->data);
+		fprintf (fptr, "EMAIL:%s\n", vl->data);
 	}
 	if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) {
 	    vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a4));
 	}
 	if (vl != MAPI_UNDEFINED) {
 	    if (vl->size > 0)
-		fprintf(fptr, "EMAIL:%s\n", vl->data);
+		fprintf (fptr, "EMAIL:%s\n", vl->data);
 	}
 
-	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
-	fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
+	fprintProperty (tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
+	fprintUserProp (tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
 
         /* Birthday */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) {
-	    fprintf(fptr, "BDAY:");
+	    fprintf (fptr, "BDAY:");
 	    MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
-	    fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+	    fprintf (fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
 	}
 
         /* Anniversary */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) {
-	    fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:");
+	    fprintf (fptr, "X-EVOLUTION-ANNIVERSARY:");
 	    MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
-	    fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+	    fprintf (fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
 	}
-	fprintf(fptr, "END:VCARD\n");
+	fprintf (fptr, "END:VCARD\n");
 	fclose (fptr);
     }
     g_free (ifilename);
@@ -866,25 +870,25 @@ gchar * getRruleDayname (guchar a) {
     *daystring = 0;
 
     if (a & 0x01) {
-        strcat(daystring, "SU,");
+        strcat (daystring, "SU,");
     }
     if (a & 0x02) {
-        strcat(daystring, "MO,");
+        strcat (daystring, "MO,");
     }
     if (a & 0x04) {
-        strcat(daystring, "TU,");
+        strcat (daystring, "TU,");
     }
     if (a & 0x08) {
-        strcat(daystring, "WE,");
+        strcat (daystring, "WE,");
     }
     if (a & 0x10) {
-        strcat(daystring, "TH,");
+        strcat (daystring, "TH,");
     }
     if (a & 0x20) {
-        strcat(daystring, "FR,");
+        strcat (daystring, "FR,");
     }
     if (a & 0x40) {
-        strcat(daystring, "SA,");
+        strcat (daystring, "SA,");
     }
 
     if (strlen (daystring)) {
@@ -902,70 +906,76 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef)
 	return;
     }
 
-    fprintf(fptr, "RRULE:FREQ=");
+    fprintf (fptr, "RRULE:FREQ=");
 
     if (recur_data[0x04] == 0x0A) {
-	fprintf(fptr, "DAILY");
+	fprintf (fptr, "DAILY");
 
 	if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 ||
 		recur_data[0x16] == 0x21) {
 	    if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
 		    PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) {
-		fprintf(fptr, ";INTERVAL=%d", *(filename->data));
+		fprintf (fptr, ";INTERVAL=%d", *(filename->data));
 	    }
 	    if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) {
-		fprintf(fptr, ";COUNT=%d",
-		    getRruleCount (recur_data[0x1B], recur_data[0x1A]));
+		fprintf (
+			fptr, ";COUNT=%d",
+			getRruleCount (recur_data[0x1B], recur_data[0x1A]));
 	    }
 	} else if (recur_data[0x16] == 0x3E) {
-	    fprintf(fptr, ";BYDAY=MO,TU,WE,TH,FR");
+	    fprintf (fptr, ";BYDAY=MO,TU,WE,TH,FR");
 	    if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-		fprintf(fptr, ";COUNT=%d",
-		    getRruleCount (recur_data[0x1F], recur_data[0x1E]));
+		fprintf (
+			fptr, ";COUNT=%d",
+			getRruleCount (recur_data[0x1F], recur_data[0x1E]));
 	    }
 	}
     } else if (recur_data[0x04] == 0x0B) {
-	fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s",
-	    recur_data[0x0E], getRruleDayname (recur_data[0x16]));
+	fprintf (
+		fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s",
+		recur_data[0x0E], getRruleDayname (recur_data[0x16]));
 	if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-	    fprintf(fptr, ";COUNT=%d",
+	    fprintf (fptr, ";COUNT=%d",
 		getRruleCount (recur_data[0x1F], recur_data[0x1E]));
 	}
     } else if (recur_data[0x04] == 0x0C) {
-	fprintf(fptr, "MONTHLY");
+	fprintf (fptr, "MONTHLY");
 	if (recur_data[0x06] == 0x02) {
-	    fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
+	    fprintf (fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
 		recur_data[0x16]);
 	    if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-		fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F],
-		    recur_data[0x1E]));
+		fprintf (
+			fptr, ";COUNT=%d", getRruleCount (recur_data[0x1F],
+			recur_data[0x1E]));
 	    }
 	} else if (recur_data[0x06] == 0x03) {
-	    fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d",
+	    fprintf (fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d",
 		getRruleDayname (recur_data[0x16]),
 		recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A],
 		recur_data[0x0E]);
 	    if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
-		fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
-		    recur_data[0x22]));
+		fprintf (
+			fptr, ";COUNT=%d", getRruleCount (recur_data[0x23],
+			recur_data[0x22]));
 	    }
 	}
     } else if (recur_data[0x04] == 0x0D) {
-	fprintf(fptr, "YEARLY;BYMONTH=%d",
+	fprintf (
+		fptr, "YEARLY;BYMONTH=%d",
 		getRruleMonthNum (recur_data[0x0A], recur_data[0x0B]));
 	if (recur_data[0x06] == 0x02) {
-	    fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
+	    fprintf (fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
 	} else if (recur_data[0x06] == 0x03) {
-	    fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d",
+	    fprintf (fptr, ";BYDAY=%s;BYSETPOS=%d",
 		getRruleDayname (recur_data[0x16]),
 		recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]);
 	}
 	if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
-	    fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
+	    fprintf (fptr, ";COUNT=%d", getRruleCount (recur_data[0x23],
 		recur_data[0x22]));
 	}
     }
-    fprintf(fptr, "\n");
+    fprintf (fptr, "\n");
 }
 
 void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
@@ -978,12 +988,12 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
     dtr thedate;
 
     ifilename = g_build_filename (tmpdir, "calendar.vcf", NULL);
-    printf("%s\n", ifilename);
+    printf ("%s\n", ifilename);
 
-    if ((fptr = fopen(ifilename, "wb"))==NULL) {
-            printf("Error writing file to disk!");
+    if ((fptr = fopen (ifilename, "wb")) == NULL) {
+            printf ("Error writing file to disk!");
     } else {
-        fprintf(fptr, "BEGIN:VCALENDAR\n");
+        fprintf (fptr, "BEGIN:VCALENDAR\n");
         if (tnef->messageClass[0] != 0) {
             charptr2 = tnef->messageClass;
             charptr = charptr2;
@@ -993,16 +1003,16 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
                 }
                 charptr++;
             }
-            if (strcmp(charptr2, ".MtgCncl") == 0) {
-                fprintf(fptr, "METHOD:CANCEL\n");
+            if (strcmp (charptr2, ".MtgCncl") == 0) {
+                fprintf (fptr, "METHOD:CANCEL\n");
             } else {
-                fprintf(fptr, "METHOD:REQUEST\n");
+                fprintf (fptr, "METHOD:REQUEST\n");
             }
         } else {
-            fprintf(fptr, "METHOD:REQUEST\n");
+            fprintf (fptr, "METHOD:REQUEST\n");
         }
-        fprintf(fptr, "VERSION:2.0\n");
-        fprintf(fptr, "BEGIN:VEVENT\n");
+        fprintf (fptr, "VERSION:2.0\n");
+        fprintf (fptr, "BEGIN:VEVENT\n");
 
 	/* UID
 	 * After alot of comparisons, I'm reasonably sure this is totally
@@ -1020,11 +1030,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
             }
         }
         if (filename != NULL) {
-            fprintf(fptr, "UID:");
+            fprintf (fptr, "UID:");
             for (index = 0; index < filename->size; index++) {
-                fprintf(fptr,"%02X", (guchar)filename->data[index]);
+                fprintf (fptr,"%02X", (guchar) filename->data[index]);
             }
-            fprintf(fptr,"\n");
+            fprintf (fptr,"\n");
         }
 
         /* Sequence */
@@ -1032,18 +1042,18 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
                         PROP_TAG (PT_LONG, 0x8201))) != MAPI_UNDEFINED) {
             dword_ptr = (DWORD *) filename->data;
-            fprintf(fptr, "SEQUENCE:%i\n", (gint) *dword_ptr);
+            fprintf (fptr, "SEQUENCE:%i\n", (gint) *dword_ptr);
         }
         if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
                         PROP_TAG (PT_BINARY, PR_SENDER_SEARCH_KEY)))
                 != MAPI_UNDEFINED) {
             charptr = filename->data;
-            charptr2 = strstr(charptr, ":");
+            charptr2 = strstr (charptr, ":");
             if (charptr2 == NULL)
                 charptr2 = charptr;
             else
                 charptr2++;
-            fprintf(fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n",
+            fprintf (fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n",
                     charptr2, charptr2);
         }
 
@@ -1056,15 +1066,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
                 charptr = filename->data - 1;
                 while (charptr != NULL) {
                     charptr++;
-                    charptr2 = strstr(charptr, ";");
+                    charptr2 = strstr (charptr, ";");
                     if (charptr2 != NULL) {
                         *charptr2 = 0;
                     }
                     while (*charptr == ' ')
                         charptr++;
-                    fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
-                    fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
-                    fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+                    fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+                    fprintf (fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
+                    fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
                                 charptr, charptr);
                     charptr = charptr2;
                 }
@@ -1077,15 +1087,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
                     charptr = filename->data - 1;
                     while (charptr != NULL) {
                         charptr++;
-                        charptr2 = strstr(charptr, ";");
+                        charptr2 = strstr (charptr, ";");
                         if (charptr2 != NULL) {
                             *charptr2 = 0;
                         }
                         while (*charptr == ' ')
                             charptr++;
-                        fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
-                        fprintf(fptr, "ROLE=OPT-PARTICIPANT;RSVP=TRUE;");
-                        fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+                        fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+                        fprintf (fptr, "ROLE=OPT-PARTICIPANT;RSVP=TRUE;");
+                        fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
                                 charptr, charptr);
                         charptr = charptr2;
                     }
@@ -1097,15 +1107,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
                 charptr = filename->data - 1;
                 while (charptr != NULL) {
                     charptr++;
-                    charptr2 = strstr(charptr, ";");
+                    charptr2 = strstr (charptr, ";");
                     if (charptr2 != NULL) {
                         *charptr2 = 0;
                     }
                     while (*charptr == ' ')
                         charptr++;
-                    fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
-                    fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
-                    fprintf(fptr, "CN=\"%s\":MAILTO:%s\n",
+                    fprintf (fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
+                    fprintf (fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
+                    fprintf (fptr, "CN=\"%s\":MAILTO:%s\n",
                                 charptr, charptr);
                     charptr = charptr2;
                 }
@@ -1117,9 +1127,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         if ((filename = MAPIFindProperty (&(tnef->MapiProperties),
                         PROP_TAG (PT_STRING8, PR_CONVERSATION_TOPIC)))
                 != MAPI_UNDEFINED) {
-            fprintf(fptr, "SUMMARY:");
+            fprintf (fptr, "SUMMARY:");
             cstylefprint (fptr, filename);
-            fprintf(fptr, "\n");
+            fprintf (fptr, "\n");
         }
 
         /* Description */
@@ -1128,7 +1138,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
                 != MAPI_UNDEFINED) {
             variableLength buf;
             if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) {
-                fprintf(fptr, "DESCRIPTION:");
+                fprintf (fptr, "DESCRIPTION:");
                 printRtf (fptr, &buf);
                 free (buf.data);
             }
@@ -1145,7 +1155,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
             }
         }
         if (filename != NULL) {
-            fprintf(fptr,"LOCATION: %s\n", filename->data);
+            fprintf (fptr,"LOCATION: %s\n", filename->data);
         }
         /* Date Start */
         filename = NULL;
@@ -1157,9 +1167,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
             }
         }
         if (filename != NULL) {
-            fprintf(fptr, "DTSTART:");
+            fprintf (fptr, "DTSTART:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1173,9 +1183,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
             }
         }
         if (filename != NULL) {
-            fprintf(fptr, "DTEND:");
+            fprintf (fptr, "DTEND:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1183,9 +1193,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         filename = NULL;
         if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
                         PROP_TAG (PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) {
-            fprintf(fptr, "CREATED:");
+            fprintf (fptr, "CREATED:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1194,11 +1204,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
                         PROP_TAG (PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) {
             dword_ptr = (DWORD *) filename->data;
-            fprintf(fptr, "CLASS:" );
+            fprintf (fptr, "CLASS:" );
             if (*dword_ptr == 1) {
-                fprintf(fptr,"PRIVATE\n");
+                fprintf (fptr,"PRIVATE\n");
             } else {
-                fprintf(fptr,"PUBLIC\n");
+                fprintf (fptr,"PUBLIC\n");
             }
         }
         /* Recurrence */
@@ -1209,8 +1219,8 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         }
 
         /* Wrap it up */
-        fprintf(fptr, "END:VEVENT\n");
-        fprintf(fptr, "END:VCALENDAR\n");
+        fprintf (fptr, "END:VEVENT\n");
+        fprintf (fptr, "END:VCALENDAR\n");
         fclose (fptr);
     }
     g_free (ifilename);
@@ -1245,24 +1255,24 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
     g_free (file);
     g_free (absfilename);
 
-    printf("%s\n", ifilename);
+    printf ("%s\n", ifilename);
 
-    if ((fptr = fopen(ifilename, "wb"))==NULL) {
-            printf("Error writing file to disk!");
+    if ((fptr = fopen (ifilename, "wb")) == NULL) {
+            printf ("Error writing file to disk!");
     } else {
-        fprintf(fptr, "BEGIN:VCALENDAR\n");
-        fprintf(fptr, "VERSION:2.0\n");
-        fprintf(fptr, "METHOD:PUBLISH\n");
+        fprintf (fptr, "BEGIN:VCALENDAR\n");
+        fprintf (fptr, "VERSION:2.0\n");
+        fprintf (fptr, "METHOD:PUBLISH\n");
         filename = NULL;
 
-        fprintf(fptr, "BEGIN:VTODO\n");
+        fprintf (fptr, "BEGIN:VTODO\n");
         if (tnef->messageID[0] != 0) {
-            fprintf(fptr,"UID:%s\n", tnef->messageID);
+            fprintf (fptr,"UID:%s\n", tnef->messageID);
         }
         filename = MAPIFindUserProp (&(tnef->MapiProperties), \
                         PROP_TAG (PT_STRING8, 0x8122));
         if (filename != MAPI_UNDEFINED) {
-            fprintf(fptr, "ORGANIZER:%s\n", filename->data);
+            fprintf (fptr, "ORGANIZER:%s\n", filename->data);
         }
 
         if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) {
@@ -1272,35 +1282,35 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
             charptr = filename->data - 1;
             while (charptr != NULL) {
                 charptr++;
-                charptr2 = strstr(charptr, ";");
+                charptr2 = strstr (charptr, ";");
                 if (charptr2 != NULL) {
                     *charptr2 = 0;
                 }
                 while (*charptr == ' ')
                     charptr++;
-                fprintf(fptr, "ATTENDEE;CN=%s;ROLE=REQ-PARTICIPANT:%s\n", charptr, charptr);
+                fprintf (fptr, "ATTENDEE;CN=%s;ROLE=REQ-PARTICIPANT:%s\n", charptr, charptr);
                 charptr = charptr2;
             }
         }
 
         if (tnef->subject.size > 0) {
-            fprintf(fptr,"SUMMARY:");
+            fprintf (fptr,"SUMMARY:");
             cstylefprint (fptr,&(tnef->subject));
-            fprintf(fptr,"\n");
+            fprintf (fptr,"\n");
         }
 
         if (tnef->body.size > 0) {
-            fprintf(fptr,"DESCRIPTION:");
+            fprintf (fptr,"DESCRIPTION:");
             cstylefprint (fptr,&(tnef->body));
-            fprintf(fptr,"\n");
+            fprintf (fptr,"\n");
         }
 
         filename = MAPIFindProperty (&(tnef->MapiProperties), \
                     PROP_TAG (PT_SYSTIME, PR_CREATION_TIME));
         if (filename != MAPI_UNDEFINED) {
-            fprintf(fptr, "DTSTAMP:");
+            fprintf (fptr, "DTSTAMP:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1308,18 +1318,18 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
         filename = MAPIFindUserProp (&(tnef->MapiProperties), \
                     PROP_TAG (PT_SYSTIME, 0x8517));
         if (filename != MAPI_UNDEFINED) {
-            fprintf(fptr, "DUE:");
+            fprintf (fptr, "DUE:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
         filename = MAPIFindProperty (&(tnef->MapiProperties), \
                     PROP_TAG (PT_SYSTIME, PR_LAST_MODIFICATION_TIME));
         if (filename != MAPI_UNDEFINED) {
-            fprintf(fptr, "LAST-MODIFIED:");
+            fprintf (fptr, "LAST-MODIFIED:");
             MAPISysTimetoDTR ((guchar *) filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
+            fprintf (fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1328,15 +1338,15 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
                         PROP_TAG (PT_BOOLEAN, 0x8506));
         if (filename != MAPI_UNDEFINED) {
             dword_ptr = (DWORD *) filename->data;
-            fprintf(fptr, "CLASS:" );
+            fprintf (fptr, "CLASS:" );
             if (*dword_ptr == 1) {
-                fprintf(fptr,"PRIVATE\n");
+                fprintf (fptr,"PRIVATE\n");
             } else {
-                fprintf(fptr,"PUBLIC\n");
+                fprintf (fptr,"PUBLIC\n");
             }
         }
-        fprintf(fptr, "END:VTODO\n");
-        fprintf(fptr, "END:VCALENDAR\n");
+        fprintf (fptr, "END:VTODO\n");
+        fprintf (fptr, "END:VCALENDAR\n");
         fclose (fptr);
     }
     g_free (ifilename);
@@ -1371,10 +1381,10 @@ void quotedfprint (FILE *fptr, variableLength *vl) {
 
     for (index = 0; index < vl->size - 1; index++) {
         if (vl->data[index] == '\n') {
-            fprintf(fptr, "=0A");
+            fprintf (fptr, "=0A");
         } else if (vl->data[index] == '\r') {
         } else {
-            fprintf(fptr, "%c", vl->data[index]);
+            fprintf (fptr, "%c", vl->data[index]);
         }
     }
 }
@@ -1384,17 +1394,17 @@ void cstylefprint (FILE *fptr, variableLength *vl) {
 
     for (index = 0; index < vl->size - 1; index++) {
         if (vl->data[index] == '\n') {
-            fprintf(fptr, "\\n");
+            fprintf (fptr, "\\n");
         } else if (vl->data[index] == '\r') {
             /* Print nothing. */
         } else if (vl->data[index] == ';') {
-            fprintf(fptr, "\\;");
+            fprintf (fptr, "\\;");
         } else if (vl->data[index] == ',') {
-            fprintf(fptr, "\\,");
+            fprintf (fptr, "\\,");
         } else if (vl->data[index] == '\\') {
-            fprintf(fptr, "\\");
+            fprintf (fptr, "\\");
         } else {
-            fprintf(fptr, "%c", vl->data[index]);
+            fprintf (fptr, "%c", vl->data[index]);
         }
     }
 }
@@ -1426,19 +1436,19 @@ void printRtf (FILE *fptr, variableLength *vl) {
         }
         if ((brace_ct == 1) && (key == 0)) {
             if (*byte == '\n') {
-                fprintf(fptr, "\\n");
+                fprintf (fptr, "\\n");
             } else if (*byte == '\r') {
 		/* Print nothing. */
             } else if (*byte == ';') {
-                fprintf(fptr, "\\;");
+                fprintf (fptr, "\\;");
             } else if (*byte == ',') {
-                fprintf(fptr, "\\,");
+                fprintf (fptr, "\\,");
             } else if (*byte == '\\') {
-                fprintf(fptr, "\\");
+                fprintf (fptr, "\\");
             } else {
-                fprintf(fptr, "%c", *byte);
+                fprintf (fptr, "%c", *byte);
             }
         }
     }
-    fprintf(fptr, "\n");
+    fprintf (fptr, "\n");
 }
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 0daa6d7521..9bd4785a21 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -60,7 +60,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_FORMATTER_EXTENSION,
 		e_mail_formatter_formatter_extension_interface_init));
 
-static const gchar* formatter_mime_types[] = { "text/vcard", "text/x-vcard",
+static const gchar * formatter_mime_types[] = { "text/vcard", "text/x-vcard",
 					       "text/directory", NULL };
 
 static gboolean
@@ -152,8 +152,8 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension,
 			"<iframe width=\"100%%\" height=\"auto\" frameborder=\"0\""
 				"src=\"%s\" name=\"%s\"></iframe>"
 			"</div>",
-			 part->id, access_key, html_label,
-			 uri, part->id);
+			part->id, access_key, html_label,
+			uri, part->id);
 		camel_stream_write_string (stream, str, cancellable, NULL);
 		g_free (str);
 		g_free (html_label);
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index e0efd87b15..319775b6eb 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -72,7 +72,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "text/vcard", "text/x-vcard",
+static const gchar * parser_mime_types[] = { "text/vcard", "text/x-vcard",
 					    "text/directory", NULL };
 
 static void