Coding style cleanups.

33 files changed, 154 insertions, 154 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index f3421ef31a..fd79d1f80c 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1486,7 +1486,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	e_cal_component_get_description_list (comp, &text_list);
 
 	if (text_list) {
-		text = *((ECalComponentText *)text_list->data);
+		text = *((ECalComponentText *) text_list->data);
 		if (text.value)
 			description = text.value;
 		else
@@ -2103,14 +2103,14 @@ remove_cqa (ClientAlarms *ca, ECalComponentId *id, CompQueuedAlarms *cqa)
 static gboolean
 remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
 
-	ClientAlarms *ca = (ClientAlarms *)userdata;
+	ClientAlarms *ca = (ClientAlarms *) userdata;
 
 	debug (("..."));
 
 /*	if (!g_hash_table_size (ca->uid_alarms_hash)) */
 /*		return; */
 
-	remove_cqa (ca, (ECalComponentId *)key, (CompQueuedAlarms *) value);
+	remove_cqa (ca, (ECalComponentId *) key, (CompQueuedAlarms *) value);
 
 	return TRUE;
 }
@@ -2121,7 +2121,7 @@ remove_client_alarms (ClientAlarms *ca)
 {
 	debug (("size %d", g_hash_table_size (ca->uid_alarms_hash)));
 
-	g_hash_table_foreach_remove  (ca->uid_alarms_hash, (GHRFunc)remove_comp_by_id, ca);
+	g_hash_table_foreach_remove  (ca->uid_alarms_hash, (GHRFunc) remove_comp_by_id, ca);
 
 	/* The hash table should be empty now */
 	g_return_if_fail (g_hash_table_size (ca->uid_alarms_hash) == 0);
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index b5f57cebc3..29fdb4b2cb 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -317,7 +317,7 @@ void
 calendar_config_free_day_second_zones (GSList *zones)
 {
 	if (zones) {
-		g_slist_foreach (zones, (GFunc)g_free, NULL);
+		g_slist_foreach (zones, (GFunc) g_free, NULL);
 		g_slist_free (zones);
 	}
 }
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 6d4219c2b4..6b234f6cce 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -820,7 +820,7 @@ get_widgets (Dialog *dialog)
 			N_("Send an email")
 		};
 
-		GtkComboBox *combo = (GtkComboBox*)dialog->action_combo;
+		GtkComboBox *combo = (GtkComboBox*) dialog->action_combo;
 		GtkCellRenderer *cell;
 		GtkListStore *store;
 		gint i;
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 0dbf9f81d0..4476bc4c62 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -162,7 +162,7 @@ edit_clicked_cb (GtkButton *button, gpointer data)
 		return;
 	}
 
-	alarm = (ECalComponentAlarm *)e_alarm_list_get_alarm (dialog->list_store, &iter);
+	alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (dialog->list_store, &iter);
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog->list_store), &iter);
 
 	if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) {
@@ -308,7 +308,7 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 {
 	Dialog *dialog;
 
-	dialog = (Dialog *)g_new (Dialog, 1);
+	dialog = (Dialog *) g_new (Dialog, 1);
 	dialog->ecal = ecal;
 	dialog->list_store = list_store;
 
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index c03e53fd2f..5981076ee6 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -423,12 +423,12 @@ cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGr
 	gconf = gconf_client_get_default ();
 	sdialog->source_list = e_source_list_new_for_gconf (gconf, conf_key);
 	sdialog->menu_source_groups = g_slist_copy (e_source_list_peek_groups (sdialog->source_list));
-	sdialog->source_group = (ESourceGroup *)sdialog->menu_source_groups->data;
+	sdialog->source_group = (ESourceGroup *) sdialog->menu_source_groups->data;
 
 	g_object_unref (gconf);
 
 	if (group)
-		sdialog->source_group = (ESourceGroup *)group;
+		sdialog->source_group = (ESourceGroup *) group;
 }
 
 /**
@@ -484,7 +484,7 @@ calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *
 
 	/* forces initial validation */
 	if (!sdialog->original_source)
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
+		e_config_target_changed ((EConfig *) ec, E_CONFIG_TARGET_CHANGED_STATE);
 
 	return;
 }
@@ -540,7 +540,7 @@ calendar_setup_edit_task_list (GtkWindow *parent, ESource *source)
 
 	/* forces initial validation */
 	if (!sdialog->original_source)
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
+		e_config_target_changed ((EConfig *) ec, E_CONFIG_TARGET_CHANGED_STATE);
 
 	return;
 }
@@ -596,7 +596,7 @@ calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source)
 
 	/* forces initial validation */
 	if (!sdialog->original_source)
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
+		e_config_target_changed ((EConfig *) ec, E_CONFIG_TARGET_CHANGED_STATE);
 
 	return;
 }
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 1d4c74e43c..983b42cdee 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -841,12 +841,12 @@ action_save_cb (GtkAction *action,
 		ECalComponentVType vtype = e_cal_component_get_vtype (editor->priv->comp);
 
 		if (vtype == E_CAL_COMPONENT_EVENT)
-			response = em_utils_prompt_user ((GtkWindow *)widget,
+			response = em_utils_prompt_user ((GtkWindow *) widget,
 							 NULL,
 							 "calendar:ask-send-event-pending-download",
 							  NULL);
 		else
-			response = em_utils_prompt_user ((GtkWindow *)widget,
+			response = em_utils_prompt_user ((GtkWindow *) widget,
 							 NULL,
 							 "calendar:ask-send-task-pending-download",
 							  NULL);
@@ -2959,7 +2959,7 @@ fill_widgets (CompEditor *editor)
 		g_signal_handlers_unblock_by_func (
 			store, G_CALLBACK (attachment_store_changed_cb),
 			editor);
-		g_slist_foreach (attachment_list, (GFunc)g_free, NULL);
+		g_slist_foreach (attachment_list, (GFunc) g_free, NULL);
 		g_slist_free (attachment_list);
 	}
 
@@ -3369,7 +3369,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 
 		camel_mime_part_set_content_id (mime_part, NULL);
 
-		cal_mime_attach->encoded_data = (gchar *)buffer;
+		cal_mime_attach->encoded_data = (gchar *) buffer;
 		cal_mime_attach->length = byte_array->len;
 		cal_mime_attach->filename =
 			g_strdup (camel_mime_part_get_filename (mime_part));
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 850728449e..f5ac9c9ce4 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -216,19 +216,19 @@ prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *par
 	gtk_frame_set_label_widget ((GtkFrame *) frame, label);
 	gtk_frame_set_label_align ((GtkFrame *) frame, 0, 0);
 	gtk_container_add (GTK_CONTAINER (vbox), frame);
-	gtk_frame_set_shadow_type ((GtkFrame *)frame, GTK_SHADOW_NONE);
+	gtk_frame_set_shadow_type ((GtkFrame *) frame, GTK_SHADOW_NONE);
 
 	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy ((GtkScrolledWindow *)sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
 	entry = gtk_text_view_new ();
-	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)sw, entry);
-	gtk_label_set_mnemonic_widget ((GtkLabel *)label, entry);
+	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) sw, entry);
+	gtk_label_set_mnemonic_widget ((GtkLabel *) label, entry);
 	gtk_container_add (GTK_CONTAINER (frame), sw);
 
 	g_signal_connect ((GtkToggleButton *)cb, "toggled", G_CALLBACK (cb_toggled_cb), entry);
 
