Coding style cleanups.

23 files changed, 124 insertions, 124 deletions

diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 113424bd78..e21dd94498 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -96,7 +96,7 @@ org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t)
 
 	/* Set presend_check_status for the composer*/
 	if (check_for_attachment_clues (filtered_str) && !check_for_attachment (t->composer))
-		if (!ask_for_missing_attachment (ep, (GtkWindow *)t->composer))
+		if (!ask_for_missing_attachment (ep, (GtkWindow *) t->composer))
 			g_object_set_data ((GObject *) t->composer, "presend_check_status", GINT_TO_POINTER(1));
 
 	g_free (filtered_str);
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index aa0693ece3..d6e1b05076 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -273,7 +273,7 @@ static void
 check_toggled (GtkToggleButton *button, GtkAssistant *assistant)
 {
 	GtkWidget *box = g_object_get_data ((GObject *)button, "box");
-	gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *)button);
+	gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *) button);
 
 	gtk_widget_set_sensitive (box, state);
 
@@ -324,27 +324,27 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."));
-	gtk_label_set_line_wrap ((GtkLabel *)label, TRUE);
-	gtk_label_set_single_line_mode ((GtkLabel *)label, FALSE);
-	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6);
-	gtk_box_pack_start ((GtkBox *)page, hbox, FALSE, FALSE, 0);
+	gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
+	gtk_label_set_single_line_mode ((GtkLabel *) label, FALSE);
+	gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 6);
+	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file"));
 	g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), assistant);
-	gtk_box_pack_start ((GtkBox *)hbox, cbox, FALSE, FALSE, 6);
-	gtk_box_pack_start ((GtkBox *)page, hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) hbox, cbox, FALSE, FALSE, 6);
+	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	g_object_set_data ((GObject *)cbox, "box", hbox);
 	label = gtk_label_new (_("Please select an Evolution Archive to restore:"));
-	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 12);
+	gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 12);
 
 	button = gtk_file_chooser_button_new (_("Choose a file to restore"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	g_signal_connect (button, "selection-changed", G_CALLBACK (file_changed), assistant);
-	gtk_file_chooser_button_set_width_chars ((GtkFileChooserButton *)button, 20);
-	gtk_box_pack_start ((GtkBox *)hbox, button, FALSE, FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)page, hbox, FALSE, FALSE, 0);
+	gtk_file_chooser_button_set_width_chars ((GtkFileChooserButton *) button, 20);
+	gtk_box_pack_start ((GtkBox *) hbox, button, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive (hbox, FALSE);
 
 	gtk_assistant_append_page (assistant, page);
@@ -367,7 +367,7 @@ backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target)
 
 	if (state) {
 		if (!file || !sanity_check (file)) {
-			e_alert_run_dialog_for_args ((GtkWindow *)assistant,
+			e_alert_run_dialog_for_args ((GtkWindow *) assistant,
 						     "org.gnome.backup-restore:invalid-backup",
 						     NULL);
 		} else {
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 9334de3b20..aa792169f2 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -560,8 +560,8 @@ static gboolean
 pbar_update (gpointer data)
 {
 	if (!complete) {
-		gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
-		gtk_progress_bar_set_text ((GtkProgressBar *)pbar, txt);
+		gtk_progress_bar_pulse ((GtkProgressBar *) pbar);
+		gtk_progress_bar_set_text ((GtkProgressBar *) pbar, txt);
 		return TRUE;
 	}
 
@@ -589,7 +589,7 @@ idle_cb (gpointer data)
 {
 	if (gui_arg) {
 		/* Show progress dialog */
-		gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
+		gtk_progress_bar_pulse ((GtkProgressBar *) pbar);
 		g_timeout_add (50, pbar_update, NULL);
 	}
 
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 545fd6842d..bfb63c5505 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -197,7 +197,7 @@ bbdb_do_in_thread (gpointer data)
 	if (!book || !bbdb_open_ebook (book)) {
 		G_LOCK (todo);
 
-		g_slist_foreach (todo, (GFunc)free_todo_struct, NULL);
+		g_slist_foreach (todo, (GFunc) free_todo_struct, NULL);
 		g_slist_free (todo);
 		todo = NULL;
 
@@ -357,7 +357,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 		e_book_query_unref (query);
 	if (contacts != NULL || !status) {
 		for (l = contacts; l != NULL; l = l->next)
-			g_object_unref ((GObject *)l->data);
+			g_object_unref ((GObject *) l->data);
 		g_list_free (contacts);
 		g_free (temp_name);
 
@@ -391,7 +391,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 		   this. */
 		if (!status || contacts->next != NULL) {
 			for (l = contacts; l != NULL; l = l->next)
-				g_object_unref ((GObject *)l->data);
+				g_object_unref ((GObject *) l->data);
 			g_list_free (contacts);
 			g_free (temp_name);
 			return;
@@ -405,7 +405,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 		}
 
 		for (l = contacts; l != NULL; l = l->next)
-			g_object_unref ((GObject *)l->data);
+			g_object_unref ((GObject *) l->data);
 		g_list_free (contacts);
 
 		g_free (temp_name);
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 62fc89d9ec..3e6f344ed0 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -385,7 +385,7 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c)
 				return dirty;
 			}
 
-			photo->data.inlined.data = (guchar *)contents;
+			photo->data.inlined.data = (guchar *) contents;
 			e_contact_set (c, E_CONTACT_PHOTO, (gpointer) photo);
 			dirty = TRUE;
 		}
@@ -492,7 +492,7 @@ bbdb_get_gaim_buddy_list (void)
 
 	xmlFreeDoc (buddy_xml);
 
-	g_slist_foreach (blocked, (GFunc)g_free, NULL);
+	g_slist_foreach (blocked, (GFunc) g_free, NULL);
 	g_slist_free (blocked);
 
 	return buddies;
@@ -514,7 +514,7 @@ free_gaim_body (GaimBuddy *gb)
 static void
 free_buddy_list (GList *blist)
 {
-	g_list_foreach (blist, (GFunc)free_gaim_body, NULL);
+	g_list_foreach (blist, (GFunc) free_gaim_body, NULL);
 	g_list_free (blist);
 }
 
@@ -525,7 +525,7 @@ get_node_text (xmlNodePtr node)
 	    strcmp ((gchar *)node->children->name, "text"))
 		return NULL;
 
-	return g_strdup ((gchar *)node->children->content);
+	return g_strdup ((gchar *) node->children->content);
 }
 
 static gchar *
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index e81411a153..df1d5b3306 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -123,32 +123,32 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 		GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	maincheck = gtk_check_button_new_with_mnemonic (_("_Customize options"));
-	gtk_box_pack_start ((GtkBox *)mainbox, maincheck, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) mainbox, maincheck, TRUE, TRUE, 2);
 
 	box1 = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)mainbox, box1, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) mainbox, box1, TRUE, TRUE, 2);
 
 	g_object_set_data ((GObject*)maincheck, "child", box1);
 
 	/* left-most space, the first one */
 	w1 = gtk_label_new ("");
