Coding style cleanups.

11 files changed, 61 insertions, 61 deletions

diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index c7f1db51ca..93577a0e0b 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -415,7 +415,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
 			gchar *dn;
 
 			gtk_tree_model_get (model, &iter, 0, &dn, -1);
-			gtk_entry_set_text ((GtkEntry *)sdialog->rootdn, dn);
+			gtk_entry_set_text ((GtkEntry *) sdialog->rootdn, dn);
 			g_free (dn);
 		}
 	}
@@ -487,7 +487,7 @@ eabc_type_changed (GtkComboBox *dropdown, AddressbookSourceDialog *sdialog)
 		e_source_set_relative_uri (sdialog->source, e_source_peek_uid (sdialog->source));
 	}
 
-	e_config_target_changed ((EConfig *)sdialog->config, E_CONFIG_TARGET_CHANGED_REBUILD);
+	e_config_target_changed ((EConfig *) sdialog->config, E_CONFIG_TARGET_CHANGED_REBUILD);
 }
 
 static GtkWidget *
@@ -507,9 +507,9 @@ eabc_general_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	w = gtk_hbox_new (FALSE, 6);
 	label = gtk_label_new_with_mnemonic(_("_Type:"));
-	gtk_box_pack_start ((GtkBox *)w, label, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) w, label, FALSE, FALSE, 0);
 
-	dropdown = (GtkComboBox *)gtk_combo_box_new ();
+	dropdown = (GtkComboBox *) gtk_combo_box_new ();
 	cell = gtk_cell_renderer_text_new ();
 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
 	i = 0;
@@ -523,21 +523,21 @@ eabc_general_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 		i++;
 	}
 
-	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, row);
 	g_signal_connect(dropdown, "changed", G_CALLBACK(eabc_type_changed), sdialog);
-	gtk_widget_show ((GtkWidget *)dropdown);
-	gtk_box_pack_start ((GtkBox *)w, (GtkWidget *)dropdown, TRUE, TRUE, 0);
-	gtk_label_set_mnemonic_widget ((GtkLabel *)label, (GtkWidget *)dropdown);
+	gtk_widget_show ((GtkWidget *) dropdown);
+	gtk_box_pack_start ((GtkBox *) w, (GtkWidget *) dropdown, TRUE, TRUE, 0);
+	gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *) dropdown);
 
-	gtk_box_pack_start ((GtkBox *)parent, (GtkWidget *)w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, (GtkWidget *) w, FALSE, FALSE, 0);
 
 	gtk_widget_show_all (w);
 
-	return (GtkWidget *)w;
+	return (GtkWidget *) w;
 }
 
 static void
@@ -568,11 +568,11 @@ eabc_general_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	e_load_ui_builder_definition (builder, "ldap-config.ui");
 
 	w = e_builder_get_widget (builder, item->label);
-	gtk_box_pack_start ((GtkBox *)parent, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0);
 
 	sdialog->display_name = e_builder_get_widget (builder, "account-editor-display-name-entry");
 	g_signal_connect(sdialog->display_name, "changed", G_CALLBACK(name_changed_cb), sdialog);