-	gtk_widget_show_all ((GtkWidget *)dialog);
+	gtk_widget_show_all ((GtkWidget *) dialog);
 
 	ret_val = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index d2fc4ae091..0953e3a9cf 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -495,7 +495,7 @@ is_custom_alarm_store (EAlarmList *alarm_list_store,
 		return FALSE;
 
 	alarm = e_alarm_list_get_alarm (alarm_list_store, &iter);
-	if (is_custom_alarm ((ECalComponentAlarm *)alarm, old_summary, user_units, user_interval, alarm_type))
+	if (is_custom_alarm ((ECalComponentAlarm *) alarm, old_summary, user_units, user_interval, alarm_type))
 		return TRUE;
 
 	valid_iter = gtk_tree_model_iter_next (model, &iter);
@@ -646,7 +646,7 @@ sensitize_widgets (EventPage *epage)
 
 	if (alarm && !priv->alarm_icon) {
 		priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has alarms"), epage);
-		gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6);
+		gtk_box_pack_start ((GtkBox *) priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6);
 	}
 
 	/* The list of organizers is set to be non-editable. Otherwise any
@@ -2867,7 +2867,7 @@ alarm_changed_cb (GtkWidget *widget,
 		}
 		if (!priv->alarm_icon) {
 			priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has alarms"), epage);
-			gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6);
+			gtk_box_pack_start ((GtkBox *) priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6);
 		}
 	} else {
 		e_alarm_list_clear (priv->alarm_list_store);
@@ -3401,7 +3401,7 @@ event_page_get_alarm_page (EventPage *epage)
 	tmp = GW("dialog-vbox1");
 	alarm_page = GW("vbox2");
 	g_object_ref (alarm_page);
-	gtk_container_remove ((GtkContainer *)tmp, alarm_page);
+	gtk_container_remove ((GtkContainer *) tmp, alarm_page);
 
 	return alarm_page;
 }
@@ -3419,7 +3419,7 @@ event_page_get_attendee_page (EventPage *epage)
 
 	apage = priv->list_box;
 	g_object_ref (apage);
-	gtk_container_remove ((GtkContainer *)gtk_widget_get_parent (apage), apage);
+	gtk_container_remove ((GtkContainer *) gtk_widget_get_parent (apage), apage);
 	gtk_widget_hide (priv->attendee_box);
 
 	return apage;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index e708cefc0c..e055072959 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1188,7 +1188,7 @@ memo_page_construct (MemoPage *mpage)
 
 		priv->name_selector = e_name_selector_new ();
 		priv->to_entry = get_to_entry (priv->name_selector);
-		gtk_container_add ((GtkContainer *)priv->to_hbox, priv->to_entry);
+		gtk_container_add ((GtkContainer *) priv->to_hbox, priv->to_entry);
 		gtk_widget_show (priv->to_hbox);
 		gtk_widget_show (priv->to_entry);
 		gtk_widget_show (priv->to_button);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index e602157660..8d2701fab2 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -1412,7 +1412,7 @@ make_ending_count_special (RecurrencePage *rpage)
 
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 0));
 	priv->ending_count_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_spin_button_set_numeric ((GtkSpinButton *)priv->ending_count_spin, TRUE);
+	gtk_spin_button_set_numeric ((GtkSpinButton *) priv->ending_count_spin, TRUE);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->ending_count_spin,
 			    FALSE, FALSE, 6);
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index eab2c2c818..070fb6b735 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -86,7 +86,7 @@ have_nonprocedural_alarm (ECalComponent *comp)
 		ECalComponentAlarm *alarm;
 		ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
 
-		alarm = e_cal_component_get_alarm (comp, (const gchar *)l->data);
+		alarm = e_cal_component_get_alarm (comp, (const gchar *) l->data);
 		if (alarm) {
 			e_cal_component_alarm_get_action (alarm, &action);
 			e_cal_component_alarm_free (alarm);
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index 980701e9be..e1204f39b7 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -48,7 +48,7 @@ ecp_target_free (EConfig *ec, EConfigTarget *t)
 	if (ec->target == t) {
 		switch (t->type) {
 		case EC_CONFIG_TARGET_SOURCE: {
-			ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
+			ECalConfigTargetSource *s = (ECalConfigTargetSource *) t;
 
 			if (p->source_changed_id) {
 				g_signal_handler_disconnect (s->source, p->source_changed_id);
@@ -62,12 +62,12 @@ ecp_target_free (EConfig *ec, EConfigTarget *t)
 
 	switch (t->type) {
 	case EC_CONFIG_TARGET_SOURCE: {
-		ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
+		ECalConfigTargetSource *s = (ECalConfigTargetSource *) t;
 		if (s->source)
 			g_object_unref (s->source);
 		break; }
 	case EC_CONFIG_TARGET_PREFS: {
-		ECalConfigTargetPrefs *s = (ECalConfigTargetPrefs *)t;
+		ECalConfigTargetPrefs *s = (ECalConfigTargetPrefs *) t;
 		if (s->gconf)
 			g_object_unref (s->gconf);
 		break; }
@@ -87,12 +87,12 @@ ecp_set_target (EConfig *ec, EConfigTarget *t)
 {
 	struct _ECalConfigPrivate *p = E_CAL_CONFIG (ec)->priv;
 
-	((EConfigClass *)ecp_parent_class)->set_target (ec, t);
+	((EConfigClass *) ecp_parent_class)->set_target (ec, t);
 
 	if (t) {
 		switch (t->type) {
 		case EC_CONFIG_TARGET_SOURCE: {
-			ECalConfigTargetSource *s = (ECalConfigTargetSource *)t;
+			ECalConfigTargetSource *s = (ECalConfigTargetSource *) t;
 
 			p->source_changed_id = g_signal_connect (s->source, "changed", G_CALLBACK (ecp_source_changed), ec);
 			break; }
@@ -106,8 +106,8 @@ ecp_set_target (EConfig *ec, EConfigTarget *t)
 static void
 ecp_class_init (GObjectClass *klass)
 {
-	((EConfigClass *)klass)->set_target = ecp_set_target;
-	((EConfigClass *)klass)->target_free = ecp_target_free;
+	((EConfigClass *) klass)->set_target = ecp_set_target;
+	((EConfigClass *) klass)->target_free = ecp_target_free;
 
 	g_type_class_add_private (klass, sizeof (struct _ECalConfigPrivate));
 }
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index 7d0a9d196d..813b0b799f 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -52,14 +52,14 @@ ece_target_free (EEvent *ev, EEventTarget *t)
 		break; }
 	}
 
-	((EEventClass *)ece_parent)->target_free (ev, t);
+	((EEventClass *) ece_parent)->target_free (ev, t);
 }
 
 static void
 ece_class_init (GObjectClass *klass)
 {
 	klass->finalize = ece_finalize;
-	((EEventClass *)klass)->target_free = ece_target_free;
+	((EEventClass *) klass)->target_free = ece_target_free;
 }
 
 GType
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 723f5e753b..4ac73089bb 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -325,7 +325,7 @@ ecmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 
 	switch (col) {
 	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
-		set_dtend ((ECalModel *)model, comp_data, value);
+		set_dtend ((ECalModel *) model, comp_data, value);
 		break;
 	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
 		set_location (comp_data, value);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 34408b0151..c5ae9f7ce8 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -2816,7 +2816,7 @@ cleanup_content_cb (gpointer user_data)
 
 	e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len);
 
-	g_slist_foreach (slist, (GFunc)g_object_unref, NULL);
+	g_slist_foreach (slist, (GFunc) g_object_unref, NULL);
 	g_slist_free (slist);
 
 	e_flag_set (data->eflag);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index d2548f28b7..d9b7e91ce4 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1897,22 +1897,22 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 
 	tmp = g_markup_printf_escaped ("<b>%s</b>", str);
 	label = gtk_label_new (NULL);
-	gtk_label_set_line_wrap ((GtkLabel *)label, TRUE);
-	gtk_label_set_markup ((GtkLabel *)label, tmp);
+	gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
+	gtk_label_set_markup ((GtkLabel *) label, tmp);
 
 	if (free_text) {
-		g_free ((gchar *)str);
+		g_free ((gchar *) str);
 		str = NULL;
 	}
 
 	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0);
 	ebox = gtk_event_box_new ();
-	gtk_container_add ((GtkContainer *)ebox, hbox);
+	gtk_container_add ((GtkContainer *) ebox, hbox);
 	gtk_widget_modify_bg (ebox, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_SELECTED]));
 	gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
 
-	gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) box, ebox, FALSE, FALSE, 0);
 	g_free (tmp);
 
 	e_cal_component_get_organizer (newcomp, &organiser);
@@ -1931,10 +1931,10 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 
 		label = gtk_label_new (tmp);
 		hbox = gtk_hbox_new (FALSE, 0);
-		gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0);
 		ebox = gtk_event_box_new ();
-		gtk_container_add ((GtkContainer *)ebox, hbox);
-		gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
+		gtk_container_add ((GtkContainer *) ebox, hbox);
+		gtk_box_pack_start ((GtkBox *) box, ebox, FALSE, FALSE, 0);
 
 		g_free (tmp);
 	}
@@ -1945,12 +1945,12 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 		/* To Translators: It will display "Location: PlaceOfTheMeeting" */
 		tmp = g_markup_printf_escaped (_("Location: %s"), str);
 		label = gtk_label_new (NULL);