-	gtk_box_pack_start ((GtkBox *)box1, w1, FALSE, TRUE, 8);
+	gtk_box_pack_start ((GtkBox *) box1, w1, FALSE, TRUE, 8);
 
 	box2 = gtk_vbox_new (FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)box1, box2, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box1, box2, TRUE, TRUE, 2);
 
 	box1 = box2;
 	box2 = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)box1, box2, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box1, box2, TRUE, TRUE, 2);
 
 	w1 = gtk_label_new_with_mnemonic (_("File _name:"));
 	gtk_misc_set_alignment (GTK_MISC (w1), 0.0, 0.5);
-	gtk_box_pack_start ((GtkBox *)box2, w1, FALSE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box2, w1, FALSE, TRUE, 2);
 
 	w2 = gtk_file_chooser_button_new (_("Choose calendar file"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (w2), TRUE);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (w1), w2);
-	gtk_box_pack_start ((GtkBox *)box2, w2, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box2, w2, TRUE, TRUE, 2);
 
 	g_object_set_data (G_OBJECT (maincheck), "file-chooser", w2);
 
@@ -186,21 +186,21 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_signal_connect (G_OBJECT (maincheck), "toggled", G_CALLBACK (maincheck_toggled), source);
 
 	box2 = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)box1, box2, FALSE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box1, box2, FALSE, TRUE, 2);
 
 	w1 = gtk_label_new_with_mnemonic (_("Re_fresh:"));
 	gtk_misc_set_alignment (GTK_MISC (w1), 0.0, 0.5);
-	gtk_box_pack_start ((GtkBox *)box2, w1, FALSE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box2, w1, FALSE, TRUE, 2);
 
 	w2 = gtk_combo_box_text_new ();
 	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("On open"));
 	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("On file change"));
 	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w2), _("Periodically"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (w1), w2);
-	gtk_box_pack_start ((GtkBox *)box2, w2, FALSE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box2, w2, FALSE, TRUE, 2);
 
 	value = e_source_get_property (source, "refresh-type");
-	gtk_combo_box_set_active ((GtkComboBox *)w2, (value && *value && !value[1] && value[0] >= '0' && value[0] <= '2') ? value[0] - '0' : 0);
+	gtk_combo_box_set_active ((GtkComboBox *) w2, (value && *value && !value[1] && value[0] >= '0' && value[0] <= '2') ? value[0] - '0' : 0);
 
 	w1 = w2;
 	w2 = e_plugin_util_add_refresh (NULL, NULL, source, "refresh");