-	gtk_entry_set_text ((GtkEntry *)sdialog->display_name, e_source_peek_name (sdialog->source));
+	gtk_entry_set_text ((GtkEntry *) sdialog->display_name, e_source_peek_name (sdialog->source));
 
 	/* Hardcoded: groupwise can't edit the name (or anything else) */
 	if (sdialog->original_source) {
@@ -696,7 +696,7 @@ host_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
 static void
 port_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
-	const gchar *port = gtk_entry_get_text ((GtkEntry *)w);
+	const gchar *port = gtk_entry_get_text ((GtkEntry *) w);
 
 	if (!strcmp (port, LDAPS_PORT_STRING)) {
 		sdialog->ssl = ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
@@ -735,7 +735,7 @@ eabc_general_host (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	e_load_ui_builder_definition (builder, "ldap-config.ui");
 
 	w = e_builder_get_widget (builder, item->label);
-	gtk_box_pack_start ((GtkBox *)parent, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0);
 
 	uri = e_source_get_uri (sdialog->source);
 	if (ldap_url_parse (uri, &lud) != LDAP_SUCCESS)
@@ -773,7 +773,7 @@ eabc_general_host (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 static void
 auth_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
 {
-	const gchar *principal = gtk_entry_get_text ((GtkEntry *)w);
+	const gchar *principal = gtk_entry_get_text ((GtkEntry *) w);
 
 	/* seems messy ... but the api is */
 	switch (sdialog->auth) {
@@ -818,7 +818,7 @@ eabc_general_auth (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	e_load_ui_builder_definition (builder, "ldap-config.ui");
 
 	w = e_builder_get_widget (builder, item->label);
-	gtk_box_pack_start ((GtkBox *)parent, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0);
 
 	sdialog->auth_combobox = e_builder_get_widget (builder, "auth-combobox");
 	gtk_widget_set_has_tooltip (sdialog->auth_combobox, TRUE);
@@ -884,7 +884,7 @@ eabc_details_search (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidge
 	e_load_ui_builder_definition (builder, "ldap-config.ui");
 
 	w = e_builder_get_widget (builder, item->label);
-	gtk_box_pack_start ((GtkBox *)parent, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0);
 
 	uri = e_source_get_uri (sdialog->source);
 	if (ldap_url_parse (uri, &lud) != LDAP_SUCCESS)
@@ -979,7 +979,7 @@ eabc_details_limit (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 	e_load_ui_builder_definition (builder, "ldap-config.ui");
 
 	w = e_builder_get_widget (builder, item->label);
-	gtk_box_pack_start ((GtkBox *)parent, w, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0);
 
 	sdialog->timeout_scale = e_builder_get_widget (builder, "timeout-scale");
 	range = GTK_RANGE (sdialog->timeout_scale);
@@ -992,7 +992,7 @@ eabc_details_limit (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 
 	sdialog->limit_spinbutton = e_builder_get_widget (builder, "download-limit-spinbutton");
 	tmp = e_source_get_property(sdialog->source, "limit");
-	gtk_spin_button_set_value ((GtkSpinButton *)sdialog->limit_spinbutton, tmp?g_strtod (tmp, NULL):100.0);
+	gtk_spin_button_set_value ((GtkSpinButton *) sdialog->limit_spinbutton, tmp?g_strtod (tmp, NULL):100.0);
 	g_signal_connect (sdialog->limit_spinbutton, "value_changed", G_CALLBACK (limit_changed_cb), sdialog);
 
 	sdialog->canbrowsecheck = e_builder_get_widget (builder, "canbrowsecheck");
@@ -1196,7 +1196,7 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 			if (!strncmp("ldap:", e_source_group_peek_base_uri(l->data), 5))
 				sdialog->menu_source_groups = g_slist_remove (sdialog->menu_source_groups, l->data);
 #endif
-		sdialog->source_group = (ESourceGroup *)sdialog->menu_source_groups->data;
+		sdialog->source_group = (ESourceGroup *) sdialog->menu_source_groups->data;
 		for (i=0;eabc_new_items[i].path;i++)
 			items = g_slist_prepend (items, &eabc_new_items[i]);
 		g_object_unref (gconf);
@@ -1220,11 +1220,11 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 		items = g_slist_prepend (items, &eabc_items[i]);
 	}
 
-	e_config_add_items ((EConfig *)ec, items, eabc_commit, NULL, eabc_free, sdialog);
-	e_config_add_page_check ((EConfig *)ec, NULL, eabc_check_complete, sdialog);
+	e_config_add_items ((EConfig *) ec, items, eabc_commit, NULL, eabc_free, sdialog);
+	e_config_add_page_check ((EConfig *) ec, NULL, eabc_check_complete, sdialog);
 
 	target = eab_config_target_new_source (ec, sdialog->source);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
+	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
 
 	if (source)
 		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("Address Book Properties"));
@@ -1234,7 +1234,7 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 	/* forces initial validation */
 	if (!sdialog->original_source) {
 		e_source_set_relative_uri (sdialog->source, e_source_peek_uid (sdialog->source));
-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
+		e_config_target_changed ((EConfig *) ec, E_CONFIG_TARGET_CHANGED_STATE);
 	}
 
 	return sdialog->window;
diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h
index 7da5800d16..9c238d1970 100644
--- a/modules/addressbook/openldap-extract.h
+++ b/modules/addressbook/openldap-extract.h
@@ -284,7 +284,7 @@ ldap_int_parse_numericoid (const gchar **sp, gint *code, const gint flags)
 		}
 	}
 	if (flags & LDAP_SCHEMA_SKIP) {
-		res = (gchar *)start;
+		res = (gchar *) start;
 	} else {
 		res = LDAP_MALLOC (len+1);
 		if (!res) {
@@ -1125,7 +1125,7 @@ ldap_url_parse_ext ( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	}
 
 	/* allocate return struct */
-	ludp = (LDAPURLDesc *)LDAP_CALLOC ( 1, sizeof ( LDAPURLDesc ));
+	ludp = (LDAPURLDesc *) LDAP_CALLOC ( 1, sizeof ( LDAPURLDesc ));
 
 	if (ludp == NULL) {
 		LDAP_FREE ( url );
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index 710aa8f2a2..791352206e 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -174,7 +174,7 @@ create_calendar_sources (EShellBackend *shell_backend,
 				shell_settings, "cal-primary-calendar",
 				e_source_peek_uid (source));
 
-			link.data = (gpointer)e_source_peek_uid (source);
+			link.data = (gpointer) e_source_peek_uid (source);
 			link.next = NULL;
 
 			e_cal_shell_backend_set_selected_calendars (
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index b81b453bb0..20f30c12c4 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -321,7 +321,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 		/* Hide the New button on the toolbar. */
 		widget = e_shell_window_get_managed_widget (
 			shell_window, "/main-toolbar");
-		widget = (GtkWidget *)gtk_toolbar_get_nth_item (
+		widget = (GtkWidget *) gtk_toolbar_get_nth_item (
 			GTK_TOOLBAR (widget), 0);
 		gtk_widget_hide (widget);
 
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 9db9f4538b..328fba44f1 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -864,8 +864,8 @@ calendar_preferences_construct (ECalendarPreferences *prefs,
 	/* Hook up and add the toplevel widget */
 
 	target = e_cal_config_target_new_prefs (ec);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
-	toplevel = e_config_create_widget ((EConfig *)ec);
+	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
+	toplevel = e_config_create_widget ((EConfig *) ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 
 	show_config (prefs);
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index b760990f6b..efe71f6632 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -129,7 +129,7 @@ create_memo_sources (EShellBackend *shell_backend,
 				shell_settings, "cal-primary-memo-list",
 				e_source_peek_uid (source));
 
-			link.data = (gpointer)e_source_peek_uid (source);
+			link.data = (gpointer) e_source_peek_uid (source);
 			link.next = NULL;
 
 			e_memo_shell_backend_set_selected_memo_lists (
@@ -251,7 +251,7 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend,
 
 		al = e_get_account_list ();
 
-		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);
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index d7daafc91d..d9b5aa7af6 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -141,7 +141,7 @@ create_task_sources (EShellBackend *shell_backend,
 				shell_settings, "cal-primary-task-list",
 				e_source_peek_uid (source));
 
-			link.data = (gpointer)e_source_peek_uid (source);
+			link.data = (gpointer) e_source_peek_uid (source);
 			link.next = NULL;
 
 			e_task_shell_backend_set_selected_task_lists (
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 35be54525b..a3e5bfae7f 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -347,7 +347,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emcp_items); i++)
 		l = g_slist_prepend (l, &emcp_items[i]);
-	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emcp_free, prefs);
+	e_config_add_items ((EConfig *) ec, l, NULL, NULL, emcp_free, prefs);
 
 	/* General tab */
 
@@ -574,8 +574,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	/* get our toplevel widget */
 	client = gconf_client_get_default ();
 	target = em_config_target_new_prefs (ec, client);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
-	toplevel = e_config_create_widget ((EConfig *)ec);
+	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
+	toplevel = e_config_create_widget ((EConfig *) ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 	g_object_unref (client);
 }
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index c651cdee77..18b5a1d00b 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -263,7 +263,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data)
 
 		gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL);
 
-		g_slist_foreach (list, (GFunc)g_free, NULL);
+		g_slist_foreach (list, (GFunc) g_free, NULL);
 		g_slist_free (list);
 		g_free (name);
 		g_free (value);
@@ -425,7 +425,7 @@ emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs)
 	GtkTreeIter iter;
 	const gchar *text = gtk_entry_get_text (prefs->entry_header);
 
-	g_strstrip ((gchar *)text);
+	g_strstrip ((gchar *) text);
 
 	if (text && (strlen (text)>0)) {
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -692,7 +692,7 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs)
 			CAMEL_SESSION (prefs->session)->junk_plugin =
 				CAMEL_JUNK_PLUGIN (&iface->camel);
 			status = e_plugin_invoke (iface->hook->plugin, iface->validate_binary, NULL) != NULL;
-			if ((gboolean)status == TRUE) {
+			if ((gboolean) status == TRUE) {
 				gchar *text, *html;
 				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), iface->plugin_name);
@@ -736,7 +736,7 @@ junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 					"text", 0,
 					NULL);
 
-	if (!plugins || !g_list_length ((GList *)plugins)) {
+	if (!plugins || !g_list_length ((GList *) plugins)) {
 		GtkTreeIter iter;
 
 		gtk_list_store_append (store, &iter);
@@ -835,7 +835,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emmp_items); i++)
 		l = g_slist_prepend (l, &emmp_items[i]);
-	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emmp_free, prefs);
+	e_config_add_items ((EConfig *) ec, l, NULL, NULL, emmp_free, prefs);
 
 	/* General tab */
 
@@ -1198,7 +1198,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 
 	junk_book_lookup_button_toggled (prefs->junk_book_lookup, prefs);
 
-	prefs->junk_header_list_store = init_junk_tree ((GtkWidget *)prefs->junk_header_tree, prefs);
+	prefs->junk_header_list_store = init_junk_tree ((GtkWidget *) prefs->junk_header_tree, prefs);
 	toggle_button_init (prefs, prefs->junk_header_check, FALSE,
 			    "/apps/evolution/mail/junk/check_custom_header",
 			    G_CALLBACK (custom_junk_button_toggled));
@@ -1210,8 +1210,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec, prefs->gconf);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
-	toplevel = e_config_create_widget ((EConfig *)ec);
+	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
+	toplevel = e_config_create_widget ((EConfig *) ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 }
 
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index f216d81c28..3094f15f47 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -207,11 +207,11 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data)
 	*/
 	if (GTK_IS_SPIN_BUTTON (widget)) {
 		port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
-		gconf_client_set_int (client, (const gchar *)data, port, NULL);
+		gconf_client_set_int (client, (const gchar *) data, port, NULL);
 		d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const gchar *)data, port));
 	} else if (GTK_IS_ENTRY (widget)) {
 		value = gtk_entry_get_text (GTK_ENTRY (widget));
-		gconf_client_set_string (client, (const gchar *)data, value, NULL);
+		gconf_client_set_string (client, (const gchar *) data, value, NULL);
 		d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const gchar *)data, value));
 	}
 