-		gtk_label_set_markup ((GtkLabel *)label, tmp);
+		gtk_label_set_markup ((GtkLabel *) label, tmp);
 		hbox = gtk_hbox_new (FALSE, 0);
-		gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0);
 		ebox = gtk_event_box_new ();
-		gtk_container_add ((GtkContainer *)ebox, hbox);
-		gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
+		gtk_container_add ((GtkContainer *) ebox, hbox);
+		gtk_box_pack_start ((GtkBox *) box, ebox, FALSE, FALSE, 0);
 		g_free (tmp);
 	}
 	e_cal_component_get_dtstart (newcomp, &dtstart);
@@ -1991,10 +1991,10 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	e_cal_component_free_datetime (&dtend);
 
 	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)hbox, gtk_label_new_with_mnemonic (tmp), FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new_with_mnemonic (tmp), FALSE, FALSE, 0);
 	ebox = gtk_event_box_new ();
-	gtk_container_add ((GtkContainer *)ebox, hbox);
-	gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
+	gtk_container_add ((GtkContainer *) ebox, hbox);
+	gtk_box_pack_start ((GtkBox *) box, ebox, FALSE, FALSE, 0);
 
 	g_free (tmp);
 	g_free (tmp2);
@@ -2003,22 +2003,22 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	tmp = e_calendar_view_get_attendees_status_info (newcomp, pevent->comp_data->client);
 	if (tmp) {
 		hbox = gtk_hbox_new (FALSE, 0);
-		gtk_box_pack_start ((GtkBox *)hbox, gtk_label_new (tmp), FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new (tmp), FALSE, FALSE, 0);
 		ebox = gtk_event_box_new ();
-		gtk_container_add ((GtkContainer *)ebox, hbox);
-		gtk_box_pack_start ((GtkBox *)box, ebox, FALSE, FALSE, 0);
+		gtk_container_add ((GtkContainer *) ebox, hbox);
+		gtk_box_pack_start ((GtkBox *) box, ebox, FALSE, FALSE, 0);
 
 		g_free (tmp);
 	}
 
 	pevent->tooltip = gtk_window_new (GTK_WINDOW_POPUP);
 	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type ((GtkFrame *)frame, GTK_SHADOW_IN);