@@ -211,7 +211,7 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_signal_connect (G_OBJECT (w1), "changed", G_CALLBACK (refresh_type_changed), source);
 
 	w2 = e_plugin_util_add_check (NULL, _("Force read _only"), source, "custom-file-readonly", "1", NULL);
-	gtk_box_pack_start ((GtkBox *)box1, w2, TRUE, TRUE, 2);
+	gtk_box_pack_start ((GtkBox *) box1, w2, TRUE, TRUE, 2);
 
 	gtk_widget_show_all (mainbox);
 
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index f9d1180429..73ab8c8b3f 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -75,7 +75,7 @@ e_plugin_lib_enable (EPlugin *epl, gint enable)
 
 	/* Add the categories icons if we don't have them. */
 	for (l = saved_cats; l; l = g_list_next (l)) {
-		if (!strcmp ((const gchar *)l->data, tmp))
+		if (!strcmp ((const gchar *) l->data, tmp))
 			goto exit;
 	}
 
diff --git a/plugins/contacts-map/contacts-map.c b/plugins/contacts-map/contacts-map.c
index 24297e0243..d1954297fd 100644
--- a/plugins/contacts-map/contacts-map.c
+++ b/plugins/contacts-map/contacts-map.c
@@ -112,7 +112,7 @@ show_map_general (ESourceSelector *selector)
 	gdouble *min_lng = NULL;
 	gdouble *max_lng = NULL;
 
-	primary_source = (ESource*)e_source_selector_get_primary_selection (selector);
+	primary_source = (ESource*) e_source_selector_get_primary_selection (selector);
 	uri = e_source_get_uri (primary_source);
 	book = e_book_new_from_uri (uri, NULL);
 
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index 47e4139cda..c2ca34cdb7 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -158,7 +158,7 @@ org_gnome_evolution_readdbx_supported (EPlugin *epl, EImportTarget *target)
 		return FALSE;
 	}
 
-	s = (EImportTargetURI *)target;
+	s = (EImportTargetURI *) target;
 
 	if (s->uri_src == NULL) {
 		return TRUE;
@@ -240,7 +240,7 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei,
 	hbox = gtk_hbox_new (FALSE, 0);
 
 	w = gtk_label_new_with_mnemonic (_("_Destination folder:"));
-	gtk_box_pack_start ((GtkBox *)hbox, w, FALSE, TRUE, 6);
+	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
 
 	label = GTK_LABEL (w);
 
@@ -253,13 +253,13 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei,
 		_("Select folder to import into"));
 
 	gtk_label_set_mnemonic_widget (label, w);
-	em_folder_selection_button_set_selection ((EMFolderSelectionButton *)w, select_uri);
-	folder_selected ((EMFolderSelectionButton *)w, (EImportTargetURI *)target);
+	em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, select_uri);
+	folder_selected ((EMFolderSelectionButton *) w, (EImportTargetURI *) target);
 	g_signal_connect (w, "selected", G_CALLBACK(folder_selected), target);
-	gtk_box_pack_start ((GtkBox *)hbox, w, FALSE, TRUE, 6);
+	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6);
 
 	w = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)w, hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) w, hbox, FALSE, FALSE, 0);
 	gtk_widget_show_all (w);
 
 	g_free (select_uri);
@@ -577,10 +577,10 @@ dbx_import_file (DbxImporter *m)
 	gint missing = 0;
 	m->status_what = NULL;
 	filename = g_filename_from_uri (
-		((EImportTargetURI *)m->target)->uri_src, NULL, NULL);
+		((EImportTargetURI *) m->target)->uri_src, NULL, NULL);
 
 	/* Destination folder, was set in our widget */
-	m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest);
+	m->parent_uri = g_strdup (((EImportTargetURI *) m->target)->uri_dest);
 
 	cancellable = e_activity_get_cancellable (m->base.activity);
 
@@ -602,7 +602,7 @@ dbx_import_file (DbxImporter *m)
 	camel_folder_freeze (folder);
 
 	filename = g_filename_from_uri (
-		((EImportTargetURI *)m->target)->uri_src, NULL, NULL);
+		((EImportTargetURI *) m->target)->uri_src, NULL, NULL);
 	m->dbx_fd = g_open (filename, O_RDONLY, 0);
 	g_free (filename);
 