@@ -328,7 +328,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emnp_items); i++)
 		l = g_slist_prepend (l, &emnp_items[i]);
-	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emnp_free, prefs);
+	e_config_add_items ((EConfig *) ec, l, NULL, NULL, emnp_free, prefs);
 
 	/* Proxy tab */
 
@@ -480,10 +480,10 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	g_free (buf);
 
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_HTTP_PORT_KEY, NULL);
-	gtk_spin_button_set_value (prefs->http_port, (gdouble)port);
+	gtk_spin_button_set_value (prefs->http_port, (gdouble) port);
 
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_HTTPS_PORT_KEY, NULL);
-	gtk_spin_button_set_value (prefs->https_port, (gdouble)port);
+	gtk_spin_button_set_value (prefs->https_port, (gdouble) port);
 
 #if 0
 	buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL);
@@ -491,7 +491,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	g_free (buf);
 
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_SOCKS_PORT_KEY, NULL);
-	gtk_spin_button_set_value (prefs->socks_port, (gdouble)port);
+	gtk_spin_button_set_value (prefs->socks_port, (gdouble) port);
 #endif
 	emnp_set_markups (prefs);
 
@@ -509,8 +509,8 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec, prefs->gconf);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
-	toplevel = e_config_create_widget ((EConfig *)ec);
+	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
+	toplevel = e_config_create_widget ((EConfig *) ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 }
 
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index 96f0a18701..d974422cd5 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -308,14 +308,14 @@ e_sens_network_listener_queryinterface (ISensNetwork *This,
 static ULONG WINAPI
 e_sens_network_listener_addref (ISensNetwork *This)
 {
-	ESensNetworkListener *esnl_ptr=(ESensNetworkListener*)This;
+	ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This;
 	return InterlockedIncrement (&(esnl_ptr->ref));
 }
 
 static ULONG WINAPI
 e_sens_network_listener_release (ISensNetwork *This)
 {
-	ESensNetworkListener *esnl_ptr=(ESensNetworkListener*)This;
+	ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This;
 	ULONG tmp = InterlockedDecrement (&(esnl_ptr->ref));
 	return tmp;
 }
@@ -368,7 +368,7 @@ e_sens_network_listener_connectionmade (ISensNetwork  *This,
                                         LPSENS_QOCINFO lpQOCInfo)
 {
 	if (ulType) {
-		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*)This;
+		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This;
 		EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr);
 		/* Wait a second so that the connection stabilizes */
 		g_usleep (G_USEC_PER_SEC);
@@ -392,7 +392,7 @@ e_sens_network_listener_connectionlost (ISensNetwork *This,
                                         ULONG         ulType)
 {
 	if (ulType) {
-		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*)This;
+		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This;
 		EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr);
 		e_shell_set_network_available (shell, FALSE);
 	}