+	gtk_frame_set_shadow_type ((GtkFrame *) frame, GTK_SHADOW_IN);
 
 	gtk_window_set_type_hint (GTK_WINDOW (pevent->tooltip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
-	gtk_window_move ((GtkWindow *)pevent->tooltip, pevent->x +16, pevent->y+16);
-	gtk_container_add ((GtkContainer *)frame, box);
-	gtk_container_add ((GtkContainer *)pevent->tooltip, frame);
+	gtk_window_move ((GtkWindow *) pevent->tooltip, pevent->x +16, pevent->y+16);
+	gtk_container_add ((GtkContainer *) frame, box);
+	gtk_container_add ((GtkContainer *) pevent->tooltip, frame);
 
 	gtk_widget_show_all (pevent->tooltip);
 
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index bb089f1dd9..37353381bd 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -529,7 +529,7 @@ e_date_time_list_append (EDateTimeList *date_time_list, GtkTreeIter *iter,
 
 	if (g_list_find_custom (
 			date_time_list->list, datetime,
-			(GCompareFunc)compare_datetime) == NULL) {
+			(GCompareFunc) compare_datetime) == NULL) {
 		date_time_list->list = g_list_append (
 			date_time_list->list, copy_datetime (datetime));
 		row_added (date_time_list, g_list_length (date_time_list->list) - 1);
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 5e247a2932..5f8ef0d61b 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -702,7 +702,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
 		}
 
 		/* free memory */
-		g_slist_foreach (categories_pixbufs, (GFunc)g_object_unref, NULL);
+		g_slist_foreach (categories_pixbufs, (GFunc) g_object_unref, NULL);
 		g_slist_free (categories_pixbufs);
 	}
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index b0a2683ce2..b5bd081839 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -2170,7 +2170,7 @@ e_day_view_update_long_event_label (EDayView *day_view,
 			       NULL);
 
 	if (free_text)
-		g_free ((gchar *)summary);
+		g_free ((gchar *) summary);
 
 	if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp))
@@ -3381,7 +3381,7 @@ e_day_view_on_long_event_click (EDayView *day_view,
 	/* Ignore clicks on the EText while editing. */
 	if (pos == E_CALENDAR_VIEW_POS_EVENT
 	    && E_TEXT (event->canvas_item)->editing) {
-		GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*)bevent);
+		GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*) bevent);
 		return;
 	}
 
@@ -3467,7 +3467,7 @@ e_day_view_on_event_click (EDayView *day_view,
 	/* Ignore clicks on the EText while editing. */
 	if (pos == E_CALENDAR_VIEW_POS_EVENT
 	    && E_TEXT (event->canvas_item)->editing) {
-		GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*)bevent);
+		GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*) bevent);
 		return;
 	}
 
@@ -3553,7 +3553,7 @@ e_day_view_on_event_double_click (EDayView *day_view,
 	if (!is_comp_data_valid (event))
 		return;
 
-	e_calendar_view_edit_appointment ((ECalendarView *)day_view, event->comp_data->client, event->comp_data->icalcomp, EDIT_EVENT_AUTODETECT);
+	e_calendar_view_edit_appointment ((ECalendarView *) day_view, event->comp_data->client, event->comp_data->icalcomp, EDIT_EVENT_AUTODETECT);
 }
 
 static void
@@ -3820,7 +3820,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 			e_target_list_add_calendar_targets (target_list, 0);
 			gtk_drag_begin (widget, target_list,
 					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
+					1, (GdkEvent*) mevent);
 			gtk_target_list_unref (target_list);
 		}
 	} else {
@@ -3849,7 +3849,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 		}
 
 		if (event && E_IS_TEXT (event->canvas_item) && E_TEXT (event->canvas_item)->editing) {
-			GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*)mevent);
+			GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*) mevent);
 		}
 	}
 
@@ -3932,7 +3932,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 			e_target_list_add_calendar_targets (target_list, 0);
 			gtk_drag_begin (widget, target_list,
 					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
+					1, (GdkEvent*) mevent);
 			gtk_target_list_unref (target_list);
 		}
 	} else {
@@ -3966,7 +3966,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
 		}
 
 		if (event && E_IS_TEXT (event->canvas_item) && E_TEXT (event->canvas_item)->editing) {
-			GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*)mevent);
+			GNOME_CANVAS_ITEM_GET_CLASS (event->canvas_item)->event (event->canvas_item, (GdkEvent*) mevent);
 		}
 	}
 
@@ -4748,7 +4748,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 		GtkWidget *widget;
 		GdkColor color;
 
-		widget = (GtkWidget *)day_view;
+		widget = (GtkWidget *) day_view;
 
 		color = e_day_view_get_text_color (day_view, event, widget);
 
@@ -4934,7 +4934,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 			GtkWidget *widget;
 			GdkColor color;
 
-			widget = (GtkWidget *)day_view;
+			widget = (GtkWidget *) day_view;
 
 			color = e_day_view_get_text_color (day_view, event, widget);
 