@@ -657,7 +657,7 @@ dbx_import_file (DbxImporter *m)
 
 		msg = camel_mime_message_new ();
 		if (!camel_mime_part_construct_from_parser_sync (
-			(CamelMimePart *)msg, mp, NULL, NULL)) {
+			(CamelMimePart *) msg, mp, NULL, NULL)) {
 			/* set exception? */
 			g_object_unref (msg);
 			g_object_unref (mp);
@@ -707,7 +707,7 @@ dbx_import_import (DbxImporter *m,
 static void
 dbx_import_imported (DbxImporter *m)
 {
-	e_import_complete (m->target->import, (EImportTarget *)m->target);
+	e_import_complete (m->target->import, (EImportTarget *) m->target);
 }
 
 static void
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 23f474c5ef..eb0ab3fb2f 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -102,7 +102,7 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 		index_column < priv->email_custom_header_details->len; index_column++) {
 
 		sub_combo_box_get = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,index_column);
-		selected_item = gtk_combo_box_get_active ((GtkComboBox *)sub_combo_box_get->header_value_combo_box);
+		selected_item = gtk_combo_box_get_active ((GtkComboBox *) sub_combo_box_get->header_value_combo_box);
 		g_array_append_val (priv->header_index_type, selected_item);
 	}
 }
@@ -142,9 +142,9 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 		sub_combo_box_fill = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,set_index_column);
 
 		if (priv->flag == 0) {
-			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
+			gtk_combo_box_set_active ((GtkComboBox *) sub_combo_box_fill->header_value_combo_box,0);
 		} else {
-			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
+			gtk_combo_box_set_active ((GtkComboBox *) sub_combo_box_fill->header_value_combo_box,
 				g_array_index (priv->header_index_type, gint, set_index_column));
 		}
 	}
@@ -425,7 +425,7 @@ epech_dialog_init (GObject *object)
 static void
 epech_dialog_finalize (GObject *object)
 {
-	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object;
+	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object;
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 
 	g_return_if_fail (EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (mch));
@@ -461,7 +461,7 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 	CustomSubHeader *temp_header_value_ptr;
 	gint index_subtype,sub_type_index;
 
-	composer = (EMsgComposer *)data;
+	composer = (EMsgComposer *) data;
 	priv = dialog->priv;
 
 	if (state == GTK_RESPONSE_OK) {
@@ -515,7 +515,7 @@ static gint
 epech_check_existing_composer_window (gconstpointer compowindow, gconstpointer other_compowindow)
 {
 	if ((compowindow) && (other_compowindow)) {
-		if (((EmailCustomHeaderWindow *)compowindow)->epech_window == (GdkWindow *)other_compowindow) {
+		if (((EmailCustomHeaderWindow *) compowindow)->epech_window == (GdkWindow *) other_compowindow) {
 			return 0;
 		}
 	}
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index b3f58410af..5ca435a0e6 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -372,7 +372,7 @@ static void launch_editor (GtkAction *action, EMsgComposer *composer)
 
 	disable_composer (composer);
 
-	editor_thread = g_thread_create ((GThreadFunc)async_external_editor, composer, FALSE, NULL);
+	editor_thread = g_thread_create ((GThreadFunc) async_external_editor, composer, FALSE, NULL);
 }
 
 static GtkActionEntry entries[] = {
@@ -427,7 +427,7 @@ editor_running (void)
 {
 	gboolean running = FALSE;
 
-	g_thread_foreach ((GFunc)editor_running_thread_func, &running);
+	g_thread_foreach ((GFunc) editor_running_thread_func, &running);
 
 	return running;
 }
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 35fbecacd0..9444658cd5 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -80,7 +80,7 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data)
 	EAccount *modified_account;
 	gboolean use_imap = g_getenv ("USE_IMAP") != NULL;
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	original_account = target_account->original_account;
 	modified_account = target_account->modified_account;
 
@@ -272,7 +272,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	ui = g_new0 (EPImapFeaturesData, 1);
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	account = target_account->modified_account;
 
 	if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://")))
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index d93f2f5384..7a620a6db8 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -230,7 +230,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet
 {
 	EIterator *it;
 
-	it = e_list_get_iterator ((EList *)pitip->accounts);
+	it = e_list_get_iterator ((EList *) pitip->accounts);
 
 	if (!pitip->to_address && pitip->msg && pitip->folder) {
 		EAccount *account = em_utils_guess_account (pitip->msg, pitip->folder);
@@ -388,7 +388,7 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp)
 	if (param)
 		pitip->from_name = g_strdup (icalparameter_get_cn (param));
 
-	it = e_list_get_iterator ((EList *)pitip->accounts);
+	it = e_list_get_iterator ((EList *) pitip->accounts);
 	while (e_iterator_is_valid (it)) {
 		const EAccount *account = e_iterator_get (it);
 
@@ -1011,7 +1011,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
 			message_foreach_part (part, part_list);
 		}
 	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
-		message_foreach_part ((CamelMimePart *)containee, part_list);
+		message_foreach_part ((CamelMimePart *) containee, part_list);
 	}
 }
 
@@ -1180,7 +1180,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response)
 			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);
@@ -2318,7 +2318,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	shell = e_shell_get_default ();
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	info = (struct _itip_puri *) em_format_find_puri ((EMFormat *)efh, pobject->classid);
+	info = (struct _itip_puri *) em_format_find_puri ((EMFormat *) efh, pobject->classid);
 
 	/* Accounts */
 	info->accounts = e_get_account_list ();