@@ -407,7 +407,7 @@ e_sens_network_listener_destinationreachable (ISensNetwork  *This,
                                               LPSENS_QOCINFO lpQOCInfo)
 {
 	if (ulType) {
-		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*)This;
+		ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This;
 		EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr);
 		/* Wait a second so that the connection stabilizes */
 		g_usleep (G_USEC_PER_SEC);
@@ -502,7 +502,7 @@ windows_sens_constructed (GObject *object)
 				UUID tmp_uuid;
 				UuidCreate (&tmp_uuid);
 				UuidToString (&tmp_uuid, &subids[i]);
-				res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *)subids[i])));
+				res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *) subids[i])));
 				if (res) {
 					RpcStringFree (&subids[i]);
 					break;
@@ -517,7 +517,7 @@ windows_sens_constructed (GObject *object)
 				res=pEventSubscription->lpVtbl->put_EventClassID (pEventSubscription, _mb2wchar (eventclassid));
 				if (res)
 					break;
-				res=pEventSubscription->lpVtbl->put_SubscriberInterface (pEventSubscription, (IUnknown*)pESensNetworkListener);
+				res=pEventSubscription->lpVtbl->put_SubscriberInterface (pEventSubscription, (IUnknown*) pESensNetworkListener);
 				if (res)
 					break;
 				/* Make the subscription receive the event only if the owner of the subscription
@@ -528,7 +528,7 @@ windows_sens_constructed (GObject *object)
 				if (res)
 					break;
 
-				res=pEventSystem->lpVtbl->Store (pEventSystem, (BSTR)PROGID_EventSubscription, (IUnknown*)pEventSubscription);
+				res=pEventSystem->lpVtbl->Store (pEventSystem, (BSTR) PROGID_EventSubscription, (IUnknown*) pEventSubscription);
 				if (res)
 					break;
 				pEventSubscription->lpVtbl->Release (pEventSubscription);