@@ -6280,17 +6280,17 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			g_object_set_data (G_OBJECT (item), "event-day", GINT_TO_POINTER (day));
 
 			data = g_malloc (sizeof (ECalendarViewEventData));
-			pevent->x = ((GdkEventCrossing *)event)->x_root;
-			pevent->y = ((GdkEventCrossing *)event)->y_root;
+			pevent->x = ((GdkEventCrossing *) event)->x_root;
+			pevent->y = ((GdkEventCrossing *) event)->y_root;
 			pevent->tooltip = NULL;
 
-			data->cal_view = (ECalendarView *)day_view;
+			data->cal_view = (ECalendarView *) day_view;
 			data->day = day;
 			data->event_num = event_num;
 			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 			pevent->timeout = g_timeout_add_full (
 				G_PRIORITY_DEFAULT, 500,
-				(GSourceFunc)e_calendar_view_get_tooltips,
+				(GSourceFunc) e_calendar_view_get_tooltips,
 				data, (GDestroyNotify) g_free);
 
 		return TRUE;
@@ -6306,8 +6306,8 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 
 			pevent = tooltip_get_view_event (day_view, day, event_num);
 
-			pevent->x = ((GdkEventMotion *)event)->x_root;
-			pevent->y = ((GdkEventMotion *)event)->y_root;
+			pevent->x = ((GdkEventMotion *) event)->x_root;
+			pevent->y = ((GdkEventMotion *) event)->y_root;
 			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (day_view), "tooltip-window");
 
 			if (pevent->tooltip) {
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 532a06138a..c702bdfd77 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -280,7 +280,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 		if (e_destination_is_evolution_list (des)) {
 			GList *l, *dl;
 
-			dl = (GList *)e_destination_list_get_dests (des);
+			dl = (GList *) e_destination_list_get_dests (des);
 
 			for (l = dl; l; l = l->next) {
 				attendee = e_destination_get_email (l->data);
@@ -330,7 +330,7 @@ e_meeting_list_view_remove_all_attendees_from_name_selector (EMeetingListView *v
 			if (e_destination_is_evolution_list (des)) {
 				GList *m, *dl;
 
-				dl = (GList *)e_destination_list_get_dests (des);
+				dl = (GList *) e_destination_list_get_dests (des);
 
 				for (m = dl; m; m = m->next) {
 					g_object_unref (m->data);
@@ -381,7 +381,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 				e_meeting_attendee_set_role (attendee, e_meeting_attendee_get_role (existing_attendee));
 				e_meeting_attendee_set_rsvp (attendee, e_meeting_attendee_get_rsvp (existing_attendee));
 				e_meeting_attendee_set_status (attendee, ICAL_PARTSTAT_NEEDSACTION);
-				e_meeting_attendee_set_delfrom (attendee, (gchar *)e_meeting_attendee_get_delfrom (existing_attendee));
+				e_meeting_attendee_set_delfrom (attendee, (gchar *) e_meeting_attendee_get_delfrom (existing_attendee));
 			}
 			e_meeting_list_view_add_attendee_to_name_selector (E_MEETING_LIST_VIEW (view), attendee);
 			g_signal_emit_by_name (G_OBJECT (view), "attendee_added", (gpointer) attendee);
@@ -506,7 +506,7 @@ status_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *tex
 static void
 ense_update (GtkWidget *w, gpointer data1, gpointer user_data)
 {
-	gtk_cell_editable_editing_done ((GtkCellEditable *)w);
+	gtk_cell_editable_editing_done ((GtkCellEditable *) w);
 }
 
 static void
@@ -906,7 +906,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
 	attendees = e_meeting_store_get_attendees (store);
 
 	/* get all the email ids of the attendees */
-	g_ptr_array_foreach ((GPtrArray *)attendees, (GFunc) add_to_list, &la);
+	g_ptr_array_foreach ((GPtrArray *) attendees, (GFunc) add_to_list, &la);
 
 	for (i = 0; sections[i] != NULL; i++) {
 		EDestinationStore *destination_store;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index c02eec9ecb..9054f92f77 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -509,7 +509,7 @@ e_meeting_store_set_value (EMeetingStore *store, gint row, gint col, const gchar
 
 	switch (col) {
 	case E_MEETING_STORE_ADDRESS_COL:
-		if (val != NULL && *((gchar *)val))
+		if (val != NULL && *((gchar *) val))
 			e_meeting_attendee_set_address (
 				attendee, g_strdup_printf (
 				"MAILTO:%s", (gchar *) val));
@@ -1484,7 +1484,7 @@ freebusy_async (gpointer data)
 		priv->num_queries--;
 		g_static_mutex_unlock (&mutex);
 
-		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
+		g_list_foreach (fbd->users, (GFunc) g_free, NULL);
 		g_list_free (fbd->users);
 
 		if (fbd->fb_data != NULL) {
@@ -1627,7 +1627,7 @@ refresh_busy_periods (gpointer data)
 	thread = g_thread_create ((GThreadFunc) freebusy_async, fbd, FALSE, &error);
 	if (!thread) {
 		/* do clean up stuff here */
-		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
+		g_list_foreach (fbd->users, (GFunc) g_free, NULL);
 		g_list_free (fbd->users);
 		g_free (fbd->email);
 		priv->refresh_idle_id = 0;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 2d6195099e..ab0ce1253d 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -495,7 +495,7 @@ memo_table_query_tooltip (GtkWidget *widget,
 		comp_data->client, comp_data->icalcomp, &free_text);
 	if (!(str && *str)) {
 		if (free_text)
-			g_free ((gchar *)str);
+			g_free ((gchar *) str);
 		free_text = FALSE;
 		str = _("* No Summary *");
 	}
@@ -514,7 +514,7 @@ memo_table_query_tooltip (GtkWidget *widget,
 	g_free (tmp);
 
 	if (free_text)
-		g_free ((gchar *)str);
+		g_free ((gchar *) str);
 	free_text = FALSE;
 
 	w = gtk_event_box_new ();
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 27a08f7ada..a2e4ec68ca 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -87,8 +87,8 @@ e_select_names_renderer_editing_done (GtkCellEditable *editable, ESelectNamesRen
 
 	g_signal_emit (cell, signals[CELL_EDITED], 0, cell->priv->path, addresses, names);
 
-	g_list_foreach (addresses, (GFunc)g_free, NULL);
-	g_list_foreach (names, (GFunc)g_free, NULL);
+	g_list_foreach (addresses, (GFunc) g_free, NULL);
+	g_list_foreach (names, (GFunc) g_free, NULL);
 	g_list_free (addresses);
 	g_list_free (names);
 
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index e8ba961d7e..b68dbea737 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -718,7 +718,7 @@ task_table_query_tooltip (GtkWidget *widget,
 		comp_data->client, comp_data->icalcomp, &free_text);
 	if (!(str && *str)) {
 		if (free_text)
-			g_free ((gchar *)str);
+			g_free ((gchar *) str);
 		free_text = FALSE;
 		str = _("* No Summary *");
 	}
@@ -737,7 +737,7 @@ task_table_query_tooltip (GtkWidget *widget,
 	g_free (tmp);
 
 	if (free_text)
-		g_free ((gchar *)str);
+		g_free ((gchar *) str);
 	free_text = FALSE;
 
 	w = gtk_event_box_new ();
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 3b1b21849f..998e0b2643 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -492,7 +492,7 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
 
 	#undef draw_pixbuf
 
-	g_slist_foreach (categories_pixbufs, (GFunc)g_object_unref, NULL);
+	g_slist_foreach (categories_pixbufs, (GFunc) g_object_unref, NULL);
 	g_slist_free (categories_pixbufs);
 
 	g_object_unref (comp);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 07b94ca200..9fd9abcfcc 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2398,7 +2398,7 @@ e_week_view_on_button_press (GtkWidget *widget,
 	if (day == -1)
 		return FALSE;
 
-	if (ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *)event))
+	if (ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *) event))
 		return TRUE;
 
 	/* If an event is pressed just return. */
@@ -2472,7 +2472,7 @@ e_week_view_on_button_release (GtkWidget *widget,
 		week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
 		gdk_pointer_ungrab (event->time);
 	} else {
-		ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *)event);
+		ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *) event);
 	}
 
 	return FALSE;
@@ -2554,7 +2554,7 @@ e_week_view_on_motion (GtkWidget *widget,
 		return TRUE;
 	}
 
-	ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *)mevent);
+	ewv_pass_gdkevent_to_etext (week_view, (GdkEvent *) mevent);
 
 	return FALSE;
 }
@@ -2980,17 +2980,17 @@ tooltip_event_cb (GnomeCanvasItem *item,
 
 			data = g_malloc (sizeof (ECalendarViewEventData));
 
-			pevent->x = ((GdkEventCrossing *)event)->x_root;
-			pevent->y = ((GdkEventCrossing *)event)->y_root;
+			pevent->x = ((GdkEventCrossing *) event)->x_root;
+			pevent->y = ((GdkEventCrossing *) event)->y_root;
 			pevent->tooltip = NULL;
 
-			data->cal_view = (ECalendarView *)view;
+			data->cal_view = (ECalendarView *) view;
 			data->day = -1;
 			data->event_num = event_num;
 			data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 			pevent->timeout = g_timeout_add_full (
 				G_PRIORITY_DEFAULT, 500,
-				(GSourceFunc)e_calendar_view_get_tooltips,
+				(GSourceFunc) e_calendar_view_get_tooltips,
 				data, (GDestroyNotify) g_free);
 			g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
@@ -2999,8 +2999,8 @@ tooltip_event_cb (GnomeCanvasItem *item,
 			return FALSE;
 		}
 		case GDK_MOTION_NOTIFY:
-			pevent->x = ((GdkEventMotion *)event)->x_root;
-			pevent->y = ((GdkEventMotion *)event)->y_root;
+			pevent->x = ((GdkEventMotion *) event)->x_root;
+			pevent->y = ((GdkEventMotion *) event)->y_root;
 			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (view), "tooltip-window");
 
 			if (pevent->tooltip) {
@@ -3152,7 +3152,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 		GdkColor color;
 		gboolean free_text = FALSE;
 
-		widget = (GtkWidget *)week_view;
+		widget = (GtkWidget *) week_view;
 
 		color = e_week_view_get_text_color (week_view, event, widget);
 		summary = get_comp_summary (event->comp_data->client, event->comp_data->icalcomp, &free_text);
@@ -3170,7 +3170,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       NULL);
 
 		if (free_text)
-			g_free ((gchar *)summary);
+			g_free ((gchar *) summary);
 
 		if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp)) {
@@ -3630,17 +3630,17 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 
 		data = g_malloc (sizeof (ECalendarViewEventData));
 
-		pevent->x = ((GdkEventCrossing *)gdkevent)->x_root;
-		pevent->y = ((GdkEventCrossing *)gdkevent)->y_root;
+		pevent->x = ((GdkEventCrossing *) gdkevent)->x_root;
+		pevent->y = ((GdkEventCrossing *) gdkevent)->y_root;
 		pevent->tooltip = NULL;
 
-		data->cal_view = (ECalendarView *)week_view;
+		data->cal_view = (ECalendarView *) week_view;
 		data->day = -1;
 		data->event_num = nevent;
 		data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
 		pevent->timeout = g_timeout_add_full (
 			G_PRIORITY_DEFAULT, 500,
-			(GSourceFunc)e_calendar_view_get_tooltips,
+			(GSourceFunc) e_calendar_view_get_tooltips,
 			data, (GDestroyNotify) g_free);
 		g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
@@ -3651,8 +3651,8 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 
 		return FALSE;
 	case GDK_MOTION_NOTIFY:
-		pevent->x = ((GdkEventMotion *)gdkevent)->x_root;
-		pevent->y = ((GdkEventMotion *)gdkevent)->y_root;
+		pevent->x = ((GdkEventMotion *) gdkevent)->x_root;
+		pevent->y = ((GdkEventMotion *) gdkevent)->y_root;
 		pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (week_view), "tooltip-window");
 
 		if (pevent->tooltip) {
@@ -4559,7 +4559,7 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item,
 		}
 	}
 	else if (event->type == GDK_FOCUS_CHANGE) {
-		GdkEventFocus *focus_event = (GdkEventFocus *)event;
+		GdkEventFocus *focus_event = (GdkEventFocus *) event;
 		GdkPixbuf *pixbuf = NULL;
 
 		for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 84159bb53d..fd26c76ba6 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -307,7 +307,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string);
 #ifdef ACC_DEBUG
 	printf("EvoAcc:  name for event accobj=%p, is %s\n",
-	       (gpointer)accessible, new_name);
+	       (gpointer) accessible, new_name);
 #endif
 	g_free (name_string);
 	return accessible->name;