@@ -2341,7 +2341,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	gtk_container_add (GTK_CONTAINER (eb), info->view);
 	gtk_widget_show (info->view);
 
-	response_enabled = in_proper_folder (((EMFormat*)efh)->folder);
+	response_enabled = in_proper_folder (((EMFormat*) efh)->folder);
 
 	if (!response_enabled) {
 		itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_HIDE_ALL);
@@ -2690,7 +2690,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 	    !camel_folder_get_message_user_flag (target->format->folder, target->format->uid, "$has_cal"))
 		camel_folder_set_message_user_flag (target->format->folder, target->format->uid, "$has_cal", TRUE);
 
-	puri = (struct _itip_puri *)em_format_add_puri (target->format, sizeof (struct _itip_puri), classid, target->part, itip_attachment_frame);
+	puri = (struct _itip_puri *) em_format_add_puri (target->format, sizeof (struct _itip_puri), classid, target->part, itip_attachment_frame);
 
 	em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
 
@@ -2891,7 +2891,7 @@ itip_attachment_frame (EMFormat *emf,
                        EMFormatPURI *puri,
                        GCancellable *cancellable)
 {
-	struct _itip_puri *info = (struct _itip_puri *)puri;
+	struct _itip_puri *info = (struct _itip_puri *) puri;
 
 	info->handle->handler (
 		emf, stream, info->puri.part,
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index ba7d84c09c..88b5c81893 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -365,7 +365,7 @@ can_support_actions (void)
 			}
 		}
 
-		g_list_foreach (caps, (GFunc)g_free, NULL);
+		g_list_foreach (caps, (GFunc) g_free, NULL);
 		g_list_free (caps);
 	}
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 558489578a..1deca6d4f1 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -433,7 +433,7 @@ report_error_idle (const gchar *format, const gchar *param)
 	err->param = g_strdup (param);
 
 	g_usleep (250);
-	g_idle_add ((GSourceFunc)do_report_error, err);
+	g_idle_add ((GSourceFunc) do_report_error, err);
 }
 
 struct _manage_comp
@@ -869,7 +869,7 @@ do_mail_to_event (AsyncData *data)
 
 		if (mcs) {
 			/* process this in the main thread, as we may ask user too */
-			g_idle_add ((GSourceFunc)do_manage_comp_idle, mcs);
+			g_idle_add ((GSourceFunc) do_manage_comp_idle, mcs);
 		}
 	}
 
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 50b0d2852a..71bcd41f56 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -122,7 +122,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream
 		part = camel_multipart_get_part (mp, i);
 
 		if (part != except) {
-			CamelMultipart *multipart = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part);
+			CamelMultipart *multipart = (CamelMultipart *) camel_medium_get_content ((CamelMedium *) part);
 
 			if (CAMEL_IS_MULTIPART (multipart)) {
 				export_as_attachments (multipart, format, stream, except);
@@ -136,7 +136,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream
 void
 org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t)
 {
-	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)t->part);
+	CamelMultipart *mp = (CamelMultipart *) camel_medium_get_content ((CamelMedium *) t->part);
 	CamelMimePart *part, *display_part = NULL, *calendar_part = NULL;
 	gint i, nparts, partidlen, displayid = 0, calendarid = 0;
 
@@ -292,7 +292,7 @@ org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookIte
 	gtk_widget_show (check);
 	g_signal_connect (check, "toggled", G_CALLBACK (epp_show_suppressed_toggled), NULL);
 
-	dropdown = (GtkComboBox *)gtk_combo_box_new ();
+	dropdown = (GtkComboBox *) gtk_combo_box_new ();
 	cell = gtk_cell_renderer_text_new ();
 	store = gtk_list_store_new (1, G_TYPE_STRING);
 	for (i = 0; i < G_N_ELEMENTS (epp_options); i++) {
@@ -300,16 +300,16 @@ org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookIte
 		gtk_list_store_set (store, &iter, 0, _(epp_options[i].label), -1);
 	}
 
-	gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE);
+	gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE);
 	gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL);
-	gtk_combo_box_set_model (dropdown, (GtkTreeModel *)store);
+	gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store);
 	/*gtk_combo_box_set_active(dropdown, -1);*/
 	gtk_combo_box_set_active (dropdown, epp_mode);
-	gtk_widget_show ((GtkWidget *)dropdown);
+	gtk_widget_show ((GtkWidget *) dropdown);
 
 	dropdown_label = gtk_label_new_with_mnemonic (_("HTML _Mode"));
 	gtk_widget_show (dropdown_label);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (dropdown_label), (GtkWidget *)dropdown);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (dropdown_label), (GtkWidget *) dropdown);
 
 	info = gtk_label_new (NULL);
 	gtk_misc_set_alignment (GTK_MISC (info), 0.0, 0.5);