@@ -380,7 +380,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 		     --event_num) {
 			day_view_event = &g_array_index (day_view->long_events,
 							 EDayViewEvent, event_num);
-			if (cal_view_event == (ECalendarViewEvent*)day_view_event)
+			if (cal_view_event == (ECalendarViewEvent*) day_view_event)
 				return event_num;
 
 		}
@@ -391,7 +391,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 			     --event_num) {
 				day_view_event = &g_array_index (day_view->events[day],
 							EDayViewEvent, event_num);
-				if (cal_view_event == (ECalendarViewEvent*)day_view_event)
+				if (cal_view_event == (ECalendarViewEvent*) day_view_event)
 					return num_before + event_num;
 			}
 			num_before += day_view->events[day]->len;
@@ -570,7 +570,7 @@ ea_cal_view_event_do_action (AtkAction *action, gint i)
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
 
 	if (i == 0) {
-		atk_comp = (AtkComponent *)atk_gobj;
+		atk_comp = (AtkComponent *) atk_gobj;
 		return atk_component_grab_focus (atk_comp);
 	}
 
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 71b1c52be0..1c49d2896b 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -205,7 +205,7 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event
 	}
 	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
 		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
+		EWeekViewEvent *week_view_event = (EWeekViewEvent *) event;
 		EWeekView *week_view = E_WEEK_VIEW (cal_view);
 		/* get the first span of the event */
 		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
@@ -243,7 +243,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
 	}
 	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
 		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
+		EWeekViewEvent *week_view_event = (EWeekViewEvent *) event;
 		EWeekView *week_view = E_WEEK_VIEW (cal_view);
 		/* get the first span of the event */
 		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index 74d0d7307b..38ebf75113 100644
--- a/calendar/gui/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
@@ -149,7 +149,7 @@ ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
 		week_view_event = &g_array_index (week_view->events, EWeekViewEvent,
 						  event_num);
 
-		cal_view_event = (ECalendarViewEvent *)week_view_event;
+		cal_view_event = (ECalendarViewEvent *) week_view_event;
 	}
 	else {
 		g_return_val_if_reached (NULL);
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 456327bd39..7f60009b32 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -330,7 +330,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index)
 
 #ifdef ACC_DEBUG
 	printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n",
-		index, (gpointer)atk_object);
+		index, (gpointer) atk_object);
 #endif
 	return atk_object;
 }
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 8c7c72f2f6..cfc177c07d 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -317,7 +317,7 @@ itip_get_comp_attendee (ECalComponent *comp,
 		address = NULL;
 	}
 
-	for (it = e_list_get_iterator ((EList *)al);
+	for (it = e_list_get_iterator ((EList *) al);
 			e_iterator_is_valid (it);
 			e_iterator_next (it)) {
 		a = (EAccount *) e_iterator_get (it);
@@ -420,7 +420,7 @@ foreach_tzid_callback (icalparameter *param, gpointer data)
 
 	icalcomponent_add_component (
 		tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
-	g_hash_table_insert (tz_data->tzids, (gchar *)tzid, (gchar *)tzid);
+	g_hash_table_insert (tz_data->tzids, (gchar *) tzid, (gchar *) tzid);
 }
 
 static icalcomponent *
@@ -1088,10 +1088,10 @@ comp_sentby (ECalComponent *comp, ECal *client)
 
 		e_cal_component_set_organizer (comp, &organizer);
 
-		g_free ((gchar *)organizer.value);
-		g_free ((gchar *)organizer.sentby);
-		g_free ((gchar *)organizer.cn);
-		g_free ((gchar *)organizer.language);
+		g_free ((gchar *) organizer.value);
+		g_free ((gchar *) organizer.sentby);
+		g_free ((gchar *) organizer.cn);
+		g_free ((gchar *) organizer.language);
 	}
 }
 static ECalComponent *
@@ -1277,13 +1277,13 @@ comp_compliant (ECalComponentItipMethod method,
 			ECalComponentAlarm *alarm;
 			ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
 
-			alarm = e_cal_component_get_alarm (clone, (const gchar *)l->data);
+			alarm = e_cal_component_get_alarm (clone, (const gchar *) l->data);
 			if (alarm) {
 				e_cal_component_alarm_get_action (alarm, &action);
 				e_cal_component_alarm_free (alarm);
 
 				if (action == E_CAL_COMPONENT_ALARM_PROCEDURE)
-					e_cal_component_remove_alarm (clone, (const gchar *)l->data);
+					e_cal_component_remove_alarm (clone, (const gchar *) l->data);
 			}
 		}
 