@@ -321,14 +321,14 @@ org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookIte
 	g_signal_connect (dropdown, "changed", G_CALLBACK(epp_mode_changed), info);
 
 	g_object_get (data->parent, "n-rows", &i, NULL);
-	gtk_table_attach ((GtkTable *)data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-	gtk_table_attach ((GtkTable *)data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0);
-	gtk_table_attach ((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
-	gtk_table_attach ((GtkTable *)data->parent, info, 1, 2, i + 2, i + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, (GtkWidget *) dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+	gtk_table_attach ((GtkTable *) data->parent, info, 1, 2, i + 2, i + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* since this isnt dynamic, we don't need to track each item */
 
-	return (GtkWidget *)dropdown;
+	return (GtkWidget *) dropdown;
 }
 
 gint e_plugin_lib_enable (EPlugin *ep, gint enable);
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 603e739fe5..e17c50ad72 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -144,7 +144,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
 		return FALSE;
 	}
 
-	s = (EImportTargetURI *)target;
+	s = (EImportTargetURI *) target;
 
 	if (s->uri_src == NULL) {
 		return TRUE;
@@ -338,19 +338,19 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI
 	w = gtk_check_button_new_with_mnemonic (_("A_ppointments"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target);
-	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
 
 	/* Tasks */
 	w = gtk_check_button_new_with_mnemonic (_("_Tasks"));
-	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target);
-	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
 
 	/* Journal */
 	w = gtk_check_button_new_with_mnemonic (_("_Journal entries"));
-	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_journal_toggle_cb), target);
-	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
 
 	gtk_widget_show_all (framebox);
 
@@ -474,8 +474,8 @@ pst_import_file (PstImporter *m)
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 	session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
 
-	filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL);
-	m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */
+	filename = g_filename_from_uri (((EImportTargetURI *) m->target)->uri_src, NULL, NULL);
+	m->parent_uri = g_strdup (((EImportTargetURI *) m->target)->uri_dest); /* Destination folder, was set in our widget */
 
 	camel_operation_push_message (NULL, _("Importing '%s'"), filename);
 
@@ -741,7 +741,7 @@ pst_create_folder (PstImporter *m)
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 	session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
 
-	parent = ((EImportTargetURI *)m->target)->uri_dest;
+	parent = ((EImportTargetURI *) m->target)->uri_dest;
 	dest = g_strdup (m->folder_uri);
 
 	g_assert (g_str_has_prefix (dest, parent));
@@ -891,7 +891,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		/*g_message ("  Email headers... %s...", item->email->header);*/
 
 		stream = camel_stream_mem_new_with_buffer (item->email->header.str, strlen (item->email->header.str));
-		if (!camel_data_wrapper_construct_from_stream_sync ((CamelDataWrapper *)msg, stream, NULL, NULL))
+		if (!camel_data_wrapper_construct_from_stream_sync ((CamelDataWrapper *) msg, stream, NULL, NULL))
 			g_warning ("Error reading headers, skipped");
 
 	} else {
@@ -1556,7 +1556,7 @@ pst_error_msg (const gchar *fmt, ...)
 static void
 pst_import_imported (PstImporter *m)
 {
-	e_import_complete (m->target->import, (EImportTarget *)m->target);
+	e_import_complete (m->target->import, (EImportTarget *) m->target);
 }
 
 static void
@@ -1600,7 +1600,7 @@ pst_status_timeout (gpointer data)
 		pc = importer->status_pc;
 		g_mutex_unlock (importer->status_lock);
 
-		e_import_status (importer->target->import, (EImportTarget *)importer->target, what, pc);
+		e_import_status (importer->target->import, (EImportTarget *) importer->target, what, pc);
 	}
 
 	return TRUE;
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index d22bc4fa47..8db5ccb1b1 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -61,7 +61,7 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
 	frequency = xmlGetProp (root, (const guchar *)"frequency");
 	username = xmlGetProp (root, (const guchar *)"username");
 
-	euri = e_uri_new ((const gchar *)location);
+	euri = e_uri_new ((const gchar *) location);
 
 	if (!euri) {
 		g_warning ("Could not form the uri for %s \n", location);
@@ -71,7 +71,7 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
 	if (euri->user)
 		g_free (euri->user);
 
-	euri->user = g_strdup ((const gchar *)username);
+	euri->user = g_strdup ((const gchar *) username);
 
 	temp = e_uri_to_string (euri, FALSE);
 	uri->location = g_strdup_printf ("dav://%s", strstr (temp, "//") + 2);
@@ -79,9 +79,9 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
 	e_uri_free (euri);
 
 	if (enabled != NULL)
-		uri->enabled = atoi ((gchar *)enabled);
+		uri->enabled = atoi ((gchar *) enabled);
 	if (frequency != NULL)
-		uri->publish_frequency = atoi ((gchar *)frequency);
+		uri->publish_frequency = atoi ((gchar *) frequency);
 	uri->publish_format = URI_PUBLISH_AS_FB;
 
 	password = e_passwords_get_password ("Calendar", (gchar *)location);
@@ -129,7 +129,7 @@ e_publish_uri_from_xml (const gchar *xml)
 	GSList *events = NULL;
 	EPublishUri *uri;
 
-	doc = xmlParseDoc ((const guchar *)xml);
+	doc = xmlParseDoc ((const guchar *) xml);
 	if (doc == NULL)
 		return NULL;
 
@@ -154,18 +154,18 @@ e_publish_uri_from_xml (const gchar *xml)
 	fb_duration_type = xmlGetProp (root, (xmlChar *)"fb_duration_type");
 
 	if (location != NULL)
-		uri->location = (gchar *)location;
+		uri->location = (gchar *) location;
 	if (enabled != NULL)
-		uri->enabled = atoi ((gchar *)enabled);
+		uri->enabled = atoi ((gchar *) enabled);
 	if (frequency != NULL)
-		uri->publish_frequency = atoi ((gchar *)frequency);
+		uri->publish_frequency = atoi ((gchar *) frequency);
 	if (format != NULL)
-		uri->publish_format = atoi ((gchar *)format);
+		uri->publish_format = atoi ((gchar *) format);
 	if (publish_time != NULL)
-		uri->last_pub_time = (gchar *)publish_time;
+		uri->last_pub_time = (gchar *) publish_time;
 
 	if (fb_duration_value)
-		uri->fb_duration_value = atoi ((gchar *)fb_duration_value);
+		uri->fb_duration_value = atoi ((gchar *) fb_duration_value);
 	else
 		uri->fb_duration_value = -1;
 
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 19df46826a..635e1192c4 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -866,7 +866,7 @@ em_junk_sa_init (void)
 		G_UNLOCK (socket_path);
 
 		gconf_client_notify_add(em_junk_sa_gconf, "/apps/evolution/mail/junk/sa",
-					(GConfClientNotifyFunc)em_junk_sa_setting_notify,
+					(GConfClientNotifyFunc) em_junk_sa_setting_notify,
 					NULL, NULL, NULL);
 
 		em_junk_sa_spamc_gconf_binary = gconf_client_get_string (em_junk_sa_gconf, "/apps/evolution/mail/junk/sa/spamc_binary", NULL);
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 8bfec0df55..8692908544 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -96,10 +96,10 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type)
 				needquotes = TRUE;
 			switch (type) {
 			case ECALCOMPONENTATTENDEE:
-				str = ((ECalComponentAttendee*)list->data)->value;
+				str = ((ECalComponentAttendee*) list->data)->value;
 				break;
 			case ECALCOMPONENTTEXT:
-				str = ((ECalComponentText*)list->data)->value;
+				str = ((ECalComponentText*) list->data)->value;
 				break;
 			case CONSTCHAR:
 			default:
@@ -109,7 +109,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type)
 			if (!needquotes)
 				needquotes = string_needsquotes (str, config);
 			if (str)
-				tmp = g_string_append (tmp, (const gchar *)str);
+				tmp = g_string_append (tmp, (const gchar *) str);
 			list = g_slist_next (list); cnt++;
 			if (list)
 				tmp = g_string_append (tmp, config->delimiter);
@@ -248,7 +248,7 @@ add_string_to_csv (GString *line, const gchar *value, CsvConfig *config)
 
 		if (needquotes)
 			line = g_string_append (line, config->quote);
-		line = g_string_append (line, (const gchar *)value);
+		line = g_string_append (line, (const gchar *) value);
 		if (needquotes)
 			line = g_string_append (line, config->quote);
 	}
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 462f4f2a31..084250e70c 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -101,10 +101,10 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type)
 
 			switch (type) {
 			case ECALCOMPONENTATTENDEE:
-				str = ((ECalComponentAttendee*)list->data)->value;
+				str = ((ECalComponentAttendee*) list->data)->value;
 				break;
 			case ECALCOMPONENTTEXT:
-				str = ((ECalComponentText*)list->data)->value;
+				str = ((ECalComponentText*) list->data)->value;
 				break;
 			case CONSTCHAR:
 			default:
@@ -124,7 +124,7 @@ add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric)
 {
 	if (nummeric) {
 		gchar *value = g_strdup_printf ("%d", *nummeric);
-		xmlNodePtr cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)value);
+		xmlNodePtr cur_node = xmlNewChild (node, NULL, (guchar *) tag, (guchar *) value);
 		xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (const guchar *)"http://www.w3.org/2001/XMLSchema#integer");
 		g_free (value);
 	}