@@ -1390,10 +1390,10 @@ find_enabled_account (EAccountList *accounts,
 	if (!id_address)
 		return NULL;
 
-	for (it = e_list_get_iterator ((EList *)accounts);
+	for (it = e_list_get_iterator ((EList *) accounts);
 	     e_iterator_is_valid (it);
 	     e_iterator_next (it)) {
-		account = (EAccount *)e_iterator_get (it);
+		account = (EAccount *) e_iterator_get (it);
 
 		if (account
 		    && account->enabled
@@ -1666,7 +1666,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 		e_cal_component_get_description_list (comp, &text_list);
 
 		if (text_list) {
-			ECalComponentText text = *((ECalComponentText *)text_list->data);
+			ECalComponentText text = *((ECalComponentText *) text_list->data);
 			if (text.value)
 				description = text.value;
 			else
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index d3b6068ca9..a63285465a 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1466,12 +1466,12 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		gint x, y;
 
 		if (!pixbuf) {
-			const gchar **xpm = (const gchar **)jump_xpm;
+			const gchar **xpm = (const gchar **) jump_xpm;
 
 			/* this ugly thing is here only to get rid of compiler warning
 			   about unused 'jump_xpm_focused' */
 			if (pixbuf)
-				xpm = (const gchar **)jump_xpm_focused;
+				xpm = (const gchar **) jump_xpm_focused;
 
 			pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 		}
@@ -1779,12 +1779,12 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 			}
 
 			if (!pixbuf) {
-				const gchar **xpm = (const gchar **)jump_xpm;
+				const gchar **xpm = (const gchar **) jump_xpm;
 
 				/* this ugly thing is here only to get rid of compiler warning
 				   about unused 'jump_xpm_focused' */
 				if (pixbuf)
-					xpm = (const gchar **)jump_xpm_focused;
+					xpm = (const gchar **) jump_xpm_focused;
 
 				pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 			}
@@ -2551,12 +2551,12 @@ print_work_week_day_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		gint x, y;
 
 		if (!pixbuf) {
-			const gchar **xpm = (const gchar **)jump_xpm;
+			const gchar **xpm = (const gchar **) jump_xpm;
 
 			/* this ugly thing is here only to get rid of compiler warning
 			   about unused 'jump_xpm_focused' */
 			if (pixbuf)
-				xpm = (const gchar **)jump_xpm_focused;
+				xpm = (const gchar **) jump_xpm_focused;
 
 			pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 		}
@@ -3104,7 +3104,7 @@ print_calendar (GnomeCalendar *gcal,
 		}
 	}
 
-	pcali.gcal = (GnomeCalendar *)gcal;
+	pcali.gcal = (GnomeCalendar *) gcal;
 	pcali.start = start;
 
 	operation = e_print_operation_new ();
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index ea7f7d5015..38c1fc8251 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -206,10 +206,10 @@ static void
 button_toggled_cb (GtkWidget *widget, struct _selector_data *sd)
 {
 	g_datalist_set_data_full(&sd->target->data, "primary-source",
-				 g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *)sd->selector)),
+				 g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *) sd->selector)),
 				 g_object_unref);
 	g_datalist_set_data(&sd->target->data, "primary-type", GINT_TO_POINTER(import_type_map[sd->page]));
-	gtk_notebook_set_current_page ((GtkNotebook *)sd->notebook, sd->page);
+	gtk_notebook_set_current_page ((GtkNotebook *) sd->notebook, sd->page);
 }
 
 static void
@@ -252,8 +252,8 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 		selector = e_source_selector_new (source_list);
 		e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
 		scrolled = gtk_scrolled_window_new (NULL, NULL);
-		gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-		gtk_container_add ((GtkContainer *)scrolled, selector);
+		gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+		gtk_container_add ((GtkContainer *) scrolled, selector);
 		gtk_notebook_append_page (GTK_NOTEBOOK (nb), scrolled, NULL);
 
 		/* FIXME What if no sources? */
@@ -283,7 +283,7 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 		g_object_unref (source_list);
 	}
 	if (first)
-		gtk_toggle_button_set_active ((GtkToggleButton *)first, TRUE);
+		gtk_toggle_button_set_active ((GtkToggleButton *) first, TRUE);
 
 	gtk_widget_show_all (vbox);
 
@@ -382,7 +382,7 @@ ical_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
 	if (target->type != E_IMPORT_TARGET_URI)
 		return FALSE;
 
-	s = (EImportTargetURI *)target;
+	s = (EImportTargetURI *) target;
 	if (s->uri_src == NULL)
 		return TRUE;
 
@@ -419,7 +419,7 @@ ical_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 	gchar *filename;
 	gchar *contents;
 	icalcomponent *icalcomp;
-	EImportTargetURI *s = (EImportTargetURI *)target;
+	EImportTargetURI *s = (EImportTargetURI *) target;
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (!filename) {
@@ -447,7 +447,7 @@ static GtkWidget *
 ivcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *preview;
-	EImportTargetURI *s = (EImportTargetURI *)target;
+	EImportTargetURI *s = (EImportTargetURI *) target;
 	gchar *filename;
 	icalcomponent *icalcomp;
 	gchar *contents;
@@ -512,7 +512,7 @@ vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
 	if (target->type != E_IMPORT_TARGET_URI)
 		return FALSE;
 
-	s = (EImportTargetURI *)target;
+	s = (EImportTargetURI *) target;
 	if (s->uri_src == NULL)
 		return TRUE;
 
@@ -603,7 +603,7 @@ vcal_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	icalcomponent *icalcomp;
-	EImportTargetURI *s = (EImportTargetURI *)target;
+	EImportTargetURI *s = (EImportTargetURI *) target;
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (!filename) {
@@ -623,7 +623,7 @@ static GtkWidget *
 vcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *preview;
-	EImportTargetURI *s = (EImportTargetURI *)target;
+	EImportTargetURI *s = (EImportTargetURI *) target;
 	gchar *filename;
 	icalcomponent *icalcomp;
 
@@ -821,12 +821,12 @@ gnome_calendar_getwidget (EImport *ei, EImportTarget *target, EImportImporter *i
 	hbox = gtk_hbox_new (FALSE, 2);
 
 	w = gtk_check_button_new_with_label (_("Calendar Events"));
-	gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_cal);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_cal);
 	g_signal_connect (w, "toggled", G_CALLBACK (calendar_toggle_cb), target);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 
 	w = gtk_check_button_new_with_label (_("Tasks"));
-	gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_tasks);
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_tasks);
 	g_signal_connect (w, "toggled", G_CALLBACK (tasks_toggle_cb), target);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);