@@ -146,7 +146,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time)
 		 * */
 		e_utf8_strftime (str, 200, _("%FT%T"), &mytm);
 
-		cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)str);
+		cur_node = xmlNewChild (node, NULL, (guchar *) tag, (guchar *) str);
 
 		/* Not sure about this property */
 		timezone = calendar_config_get_timezone ();
@@ -163,7 +163,7 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value)
 {
 	if (value) {
 		xmlNodePtr cur_node = NULL;
-		cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)value);
+		cur_node = xmlNewChild (node, NULL, (guchar *) tag, (guchar *) value);
 		xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (const guchar *)"http://www.w3.org/2001/XMLSchema#string");
 	}
 }
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index b97926adfe..6f287c3168 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -655,7 +655,7 @@ fill_template (CamelMimeMessage *message, CamelMimePart *template)
 		camel_data_wrapper_decode_to_stream_sync (camel_medium_get_content (CAMEL_MEDIUM (message_part)), stream, NULL, NULL);
 		camel_stream_flush (stream, NULL, NULL);
 		byte_array = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (stream));
-		message_body = g_string_new_len ((gchar *)byte_array->data, byte_array->len);
+		message_body = g_string_new_len ((gchar *) byte_array->data, byte_array->len);
 		g_object_unref (stream);
 
 		if (template_html && !message_html) {
@@ -836,7 +836,7 @@ action_reply_with_template_cb (GtkAction *action,
 	template = camel_folder_get_message_sync (template_folder, uid, NULL, NULL);
 
 	mail_get_message (folder, uids->pdata[0], create_new_message,
-		(gpointer)template, mail_msg_unordered_push);
+		(gpointer) template, mail_msg_unordered_push);
 
 	g_object_unref (G_OBJECT (action));
 
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 0f97512757..0a87418f01 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -103,7 +103,7 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t)
 	out = camel_stream_fs_new_with_name (name, O_RDWR|O_CREAT, 0666, NULL);
 	if (out == NULL)
 	    goto fail;
-	content = camel_medium_get_content ((CamelMedium *)t->part);
+	content = camel_medium_get_content ((CamelMedium *) t->part);
 	if (content == NULL)
 		goto fail;
 	if (camel_data_wrapper_decode_to_stream_sync (content, out, NULL, NULL) == -1
@@ -134,7 +134,7 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t)
 	camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed");
 	camel_multipart_set_boundary (mp, NULL);
 
-	camel_medium_set_content ((CamelMedium *)mainpart, (CamelDataWrapper *)mp);
+	camel_medium_set_content ((CamelMedium *) mainpart, (CamelDataWrapper *) mp);
 
 	while ((d = readdir (dir))) {
 		CamelMimePart *part;
@@ -159,12 +159,12 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t)
 		part = camel_mime_part_new ();
 		camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BINARY);
 
-		camel_medium_set_content ((CamelMedium *)part, content);
+		camel_medium_set_content ((CamelMedium *) part, content);
 		g_object_unref (content);
 
 		type = em_format_snoop_type (part);
 		if (type)
-		    camel_data_wrapper_set_mime_type ((CamelDataWrapper *)part, type);
+		    camel_data_wrapper_set_mime_type ((CamelDataWrapper *) part, type);
 
 		camel_mime_part_set_filename (part, d->d_name);
 
@@ -930,7 +930,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         filename = NULL;
         if ((filename=MAPIFindUserProp (&(tnef->MapiProperties),
                         PROP_TAG (PT_LONG, 0x8201))) != MAPI_UNDEFINED) {
-            dword_ptr = (DWORD*)filename->data;
+            dword_ptr = (DWORD*) filename->data;
             fprintf(fptr, "SEQUENCE:%i\n", (gint) *dword_ptr);
         }
         if ((filename=MAPIFindProperty (&(tnef->MapiProperties),
@@ -1092,7 +1092,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
         filename = NULL;
         if ((filename=MAPIFindUserProp (&(tnef->MapiProperties),
                         PROP_TAG (PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) {
-            dword_ptr = (DWORD*)filename->data;
+            dword_ptr = (DWORD*) filename->data;
             fprintf(fptr, "CLASS:" );
             if (*dword_ptr == 1) {
                 fprintf(fptr,"PRIVATE\n");
@@ -1226,7 +1226,7 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
         filename = MAPIFindUserProp (&(tnef->MapiProperties), \
                         PROP_TAG (PT_BOOLEAN, 0x8506));
         if (filename != MAPI_UNDEFINED) {
-            dword_ptr = (DWORD*)filename->data;
+            dword_ptr = (DWORD*) filename->data;
             fprintf(fptr, "CLASS:" );
             if (*dword_ptr == 1) {
                 fprintf(fptr,"PRIVATE\n");