** Remove trailing whitespace from source code.

2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537

18 files changed, 403 insertions, 403 deletions

diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 24aa1935be..9707006f4b 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -56,7 +56,7 @@ GtkWidget *org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *
 gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data);
 GtkWidget *org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data);
 void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
-GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data); 
+GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 CamelServiceAuthType camel_exchange_ntlm_authtype = {
         /* i18n: "Secure Password Authentication" is an Outlookism */
@@ -103,13 +103,13 @@ update_state (GtkTextBuffer *buffer, gpointer data)
 	}
 }
 
-static void 
+static void
 toggled_state (GtkToggleButton *button, gpointer data)
 {
 	gboolean current_oof_state = gtk_toggle_button_get_active (button);
 
 	if (current_oof_state == oof_data->state)
-		return; 
+		return;
 	oof_data->state = current_oof_state;
 	gtk_widget_set_sensitive (oof_data->text_view, current_oof_state);
 }
@@ -123,7 +123,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
  	ExchangeAccountResult result;
 
 	account = exchange_operations_get_exchange_account ();
-					
+
 	old_password = exchange_account_get_password (account);
 	if (!old_password) {
 		g_print ("Could not fetch old password\n");
@@ -138,9 +138,9 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
  	result = exchange_account_set_password (account, old_password, new_password);
 	if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		exchange_operations_report_error (account, result);
-	
+
 	g_free (old_password);
-	g_free (new_password);	
+	g_free (new_password);
 }
 #endif
 
@@ -198,7 +198,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 #endif
 	GtkLabel *lbl_dass;
 	GtkButton *btn_dass;
-	
+
 	/* Miscelleneous setting */
 	GtkFrame *frm_misc;
 	GtkVBox *vbox_misc;
@@ -235,14 +235,14 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	oof_data->text_view = NULL;
 
 	/* See if oof info found already */
-	
+
 	if (account && !exchange_oof_get (account, &oof_state, &message)) {
 
 		e_error_run (NULL, ERROR_DOMAIN ":state-read-error", NULL);
 
                 return NULL;
         }
-	
+
 	if (message && *message)
 		oof_data->message = g_strdup (message);
 	else
@@ -256,22 +256,22 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	frm_oof = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Out Of Office"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_oof), FALSE, FALSE, 0);
-	
+
 	vbox_oof = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, NULL, "homogeneous", FALSE, "spacing", 12, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_oof), 6);
 	gtk_container_add (GTK_CONTAINER (frm_oof), GTK_WIDGET (vbox_oof));
-	
-	lbl_oof_desc = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL); 
+
+	lbl_oof_desc = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_oof_desc), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (lbl_oof_desc), FALSE, FALSE, 0);
-	
+
 	tbl_oof_status = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
 	txt = g_strdup_printf ("<b>%s</b>", _("Status:"));
 	lbl_status = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", txt, "use-markup", TRUE, NULL);
 	g_free (txt);
 	gtk_misc_set_alignment (GTK_MISC (lbl_status), 0, 0.5);
 	gtk_misc_set_padding (GTK_MISC (lbl_status), 0, 0);
-			
+
 	if (oof_data->state) {
 		radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), NULL);
 		radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), "group", radio_oof, NULL);
@@ -281,15 +281,15 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL);
 	}
 	g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL);
-	
+
 
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_iof), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_oof), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0);
-	
-	
+
+
 	scrwnd_oof = (GtkScrolledWindow*) gtk_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0);
 	txtview_oof = (GtkTextView*) gtk_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL);
@@ -304,7 +304,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		/* previuosly set message */
 		gtk_text_buffer_set_text (buffer, oof_data->message, -1);
 		gtk_text_view_set_buffer (txtview_oof, buffer);
-		
+
 	}
 	gtk_text_buffer_set_modified (buffer, FALSE);
 	if (!oof_data->state)
@@ -316,7 +316,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	/* Security settings */
 	frm_auth = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Security"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_auth), FALSE, FALSE, 0);
-	
+
 	vbox_auth = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_auth), 6);
 	gtk_container_add (GTK_CONTAINER (frm_auth), GTK_WIDGET (vbox_auth));
@@ -348,7 +348,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	/* Miscelleneous settings */
 	frm_misc = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Miscelleneous"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_misc), FALSE, FALSE, 0);
-	
+
 	vbox_misc = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_misc), 6);
 	gtk_container_add (GTK_CONTAINER (frm_misc), GTK_WIDGET (vbox_misc));
@@ -399,7 +399,7 @@ print_error (const char *owa_url, E2kAutoconfigResult result)
 			break;
 
 		case E2K_AUTOCONFIG_CANT_BPROPFIND:
-			e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error", 
+			e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error",
 				     "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html",
 				     NULL);
 			break;
@@ -422,7 +422,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	E2kAutoconfigResult result;
 	CamelURL *url=NULL;
 	gboolean remember_password;
-	char *url_string, *key; 
+	char *url_string, *key;
 	const char *source_url, *id_name, *owa_url;
 	char *at, *user;
 	gboolean valid = FALSE;
@@ -444,7 +444,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 			at = strchr(id_name, '@');
 			user = g_alloca(at-id_name+1);
 			memcpy(user, id_name, at-id_name);
-			user[at-id_name] = 0; 
+			user[at-id_name] = 0;
 			camel_url_set_user (url, user);
 		}
 	}
@@ -466,21 +466,21 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	key = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
 	/* Supress the trailing slash */
 	key [strlen(key) -1] = 0;
-	
-	valid =  e2k_validate_user (owa_url, key, &url->user, exchange_params, 
+
+	valid =  e2k_validate_user (owa_url, key, &url->user, exchange_params,
 						&remember_password, &result,
 						GTK_WINDOW (gtk_widget_get_toplevel (button)));
 	g_free (key);
-	
+
 	if (!valid && result != E2K_AUTOCONFIG_CANCELLED)
 		print_error (owa_url, result);
 
 	camel_url_set_host (url, valid ? exchange_params->host : "");
-	
+
 
 	if (valid)
 		camel_url_set_param (url, "save-passwd", remember_password? "true" : "false");
-	
+
 	camel_url_set_param (url, "ad_server", valid ? exchange_params->ad_server: NULL);
 	camel_url_set_param (url, "mailbox", valid ? exchange_params->mailbox : NULL);
 	camel_url_set_param (url, "owa_path", valid ? exchange_params->owa_path : NULL);
@@ -491,7 +491,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	g_free (exchange_params->ad_server);
 	g_free (exchange_params);
 
-	if (valid) {	
+	if (valid) {
 		url_string = camel_url_to_string (url, 0);
 		e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, url_string);
 		e_account_set_string (target_account->account, E_ACCOUNT_TRANSPORT_URL, url_string);
@@ -540,7 +540,7 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
 }
 
 static char *
-construct_owa_url (CamelURL *url) 
+construct_owa_url (CamelURL *url)
 {
 	const char *owa_path, *use_ssl = NULL;
 	const char *protocol = "http", *mailbox_name;
@@ -558,9 +558,9 @@ construct_owa_url (CamelURL *url)
 	mailbox_name = camel_url_get_param (url, "mailbox");
 
 	if (mailbox_name)
-		owa_url = g_strdup_printf("%s://%s%s/%s", protocol, url->host, owa_path, mailbox_name); 
+		owa_url = g_strdup_printf("%s://%s%s/%s", protocol, url->host, owa_path, mailbox_name);
 	else
-		owa_url = g_strdup_printf("%s://%s%s", protocol, url->host, owa_path ); 
+		owa_url = g_strdup_printf("%s://%s%s", protocol, url->host, owa_path );
 
 	return owa_url;
 }
@@ -624,7 +624,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 		if (url->host[0] != 0) {
 			char *uri;
 
-			/* url has hostname but not owa_url. 
+			/* url has hostname but not owa_url.
 			 * Account has been created using x-c-s or evo is upgraded to 2.2
 		 	 * When invoked from druid, hostname will get set after validation,
 		 	 * so this condition will never be true during account creation.
@@ -636,9 +636,9 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 			g_free(uri);
 		}
 	}
-	camel_url_free (url);	
+	camel_url_free (url);
 	if (owa_url)
-		gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url); 
+		gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url);
 	gtk_label_set_mnemonic_widget((GtkLabel *)label, owa_entry);
 
 	button = gtk_button_new_with_mnemonic (_("A_uthenticate"));
@@ -648,8 +648,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show_all(hbox);
 
-	gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0); 
-	gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0); 
+	gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
 
 	g_signal_connect (owa_entry, "changed", G_CALLBACK(owa_editor_entry_changed), data->config);
 	g_object_set_data((GObject *)owa_entry, "authenticate-button", button);
@@ -693,7 +693,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 	return status;
 }
 
-static void 
+static void
 set_oof_info (void)
 {
 	ExchangeAccount *account;
@@ -711,7 +711,7 @@ destroy_oof_data (void)
 {
 	if (oof_data->message)
 		g_free (oof_data->message);
-	g_free (oof_data);	
+	g_free (oof_data);
 }
 
 void
@@ -720,7 +720,7 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 	EMConfigTargetAccount *target_account;
 	const char *source_url;
 	CamelURL *url;
-	
+
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
 	url = camel_url_new (source_url, NULL);
@@ -749,7 +749,7 @@ exchange_check_authtype (GtkWidget *w, EConfig *config)
 	return;
 }
 
-static void 
+static void
 exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 {
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target;
@@ -771,7 +771,7 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 	transport_url = e_account_get_string (target->account,
 					      E_ACCOUNT_TRANSPORT_URL);
 	url_transport = camel_url_new (transport_url, NULL);
-	
+
 	model = gtk_combo_box_get_model(dropdown);
 	if (gtk_tree_model_iter_nth_child(model, &iter, NULL, id)) {
 		gtk_tree_model_get(model, &iter, 1, &authtype, -1);
@@ -783,7 +783,7 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 			camel_url_set_authmech(url_source, NULL);
 			camel_url_set_authmech(url_transport, NULL);
 		}
-	
+
 		source_url_string = camel_url_to_string(url_source, 0);
 		transport_url_string = camel_url_to_string(url_transport, 0);
 		e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, source_url_string);
@@ -800,7 +800,7 @@ GtkWidget *
 org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	const char *source_url; 
+	const char *source_url;
 	char *label_text, *exchange_account_authtype = NULL;
 	CamelURL *url;
 	GtkWidget *hbox, *button, *auth_label, *vbox, *label_hide;
@@ -812,7 +812,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	ExchangeAccount *account;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
-	source_url = e_account_get_string (target_account->account, 
+	source_url = e_account_get_string (target_account->account,
 					   E_ACCOUNT_SOURCE_URL);
 	url = camel_url_new (source_url, NULL);
 	if (url == NULL
@@ -839,7 +839,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_free (label_text);
 	gtk_label_set_justify (GTK_LABEL (auth_label), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment (GTK_MISC (auth_label), 0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (auth_label), 0, 0); 
+	gtk_misc_set_padding (GTK_MISC (auth_label), 0, 0);
 	gtk_label_set_use_markup (GTK_LABEL (auth_label), TRUE);
 
 	label_hide = gtk_label_new("\n");
@@ -860,23 +860,23 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 		if (authtypes) {
 			for (ll = authtypes; ll; ll = g_list_next(ll))
-				if (!strcmp(authtype->authproto, 
+				if (!strcmp(authtype->authproto,
 					((CamelServiceAuthType *)ll->data)->authproto))
 					break;
 			avail = ll != NULL;
 		}
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, 0, authtype->name, 1, 
+		gtk_list_store_set (store, &iter, 0, authtype->name, 1,
 				    authtype, 2, !avail, -1);
 
 		if (url && url->authmech && !strcmp(url->authmech, authtype->authproto)) {
 			active = i;
 		}
-		else if (url && exchange_account_authtype && 
+		else if (url && exchange_account_authtype &&
 			 !strcmp (exchange_account_authtype, authtype->authproto)) {
-			/* if the url doesn't contain authmech, read the value from 
-			 * exchange account and set the tab selection and 
-			 * also set the authmech back to url 
+			/* if the url doesn't contain authmech, read the value from
+			 * exchange account and set the tab selection and
+			 * also set the authmech back to url
 			 */
 			camel_url_set_authmech (url, exchange_account_authtype);
 			active = i;
@@ -890,16 +890,16 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 		GtkCellRenderer *cell = gtk_cell_renderer_text_new();
 
 		gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE);
-		gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell, 
+		gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell,
 						"text", 0, "strikethrough", 2, NULL);
 
-		auth_changed_id = g_signal_connect (dropdown, 
-						    "changed", 
-						    G_CALLBACK (exchange_authtype_changed), 
+		auth_changed_id = g_signal_connect (dropdown,
+						    "changed",
+						    G_CALLBACK (exchange_authtype_changed),
 						    data->config);
-		g_signal_connect (button, 
-				  "clicked", 
-				  G_CALLBACK(exchange_check_authtype), 
+		g_signal_connect (button,
+				  "clicked",
+				  G_CALLBACK(exchange_check_authtype),
 				  data->config);
 	}
 
@@ -913,7 +913,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (vbox), label_hide, TRUE, TRUE, 0);
 	gtk_widget_show_all (vbox);
 
-	gtk_box_pack_start (GTK_BOX (data->parent), vbox, TRUE, TRUE, 0);	
+	gtk_box_pack_start (GTK_BOX (data->parent), vbox, TRUE, TRUE, 0);
 
 	if (url)
 		camel_url_free(url);
@@ -947,7 +947,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
-	
+
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 774ec21dfe..0783770361 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -55,7 +55,7 @@ void e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target);
 
 /* FIXME: Reconsider the prototype of this function */
 static GPtrArray *
-e_exchange_calendar_get_calendars (ECalSourceType ftype) 
+e_exchange_calendar_get_calendars (ECalSourceType ftype)
 {
 	ExchangeAccount *account;
 	GPtrArray *folder_array;
@@ -74,7 +74,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	else if (ftype == E_CAL_SOURCE_TYPE_TODO) { /* Tasks */
 		tstring = g_strdup ("tasks");
 	}
-	else { 
+	else {
 		/* FIXME: Would this ever happen? If so, handle it wisely */
 		tstring = NULL;
 	}
@@ -93,7 +93,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	for (i=0; i<folder_array->len; ++i) {
 		folder = g_ptr_array_index (folder_array, i);
 		type = (gchar *)e_folder_get_type_string (folder);
-		
+
 		if (!strcmp (type, tstring)) {
 			tmp = (gchar *)e_folder_get_physical_uri (folder);
 			if (g_str_has_prefix (tmp, uri_prefix)) {
@@ -129,7 +129,7 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
 	e_source_set_relative_uri (source, es_ruri);
 	g_free (ruri);
 	g_free (es_ruri);
-} 
+}
 
 GtkWidget *
 e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
@@ -167,7 +167,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_widget_destroy (scrw_pcalendar);
 		gtk_widget_destroy (tv_pcalendar);
 	}
-		
+
 	uri_text = e_source_get_uri (t->source);
 	uri = e_uri_new (uri_text);
 
@@ -182,12 +182,12 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	parent = data->parent;
 	row = ((GtkTable*)parent)->nrows;
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
+		offline_msg = g_markup_printf_escaped ("<b>%s</b>",
 						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
 		lbl_offline_msg = gtk_label_new ("");
 		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
@@ -195,7 +195,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_widget_show (lbl_offline_msg);
 		gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
 		g_free (uri_text);
-		return lbl_offline_msg;		
+		return lbl_offline_msg;
 	}
 
 	rel_uri = e_source_peek_relative_uri (t->source);
@@ -207,7 +207,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	else {
 		calendar_src_exists = FALSE;
 	}
-	
+
 	/* REVIEW: Should this handle be freed? - Attn: surf */
 	account = exchange_operations_get_exchange_account ();
 	if (!account) {
@@ -243,14 +243,14 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_widget_show (lbl_pcalendar);
 	gtk_misc_set_alignment (GTK_MISC (lbl_pcalendar), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent), lbl_pcalendar, 0, 2, row+1, row+2, GTK_FILL|GTK_EXPAND, 0, 0, 0);
-  
+
 	ts_pcalendar = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
 
 	callist = e_exchange_calendar_get_calendars (t->source_type);
 
 	for (i=0; i<callist->len; ++i) {
 		ruri = g_ptr_array_index (callist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);		
+		exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);
 	}
 
 	cr_calendar = gtk_cell_renderer_text_new ();
@@ -259,7 +259,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv_pcalendar), tvc_calendar);
 	g_object_set (tv_pcalendar, "expander-column", tvc_calendar, "headers-visible", TRUE, NULL);
 	gtk_tree_view_expand_all (GTK_TREE_VIEW (tv_pcalendar));
-	
+
 	scrw_pcalendar = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrw_pcalendar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrw_pcalendar), GTK_SHADOW_IN);
@@ -270,7 +270,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	gtk_table_attach (GTK_TABLE (parent), scrw_pcalendar, 0, 2, row+2, row+3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
 	gtk_widget_show_all (scrw_pcalendar);
-  
+
 	if (calendar_src_exists) {
 		gchar *uri_prefix, *sruri, *tmpruri;
 		int prefix_len;
@@ -278,7 +278,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
-		
+
 		tmpruri = (gchar*) rel_uri;
 
 		if (g_str_has_prefix (tmpruri, uri_prefix)) {
@@ -287,14 +287,14 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		else {
 			sruri = NULL;
 		}
-		
+
 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_pcalendar));
 		exchange_operations_cta_select_node_from_tree (ts_pcalendar, NULL, sruri, sruri, selection);
-		gtk_widget_set_sensitive (tv_pcalendar, FALSE);		
+		gtk_widget_set_sensitive (tv_pcalendar, FALSE);
 		g_free (uri_prefix);
 		g_free (sruri);
 	}
-	
+
 	g_ptr_array_free (callist, TRUE);
 	g_object_unref (ts_pcalendar);
 	return tv_pcalendar;
@@ -318,7 +318,7 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
 	base_uri = e_source_group_peek_base_uri (group);
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 						     &offline_status);
 	if (base_uri && !strncmp (base_uri, "exchange", 8)) {
 		if (offline_status == OFFLINE_MODE)
@@ -364,7 +364,7 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	return TRUE;
 }
 
-void 
+void
 e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 {
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) target;
@@ -382,7 +382,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		g_free (uri_text);
 		return ;
-	}	
+	}
 
 	status = exchange_is_offline (&offline_status);
 	if (offline_status == OFFLINE_MODE || status != CONFIG_LISTENER_STATUS_OK) {
@@ -412,10 +412,10 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		/* FIXME: This one would ever occur? */
 		ftype = g_strdup ("mail");
 	}
-	
+
 	gname = (gchar*) e_source_peek_name (source);
 	gruri = (gchar*) e_source_peek_relative_uri (source);
-	
+
 	if (calendar_src_exists) {
 		gchar *tmpruri, *uri_string, *temp_path, *prefix;
 		EUri *euri;
@@ -431,7 +431,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		/* sample gruri: user;auth=NTLM@host/;personal/Calendar */
 		/* sample ruri: user;auth=NTLM@host/personal/Calendar */
 		/* sample path: /personal/Calendar */
-		
+
 		uri_len = strlen (uri_string) + 1;
 		tmpruri = g_strdup (uri_string + strlen ("exchange://"));
 		temp_path = g_build_filename ("/", uri_text + uri_len, NULL);
@@ -449,7 +449,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		ruri = g_strconcat (gruri, "/", gname, NULL);
 		path = g_build_filename ("/", ruri+prefix_len, NULL);
 	}
-	
+
 	if (!calendar_src_exists) {
 		/* Create the new folder */
 		result = exchange_account_create_folder (account, path, ftype);
@@ -477,8 +477,8 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 			}
 			e_source_set_property (source, "auth", "1");
 			if (rename) {
-				exchange_operations_update_child_esources (source, 
-							   calendar_old_source_uri, 
+				exchange_operations_update_child_esources (source,
+							   calendar_old_source_uri,
 							   ruri);
 			}
 		}
@@ -501,14 +501,14 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 		break;
-	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
+	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 		break;
 	default:
 		break;
 	}
 
-done:	
+done:
 	g_free (uri_text);
 	g_free (ruri);
 	g_free (path);
diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index 297a75e210..9ccf0617e3 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -98,7 +98,7 @@ exchange_get_new_password (const char *existing_password, gboolean voluntary)
 	if (voluntary)
 		gtk_widget_hide (GTK_WIDGET (top_label));
 
-run_dialog_again:	
+run_dialog_again:
 	response = gtk_dialog_run (GTK_DIALOG (top_widget));
 	if (response == GTK_RESPONSE_OK) {
 		const char *cur_pass, *new_pass1, *new_pass2;
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 3f08d32c16..a562cc6493 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -93,12 +93,12 @@ static void account_changed (EAccountList *account_listener,
 static void account_removed (EAccountList *account_listener,
 			     EAccount     *account);
 #if LDEAD
-static void exchange_add_autocompletion_folders (GConfClient *gc_client, 
+static void exchange_add_autocompletion_folders (GConfClient *gc_client,
 						 ExchangeAccount *account);
 #endif
-static gboolean exchange_camel_urls_is_equal (const gchar *url1, 
+static gboolean exchange_camel_urls_is_equal (const gchar *url1,
 					      const gchar *url2);
-static void remove_selected_non_offline_esources (ExchangeAccount *account, 
+static void remove_selected_non_offline_esources (ExchangeAccount *account,
 						  const char *gconf_key);
 static void
 class_init (GObjectClass *object_class)
@@ -218,7 +218,7 @@ set_special_mail_folder (ExchangeAccount *account, const char *folder_type,
 	/* sample url_string: exchange://pnayak;auth=NTLM@164.99.168.136/ */
 	/* sample path:  personal/Drafts */
 	uri_len = strlen (url_string) + 1;
-	path = g_build_filename (physical_uri + uri_len, NULL); 
+	path = g_build_filename (physical_uri + uri_len, NULL);
 	*folder_uri = g_strconcat (url_string, path, NULL);
 	g_free (path);
 	g_free (url_string);
@@ -293,20 +293,20 @@ add_account_esources (ExchangeAccount *account,
 	exchange_account_is_offline_sync_set (account, &mode);
 	if (mode == OFFLINE_MODE) {
 		/* If account is marked for offline sync during account
-		 * creation, mark all the folders for offline sync 
+		 * creation, mark all the folders for offline sync
 		 */
 		offline_mode = TRUE;
 	}
 
 	username = exchange_account_get_username (account);
 
-	/* For each component create a source group */ 
+	/* For each component create a source group */
 
 	cal_source_group = e_source_group_new (account->account_name,
 					       EXCHANGE_URI_PREFIX);
-	tasks_source_group = e_source_group_new (account->account_name, 
+	tasks_source_group = e_source_group_new (account->account_name,
 					   	 EXCHANGE_URI_PREFIX);
-	contacts_source_group = e_source_group_new (account->account_name, 
+	contacts_source_group = e_source_group_new (account->account_name,
 					   	    EXCHANGE_URI_PREFIX);
 
 	if (!e_source_list_add_group (contacts_source_list, contacts_source_group, -1) ||
@@ -327,12 +327,12 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (contacts_source_group, 
+			e_source_group_add_source (contacts_source_group,
 						   source, -1);
 			g_object_unref (source);
 		}
 		else if (folder->type == EXCHANGE_CALENDAR_FOLDER){
-			relative_uri = g_strdup (folder->uri + 
+			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
 			if (offline_mode)
@@ -341,7 +341,7 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (cal_source_group, 
+			e_source_group_add_source (cal_source_group,
 						   source, -1);
 #if 0
 			ids = gconf_client_get_list (client,
@@ -358,10 +358,10 @@ add_account_esources (ExchangeAccount *account,
 			g_object_unref (source);
 			g_free (relative_uri);
 
-	
+
 		}
 		else if (folder->type == EXCHANGE_TASKS_FOLDER){
-			relative_uri = g_strdup (folder->uri + 
+			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
 			if (offline_mode == ONLINE_MODE)
@@ -370,7 +370,7 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (tasks_source_group, 
+			e_source_group_add_source (tasks_source_group,
 						   source, -1);
 #if 0
 			ids = gconf_client_get_list (client,
@@ -388,7 +388,7 @@ add_account_esources (ExchangeAccount *account,
 			g_free (relative_uri);
 		}
 	}
-		
+
 	e_source_list_sync (cal_source_list, NULL);
 	e_source_list_sync (tasks_source_list, NULL);
 	e_source_list_sync (contacts_source_list, NULL);
@@ -410,7 +410,7 @@ add_new_sources (ExchangeAccount *account)
 {
 	GPtrArray *exchange_folders;
 
-	exchange_folders = exchange_account_get_folders (account);                                                                                 
+	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
 		int i;
 		const char *folder_type;
@@ -427,7 +427,7 @@ add_new_sources (ExchangeAccount *account)
 			hier = e_folder_exchange_get_hierarchy (folder);
 			if (hier->type != EXCHANGE_HIERARCHY_PUBLIC) {
 				folder_name = e_folder_get_name (folder);
-				folder_uri = e_folder_get_physical_uri (folder); 
+				folder_uri = e_folder_get_physical_uri (folder);
 				folder_type = e_folder_get_type_string (folder);
 
 				if (!(strcmp (folder_type, "calendar")) ||
@@ -451,7 +451,7 @@ add_new_sources (ExchangeAccount *account)
 				}
 
 				if (create_esource)
-					add_folder_esource (account, type, 
+					add_folder_esource (account, type,
 							folder_name, folder_uri);
 			} /* End hierarchy type check */
 		} /* End for loop */
@@ -463,7 +463,7 @@ add_sources (ExchangeAccount *account)
 {
 	GPtrArray *exchange_folders;
 
-	exchange_folders = exchange_account_get_folders (account);                                                                                 
+	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
 		int i;
 		const char *folder_type;
@@ -479,14 +479,14 @@ add_sources (ExchangeAccount *account)
 			if (!(strcmp (folder_type, "calendar")) ||
 			    !(strcmp (folder_type, "calendar/public"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_CALENDAR_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
 			else if (!(strcmp (folder_type, "tasks")) ||
 			    	 !(strcmp (folder_type, "tasks/public"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_TASKS_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
@@ -494,7 +494,7 @@ add_sources (ExchangeAccount *account)
 			    	 !(strcmp (folder_type, "contacts/public")) ||
 			    	 !(strcmp (folder_type, "contacts/ldap"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_CONTACTS_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
@@ -509,8 +509,8 @@ add_sources (ExchangeAccount *account)
 }
 #endif
 
-static void 
-remove_account_esource (ExchangeAccount *account, 
+static void
+remove_account_esource (ExchangeAccount *account,
 		        FolderType folder_type)
 {
 	ESourceGroup *group;
@@ -528,10 +528,10 @@ remove_account_esource (ExchangeAccount *account,
 	client = gconf_client_get_default ();
 
 	if (folder_type == EXCHANGE_CONTACTS_FOLDER)
-		source_list = e_source_list_new_for_gconf ( client, 
+		source_list = e_source_list_new_for_gconf ( client,
 							CONF_KEY_CONTACTS);
 	else if (folder_type == EXCHANGE_CALENDAR_FOLDER)
-		source_list = e_source_list_new_for_gconf ( client, 
+		source_list = e_source_list_new_for_gconf ( client,
 							CONF_KEY_CAL);
 	else if (folder_type == EXCHANGE_TASKS_FOLDER)
 		source_list = e_source_list_new_for_gconf ( client,
@@ -555,19 +555,19 @@ remove_account_esource (ExchangeAccount *account,
 				/* Remove from the selected folders */
 				if (folder_type == EXCHANGE_CALENDAR_FOLDER) {
 					ids = gconf_client_get_list (
-							client, 
-							CONF_KEY_SELECTED_CAL_SOURCES , 
+							client,
+							CONF_KEY_SELECTED_CAL_SOURCES ,
 							GCONF_VALUE_STRING, NULL);
 					if (ids) {
 						node_to_be_deleted = g_slist_find_custom (
-									ids, 
-									source_uid, 
+									ids,
+									source_uid,
 									(GCompareFunc) strcmp);
 						if (node_to_be_deleted) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 									node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 								CONF_KEY_SELECTED_CAL_SOURCES,
 								GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -576,19 +576,19 @@ remove_account_esource (ExchangeAccount *account,
 					}
 				}
 				else if (folder_type == EXCHANGE_TASKS_FOLDER) {
-					ids = gconf_client_get_list (client, 
-								CONF_KEY_SELECTED_TASKS_SOURCES , 
+					ids = gconf_client_get_list (client,
+								CONF_KEY_SELECTED_TASKS_SOURCES ,
 								GCONF_VALUE_STRING, NULL);
 					if (ids) {
 						node_to_be_deleted = g_slist_find_custom (
 									ids,
-									source_uid, 
+									source_uid,
 									(GCompareFunc) strcmp);
 						if (node_to_be_deleted) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 									node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 								CONF_KEY_SELECTED_TASKS_SOURCES,
 								GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -617,17 +617,17 @@ remove_account_esources (ExchangeAccount *account)
 }
 
 #ifdef HAVE_KRB5
-static char * 
+static char *
 get_new_exchange_password (ExchangeAccount *account)
 {
 	char *old_password, *new_password;
 
 	old_password = exchange_account_get_password (account);
 	new_password = exchange_get_new_password (old_password, 0);
-	
+
 	if (new_password) {
-		exchange_account_set_password (account, 
-					       old_password, 
+		exchange_account_set_password (account,
+					       old_password,
 					       new_password);
 		g_free (old_password);
 		return new_password;
@@ -661,7 +661,7 @@ display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
 	GtkLabel *warning_msg_label;
 	char *passwd_expiry_msg =
 		g_strdup_printf (_("Your password will expire in the next %d days"), max_passwd_age);
-	
+
 	xml = glade_xml_new (FILENAME, ROOTNODE, NULL);
 	g_return_if_fail (xml != NULL);
 	top_widget = glade_xml_get_widget (xml, ROOTNODE);
@@ -677,17 +677,17 @@ display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
 	g_signal_connect (change_passwd_button,
 			  "clicked",
 			  G_CALLBACK (change_passwd_cb),
-			  account); 
+			  account);
 #endif
 	response = gtk_dialog_run (GTK_DIALOG (top_widget));
-	
+
 	gtk_widget_destroy (top_widget);
 	g_object_unref (xml);
 	g_free (passwd_expiry_msg);
 }
 
-ExchangeAccountResult 
-exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, ExchangeAccount *account) 
+ExchangeAccountResult
+exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, ExchangeAccount *account)
 {
 	ExchangeConfigListenerPrivate *priv;
 	ExchangeAccountResult result;
@@ -707,7 +707,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 	remember_password = camel_url_get_param (camel_url, "save-passwd");
 	password = e_passwords_get_password ("Exchange", key);
 	if (!password) {
-		oldremember = remember = exchange_account_is_save_password (account);	
+		oldremember = remember = exchange_account_is_save_password (account);
 		title = g_strdup_printf (_("Enter Password for %s"), account->account_name);
 		password = e_passwords_ask_password (title, "Exchange", key, title,
 						     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
@@ -760,17 +760,17 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 
 		switch (result) {
 			case EXCHANGE_ACCOUNT_QUOTA_RECIEVE_ERROR:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-error";
 				break;
 			case EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-send-error";
 				break;
 			case EXCHANGE_ACCOUNT_QUOTA_WARN:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-warn";
 				break;
@@ -780,14 +780,14 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 
 		if (current_quota_usage) {
 			widget = e_error_new (NULL, error_code, current_quota_usage);
-			g_signal_connect ((GtkDialog *)widget, "response", 
+			g_signal_connect ((GtkDialog *)widget, "response",
 					  G_CALLBACK (gtk_widget_destroy), widget);
 			gtk_widget_show (widget);
 			g_free (current_quota_usage);
 		}
 
-		/* reset result, so that we check if the password 
-		 * expiry warning period 
+		/* reset result, so that we check if the password
+		 * expiry warning period
 		 */
 		result = EXCHANGE_ACCOUNT_CONNECT_SUCCESS;
 	}
@@ -821,7 +821,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 					g_object_unref (xml);
 					return result;
 				}
-	
+
 				response = gtk_dialog_run (GTK_DIALOG (dialog));
 				gtk_widget_destroy (dialog);
 				g_object_unref (xml);
@@ -925,7 +925,7 @@ requires_relogin (char *current_url, char *new_url)
 		relogin = TRUE;
 		goto end;
 	}
-	
+
 	if (current_uri->authmech || new_uri->authmech) {
 		if (current_uri->authmech && new_uri->authmech) {
 	    		if (strcmp (current_uri->authmech, new_uri->authmech)) {
@@ -933,7 +933,7 @@ requires_relogin (char *current_url, char *new_url)
 				relogin = TRUE;
 				goto end;
 			}
-		} 
+		}
 		else {
 			/* Auth mechanism is set for the first time */
 			relogin = TRUE;
@@ -941,10 +941,10 @@ requires_relogin (char *current_url, char *new_url)
 		}
 	}
 
-	for (i=0; i<n_params; i++) { 
+	for (i=0; i<n_params; i++) {
 		current_param_val = e2k_uri_get_param (current_uri, params[i]);
-		new_param_val = e2k_uri_get_param (new_uri, params[i]); 
-	
+		new_param_val = e2k_uri_get_param (new_uri, params[i]);
+
 		if (current_param_val && new_param_val) {
 			/* both the urls have params to be compared */
 			if (strcmp (current_param_val, new_param_val)) {
@@ -990,11 +990,11 @@ account_changed (EAccountList *account_list, EAccount *account)
 		return;
 	}
 
-	/* FIXME: The order of the parameters in the Camel URL string is not in 
+	/* FIXME: The order of the parameters in the Camel URL string is not in
 	 * order for the two given strings. So, we will not be able to use
 	 * plain string comparison. Instead compare the parameters one by one.
 	 */
-	if (exchange_camel_urls_is_equal (config_listener->priv->configured_uri, 
+	if (exchange_camel_urls_is_equal (config_listener->priv->configured_uri,
 					  account->source->url) &&
 	    !strcmp (config_listener->priv->configured_name, account->name)) {
 		/* The user changed something we don't care about. */
@@ -1025,18 +1025,18 @@ account_changed (EAccountList *account_list, EAccount *account)
 		return;
 	}
 
-	/* If account name has changed, or the url value has changed, which 
-	 * could be due to change in hostname or some parameter value, 
-	 * remove old e-sources 
+	/* If account name has changed, or the url value has changed, which
+	 * could be due to change in hostname or some parameter value,
+	 * remove old e-sources
 	 */
-	if (requires_relogin (config_listener->priv->configured_uri, 
+	if (requires_relogin (config_listener->priv->configured_uri,
 			      account->source->url)) {
 		remove_account_esources (priv->exchange_account);
 		exchange_account_forget_password (priv->exchange_account);
 	} else if (strcmp (config_listener->priv->configured_name, account->name)) {
 /* 		remove_account_esources (priv->exchange_account); */
 		exchange_config_listener_modify_esource_group_name (config_listener,
-								    config_listener->priv->configured_name, 
+								    config_listener->priv->configured_name,
 								    account->name);
 		g_free (config_listener->priv->configured_name);
 		config_listener->priv->configured_name = g_strdup (account->name);
@@ -1045,9 +1045,9 @@ account_changed (EAccountList *account_list, EAccount *account)
 		/* FIXME: Do ESources need to be modified? */
 		return;
 	}
-	
+
 	/* Nope. Let the user know we're ignoring him. */
-	e_error_run (NULL, "org-gnome-exchange-operations:apply-restart", 
+	e_error_run (NULL, "org-gnome-exchange-operations:apply-restart",
 		     priv->configured_name, NULL);
 
 	/* But note the new URI so if he changes something else, we
@@ -1085,7 +1085,7 @@ account_removed (EAccountList *account_list, EAccount *account)
 		priv->configured_uri = NULL;
 		g_free (priv->configured_name);
 		priv->configured_name = NULL;
-	} 
+	}
 }
 
 static gboolean
@@ -1124,7 +1124,7 @@ exchange_config_listener_get_offline_status (ExchangeConfigListener *excl,
 	gconf_value_free (value);
 	return status;
 
-}	
+}
 
 /**
  * exchange_config_listener_new:
@@ -1170,22 +1170,22 @@ exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener)
 /**
  * exchange_config_listener_modify_esource_group_name
  *
- * @excl: Handle for Exchange Config Listener 
+ * @excl: Handle for Exchange Config Listener
  * @old_name: Old name of the ESourceGroup
  * @new_name: New name of the ESourceGroup
  *
  * This function modifies the old source group name to the specified new
  * source group name
- **/ 
-void 
+ **/
+void
 exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name, 
+							 const char *old_name,
 							 const char *new_name)
 {
 	GConfClient *client;
 	ESourceGroup *group;
 	GSList *groups;
-	ESourceList *c_source_list = NULL, *t_source_list = NULL, 
+	ESourceList *c_source_list = NULL, *t_source_list = NULL,
 		*a_source_list = NULL;
 
 	client = excl->priv->gconf;
@@ -1236,14 +1236,14 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 #if LDEAD
 /**
  * exchange_add_autocompletion_folders:
- * 
+ *
  * @gc_client: GConfClient handle
  * @account: ExchangeAccount handle
  *
  * This function adds the GAL of the Exchange account to the autocompletion list
  * while configuring a new Exchange account
  *
- **/ 
+ **/
 static void
 exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account)
 {
@@ -1262,7 +1262,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
                     &&
 		    strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *absolute_uri;
@@ -1286,8 +1286,8 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 
 
 /**
- * exchange_camel_urls_is_equal 
- * 
+ * exchange_camel_urls_is_equal
+ *
  * @url1: CAMEL URL string 1
  * @url2: CAMEL URL string 2
  *
@@ -1296,7 +1296,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
  *
  * Return Value: Boolean result of the comparision.
  *
- **/ 
+ **/
 static gboolean
 exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 {
@@ -1311,7 +1311,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 	};
 	const int n_params = 5;
 	int i;
-	
+
 	curl1 = camel_url_new (url1, NULL);
 	curl2 = camel_url_new (url2, NULL);
 
@@ -1325,7 +1325,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 			g_free (curl1);
 			g_free (curl2);
 			return FALSE;
-		}		
+		}
 		g_free (param1);
 		g_free (param2);
 	}
@@ -1337,14 +1337,14 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 
 /**
  * remove_selected_non_offline_esources
- * 
+ *
  * @account: Handle for Exchange Account
  * @gconf_key: GConf key of the calendar or tasks
  *
- * This function removes the non-offline calendars and taks list from the 
+ * This function removes the non-offline calendars and taks list from the
  * selection list
- **/ 
-static void 
+ **/
+static void
 remove_selected_non_offline_esources (ExchangeAccount *account, const char *gconf_key)
 {
 	ESourceGroup *group;
@@ -1388,21 +1388,21 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon
 				source_uid = e_source_peek_uid (source);
 
 				/* Remove from the selected folders */
-				ids = gconf_client_get_list (client, 
-							     selected_gconf_key, 
+				ids = gconf_client_get_list (client,
+							     selected_gconf_key,
 							     GCONF_VALUE_STRING, NULL);
 				if (ids) {
 					offline_mode = e_source_get_property (source, "offline_sync");
-					if (!offline_mode || 
+					if (!offline_mode ||
 					    (offline_mode && strcmp (offline_mode, "1"))) {
-						while ((node_to_be_deleted = 
-							g_slist_find_custom (ids, 
-									     source_uid, 
+						while ((node_to_be_deleted =
+							g_slist_find_custom (ids,
+									     source_uid,
 									     (GCompareFunc) strcmp))) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 										   node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 									       selected_gconf_key,
 									       GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -1415,7 +1415,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon
 			e_source_list_sync (source_list, NULL);
 		}
 	}
-	
+
 	g_free (selected_gconf_key);
 	g_object_unref (source_list);
 	g_object_unref (client);
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index 19f59f5c1a..edf6208255 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -59,10 +59,10 @@ void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type,
 ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode);
 
 void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name, 
+							 const char *old_name,
 							 const char *new_name);
 
-ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl, 
+ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl,
 							ExchangeAccount *account);
 
 #ifdef __cplusplus
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 3e6367a224..147bf1fe14 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -58,7 +58,7 @@ void e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target);
 
 /* FIXME: Reconsider the prototype of this function */
 static GPtrArray *
-e_exchange_contacts_get_contacts (void) 
+e_exchange_contacts_get_contacts (void)
 {
 	ExchangeAccount *account;
 	GPtrArray *folder_array;
@@ -156,14 +156,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 	}
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
+		offline_msg = g_markup_printf_escaped ("<b>%s</b>",
 						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
-		vb_offline_msg = gtk_vbox_new (FALSE, 6);		
+		vb_offline_msg = gtk_vbox_new (FALSE, 6);
 		gtk_container_add (GTK_CONTAINER (data->parent), vb_offline_msg);
 		lbl_offline_msg = gtk_label_new ("");
 		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
@@ -171,7 +171,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_box_pack_start (GTK_BOX (vb_offline_msg), lbl_offline_msg, FALSE, FALSE, 0);
 		gtk_widget_show_all (vb_offline_msg);
 		g_free (uri_text);
-		return vb_offline_msg;		
+		return vb_offline_msg;
 	}
 
 	if (gal_folder) {
@@ -235,14 +235,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_widget_show (lbl_pcontacts);
 	gtk_misc_set_alignment (GTK_MISC (lbl_pcontacts), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vb_pcontacts), lbl_pcontacts, FALSE, FALSE, 0);
-  
+
 	ts_pcontacts = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
 
 	conlist = e_exchange_contacts_get_contacts ();
 
 	for (i=0; i<conlist->len; ++i) {
 		ruri = g_ptr_array_index (conlist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);		
+		exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);
 	}
 
 	cr_contacts = gtk_cell_renderer_text_new ();
@@ -251,7 +251,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv_pcontacts), tvc_contacts);
 	g_object_set (tv_pcontacts,"expander-column", tvc_contacts, "headers-visible", TRUE, NULL);
 	gtk_tree_view_expand_all (GTK_TREE_VIEW (tv_pcontacts));
-	
+
 	scrw_pcontacts = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrw_pcontacts), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrw_pcontacts), GTK_SHADOW_IN);
@@ -272,7 +272,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		tmpruri = (gchar*) rel_uri;
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
-		
+
 		if (g_str_has_prefix (tmpruri, uri_prefix)) {
 			sruri = g_strdup (tmpruri+prefix_len);
 		}
@@ -281,24 +281,24 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 
 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_pcontacts));
-		exchange_operations_cta_select_node_from_tree (ts_pcontacts, 
-							       NULL, 
-							       sruri, 
-							       sruri, 
+		exchange_operations_cta_select_node_from_tree (ts_pcontacts,
+							       NULL,
+							       sruri,
+							       sruri,
 							       selection);
-		gtk_widget_set_sensitive (tv_pcontacts, FALSE);		
-		
+		gtk_widget_set_sensitive (tv_pcontacts, FALSE);
+
 		g_free (uri_prefix);
 		g_free (sruri);
 	}
 
-	g_ptr_array_free (conlist, TRUE);  
+	g_ptr_array_free (conlist, TRUE);
 	g_object_unref (ts_pcontacts);
 	return vb_pcontacts;
 }
 
-gboolean 
-e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) 
+gboolean
+e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 {
 	/* FIXME - check pageid */
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
@@ -311,7 +311,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
 	base_uri = e_source_group_peek_base_uri (group);
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (base_uri && !g_ascii_strncasecmp (base_uri, "exchange", 8)) {
 		if (offline_status == OFFLINE_MODE)
@@ -335,7 +335,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		ESourceGroup *source_group = NULL;
 		GSList *groups;
 		ESource *source;
-		
+
 		/* GAL folder */
 		client = gconf_client_get_default ();
 		source_list = e_source_list_new_for_gconf ( client, CONF_KEY_CONTACTS);
@@ -345,7 +345,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		if ((source_group = e_source_list_peek_group_by_name (source_list,
                                         account->account_name))) {
 			source =  e_source_group_peek_source_by_name (source_group, e_source_peek_name (t->source));
-			if (e_source_group_peek_source_by_name (source_group, 
+			if (e_source_group_peek_source_by_name (source_group,
 							e_source_peek_name (t->source))) {
 				/* not a rename of GAL */
 				g_object_unref (source_list);
@@ -353,7 +353,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 			}
 			else {
 				g_object_unref (source_list);
-				return FALSE; 
+				return FALSE;
 			}
 		}
 		else {
@@ -381,9 +381,9 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		folder_name = g_strdup (g_strrstr (path, "/") +1);
 		g_free (path);
 
-		if (strcmp (folder_name, e_source_peek_name (t->source))) { 
+		if (strcmp (folder_name, e_source_peek_name (t->source))) {
 			/* rename */
-			if (exchange_account_get_standard_uri (account, folder_name) || 
+			if (exchange_account_get_standard_uri (account, folder_name) ||
 			    !is_personal) {
 				/* rename of standard/non-personal folder */
 				g_free (folder_name);
@@ -395,7 +395,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	return TRUE;
 }
 
-void 
+void
 e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
@@ -407,15 +407,15 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	ExchangeAccountFolderResult result;
 	gint offline_status;
 	gboolean rename = FALSE;
-		
+
 	uri_text = e_source_get_uri (source);
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		/* here no need of checking for gal */
 		g_free (uri_text);
 		return;
-	}	
+	}
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		g_free (uri_text);
@@ -444,11 +444,11 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 		euri = e_uri_new (uri_text);
 		uri_string = e_uri_to_string (euri, FALSE);
 		e_uri_free (euri);
-	
-		uri_len = strlen (uri_string) + 1;	
+
+		uri_len = strlen (uri_string) + 1;
 		tmpruri = g_strdup (uri_string + strlen ("exchange://"));
 		temp_path = g_build_filename ("/", uri_text + uri_len, NULL);
-		prefix	= g_strndup (temp_path, strlen (temp_path) - strlen (g_strrstr (temp_path, "/"))); 
+		prefix	= g_strndup (temp_path, strlen (temp_path) - strlen (g_strrstr (temp_path, "/")));
 		g_free (temp_path);
 		path = g_build_filename (prefix, "/", gname, NULL);
 		ruri = g_strconcat (tmpruri, ";", path+1, NULL);
@@ -511,7 +511,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 		break;
-	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
+	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 		break;
 	default:
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 062a11a193..d7da5d22b5 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -76,8 +76,8 @@ const char *exchange_delegates_user_folder_names[] = {
 	"calendar", "tasks", "inbox", "contacts"
 };
 
-/* To translators: The folder names to be displayed in the message being 
-   sent to the delegatee. 
+/* To translators: The folder names to be displayed in the message being
+   sent to the delegatee.
 */
 static const char *folder_names_for_display[] = {
 	N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts")
@@ -177,11 +177,11 @@ parent_window_destroyed (gpointer dialog, GObject *where_parent_window_was)
 */
 static const char *
 map_to_full_role_name (E2kPermissionsRole role_nam)
-{	
+{
 	const char *role_name;
 
 	switch (role_nam)
-	{	
+	{
 	/* To translators: The following are the various types of permissions that can
 	   assigned by an user to his folders.
 	*/
@@ -195,7 +195,7 @@ map_to_full_role_name (E2kPermissionsRole role_nam)
 
 		case E2K_PERMISSIONS_ROLE_REVIEWER: role_name = g_strdup (
 							_("Reviewer (read-only)"));
-						    break;	
+						    break;
 
 		default: role_name = g_strdup (_("None"));
 			 break;
@@ -224,10 +224,10 @@ em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
  * Return value: %TRUE for "OK", %FALSE for "Cancel".
  **/
 gboolean
-exchange_delegates_user_edit (ExchangeAccount *account, 
+exchange_delegates_user_edit (ExchangeAccount *account,
 			     ExchangeDelegatesUser *user,
 			     GtkWidget *parent_window)
-{	
+{
 	GladeXML *xml;
 	GtkWidget *dialog, *table, *label, *menu, *check, *check_delegate;
 	char *title;
@@ -303,11 +303,11 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 
 	/* The following piece of code is used to construct a mail message to be sent to a Delegate
 	   summarizing all the permissions set for him on the user's various folders.
-	*/	
+	*/
 	check_delegate = glade_xml_get_widget (xml, "delegate_mail");
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_delegate)) == TRUE) {
 		if (button == GTK_RESPONSE_OK) {
-			
+
 			EAccount *eaccount;
 			CamelMimeMessage *delegate_mail = camel_mime_message_new ();
 			CamelMultipart *body = camel_multipart_new ();
@@ -315,13 +315,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			CamelDataWrapper *delegate_mail_text, *delegate_mail_data;
 			CamelContentType *type;
 			CamelInternetAddress *addr;
-			CamelStream *stream;	
+			CamelStream *stream;
 			CamelFolder *out_folder;
-			CamelMessageInfo *info;			
+			CamelMessageInfo *info;
 			char *self_address, *delegate_mail_subject;
 			char *role_name;
 			char *role_name_final = "";
-			
+
 			const char *recipient_address;
 			const char *delegate_exchange_dn;
 			const char *msg_part1 = NULL, *msg_part2 = NULL;
@@ -332,7 +332,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			/* Create toplevel container */
 			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
 					"multipart/alternative;");
-			camel_multipart_set_boundary (body, NULL);	
+			camel_multipart_set_boundary (body, NULL);
 
 			/* Create textual receipt */
 			delegate_mail_text = camel_data_wrapper_new ();
@@ -341,13 +341,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_data_wrapper_set_mime_type_field (delegate_mail_text, type);
 			camel_content_type_unref (type);
 			stream = camel_stream_mem_new ();
-			
-			/* To translators: This is a part of the message to be sent to the delegatee 
+
+			/* To translators: This is a part of the message to be sent to the delegatee
 			   summarizing the permissions assigned to him.
 			*/
 			msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been "
 				    	"designated as a delegate. You can now send messages on my behalf.");
-			
+
 			/* To translators: Another chunk of the same message.
 			*/
 			msg_part2 = _("You have been given the following permissions on my folders:");
@@ -367,14 +367,14 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) {
 				/* To translators: This message is included if the delegatee has been given access
 				   to the private items.
-				*/   
+				*/
 				camel_stream_printf (stream, "<br>%s", _("You are also permitted "
 							"to see my private items."));
 			}
 			else
 				/* To translators: This message is included if the delegatee has not been given access
 				   to the private items.
-				*/ 
+				*/
 				camel_stream_printf (stream, "<br>%s", _("However you are not permitted "
 							 "to see my private items."));
 			camel_data_wrapper_construct_from_stream (delegate_mail_text, stream);
@@ -386,7 +386,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_text);
 			camel_object_unref (delegate_mail_text);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);	
+			camel_object_unref (part);
 
 			/* Create the machine-readable receipt */
 			delegate_mail_data = camel_data_wrapper_new ();
@@ -401,7 +401,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_data);
 			camel_object_unref (delegate_mail_data);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);	
+			camel_object_unref (part);
 
 			/* Finish creating the message */
 			camel_medium_set_content_object (CAMEL_MEDIUM (delegate_mail), CAMEL_DATA_WRAPPER (body));
@@ -432,9 +432,9 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			if(eaccount) {
 				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Account", eaccount->uid);
-				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail), 
+				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Transport", eaccount->transport->url);
-				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail), 
+				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Fcc", eaccount->sent_folder_uri);
 			}
 
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index ee4d8db80e..9a705f0d9d 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -59,9 +59,9 @@ ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog
 							    const char            *email,
 							    GByteArray            *creator_entryid);
 
-gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user, 
+gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user,
 					GtkWidget *parent_window);
- 
+
 
 
 #ifdef __cplusplus
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 4c4bc7efc9..46088b9ba8 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -220,7 +220,7 @@ get_folder_security (ExchangeDelegates *delegates)
 		return delegates->loaded_folders;
 
 	if (!exchange_account_get_global_catalog (delegates->account)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error", 
+		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error",
 			     NULL);
 		return FALSE;
 	}
@@ -259,7 +259,7 @@ get_folder_security (ExchangeDelegates *delegates)
 	status = e2k_result_iter_free (iter);
 
 	if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error", 
+		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error",
 			     NULL);
 		return FALSE;
 	}
@@ -359,7 +359,7 @@ get_user_list (ExchangeDelegates *delegates)
  * to end up in state 1. That's what this is for.
  */
 static void
-add_remove_user (ExchangeDelegatesUser *user, 
+add_remove_user (ExchangeDelegatesUser *user,
 		 GPtrArray *to_array, GPtrArray *from_array)
 {
 	ExchangeDelegatesUser *match;
@@ -450,7 +450,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 		match = delegates->users->pdata[u];
 		if (e2k_sid_binary_sid_equal (e2k_sid_get_binary_sid (user->sid),
 					      e2k_sid_get_binary_sid (match->sid))) {
-			e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing", 
+			e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing",
 				     user->display_name, NULL);
 			g_object_unref (user);
 			exchange_delegates_user_edit (delegates->account, match, parent_window);
@@ -524,9 +524,9 @@ email_look_up (const char *delegate_legacy, ExchangeAccount *account)
 	E2kGlobalCatalogStatus status;
 
 	const char *email_id;
-	
+
 	gc = exchange_account_get_global_catalog (account);
-	
+
 	if (!gc)
 		return NULL;
 
@@ -585,7 +585,7 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data)
 					 GTK_BUTTONS_YES_NO,
 					 _("Remove the delegate %s?"),
 					 user->display_name);
-	e_dialog_set_transient_for (GTK_WINDOW (dialog), widget); 
+	e_dialog_set_transient_for (GTK_WINDOW (dialog), widget);
 
 	btn = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -757,7 +757,7 @@ delegates_apply (ExchangeDelegates *delegates)
 
 		for (i = 0; i < delegates->users->len; i++) {
 			user = delegates->users->pdata[i];
-			g_ptr_array_add (display_names, g_strdup (user->display_name)); 
+			g_ptr_array_add (display_names, g_strdup (user->display_name));
 			entryid_dup = g_byte_array_new ();
 			g_byte_array_append (entryid_dup, user->entryid->data,
 					     user->entryid->len);
@@ -765,7 +765,7 @@ delegates_apply (ExchangeDelegates *delegates)
 			g_ptr_array_add (privflags, g_strdup_printf ("%d", user->see_private));
 		}
 
-		props = e2k_properties_new (); 
+		props = e2k_properties_new ();
 		e2k_properties_set_string_array (
 			props, PR_DELEGATES_DISPLAY_NAMES, display_names);
 		e2k_properties_set_binary_array (
@@ -773,7 +773,7 @@ delegates_apply (ExchangeDelegates *delegates)
 		e2k_properties_set_int_array (
 			props, PR_DELEGATES_SEE_PRIVATE, privflags);
 	} else if (delegates->removed_users) {
-		props = e2k_properties_new (); 
+		props = e2k_properties_new ();
 		e2k_properties_remove (props, PR_DELEGATES_DISPLAY_NAMES);
 		e2k_properties_remove (props, PR_DELEGATES_ENTRYIDS);
 		e2k_properties_remove (props, PR_DELEGATES_SEE_PRIVATE);
@@ -920,7 +920,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 	GtkTreeViewColumn *column;
 	GtkTreeIter iter;
 	int i;
-	
+
 	g_return_if_fail (GTK_IS_WIDGET (parent));
 	g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
 
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 5748dd491f..ed2a9c0f4a 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -44,7 +44,7 @@
 #include "calendar/gui/e-cal-model.h"
 #include "addressbook/gui/widgets/eab-menu.h"
 
-#define d(x) 
+#define d(x)
 
 static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t);
@@ -255,7 +255,7 @@ org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *targ
 	uri = (gchar *) e_cal_get_uri (ecal);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 
@@ -289,7 +289,7 @@ org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *ta
 	uri = (gchar *) e_cal_get_uri (ecal);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 	account = exchange_operations_get_exchange_account ();
@@ -320,7 +320,7 @@ org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target
 	uri = (gchar *) e_book_get_uri (ebook);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index c12f1872d9..594ce34c0c 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -50,9 +50,9 @@ get_folder_size_func (GtkTreeModel *model,
 	GHashTable *info = (GHashTable *) user_data;
 	gdouble folder_size;
 	char *folder_name;
-	
+
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1);
-	
+
 	g_hash_table_insert (info, g_strdup (folder_name), g_strdup_printf ("%.2f", folder_size));
 	return FALSE;
 }
@@ -90,9 +90,9 @@ format_size_func (GtkTreeViewColumn *col,
 	GtkCellRendererText *cell = (GtkCellRendererText *)renderer;
 	gdouble folder_size;
 	char * new_text;
-	
+
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, -1);
-	
+
 	if (folder_size)
 		new_text = g_strdup_printf ("%.2f", folder_size);
 	else
@@ -138,7 +138,7 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
         column = gtk_tree_view_column_new_with_attributes (
                 col_name, gtk_cell_renderer_text_new (), "text", COLUMN_SIZE, NULL);
 	g_free (col_name);
-	
+
 	l = gtk_tree_view_column_get_cell_renderers (column);
 	cell = (GtkCellRenderer *)l->data;
 	gtk_tree_view_column_set_cell_data_func (column, cell, format_size_func, NULL, NULL );
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 5f785500ad..17c7d27a52 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -171,7 +171,7 @@ typedef struct {
 	ExchangeAccount *account;
 	ENameSelector *name_selector;
 	GtkWidget *name_selector_widget;
-	GtkWidget *folder_name_entry;	
+	GtkWidget *folder_name_entry;
 }SubscriptionInfo;
 
 static void
@@ -184,8 +184,8 @@ destroy_subscription_info (SubscriptionInfo *subscription_info)
 	g_free (subscription_info);
 }
 
-static void 
-subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) 
+static void
+subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 {
 	SubscriptionInfo *subscription_info = data;
 	gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL;
@@ -195,7 +195,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 	GList *destinations;
 	EDestination *destination;
 	ExchangeAccountFolderResult result;
-	
+
 	if (response == GTK_RESPONSE_CANCEL) {
 		gtk_widget_destroy (dialog);
 		destroy_subscription_info (subscription_info);
@@ -226,7 +226,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 				}
 			}
 
-			/* It would be nice to insensitivize the OK button appropriately 
+			/* It would be nice to insensitivize the OK button appropriately
 		   	instead of doing this, but unfortunately we can't do this for the
 		   	Bonobo control.  */
 			e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
@@ -234,8 +234,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 
 		folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (subscription_info->folder_name_entry)));
 		if (user_email_address && folder_name) {
-			result = exchange_account_discover_shared_folder (subscription_info->account, 
-									  user_email_address, 
+			result = exchange_account_discover_shared_folder (subscription_info->account,
+									  user_email_address,
 									  folder_name, &folder);
 			g_free (folder_name);
 			switch (result) {
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 8cb64c26a5..db2dc0e475 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -94,7 +94,7 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
 	path = target->uri + strlen ("exchange://") + strlen (account->account_filename);
 	/* User will be able to unsubscribe by doing a right click on
 	   any one of this two-<other user's>Inbox or the
-	   <other user's folder> tree. 
+	   <other user's folder> tree.
 	  */
 	stored_path = strrchr (path + 1, '/');
 
@@ -125,13 +125,13 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
 			return;
 		case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 			e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
-			return;	
+			return;
 		case EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE:
 			e_error_run (NULL, ERROR_DOMAIN ":folder-no-gc-error", NULL);
-			return;	
+			return;
 		case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
 			e_error_run (NULL, ERROR_DOMAIN ":no-user-error", NULL);
-			return;	
+			return;
 	}
 
 	/* We need to get the physical uri for the Inbox */
@@ -252,7 +252,7 @@ popup_ab_free (EPopup *ep, GSList *items, void *data)
 }
 
 void
-org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)  
+org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)
 {
 	GSList *menus = NULL;
 	int i = 0;
@@ -362,7 +362,7 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data)
 		e_source_group_remove_source_by_uid (source_group, source_uid);
 		g_free (path);
 		gtk_widget_destroy (GTK_WIDGET (dialog));
-	} 
+	}
 	if (response == GTK_RESPONSE_CANCEL)
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 	if (response == GTK_RESPONSE_DELETE_EVENT)
@@ -397,19 +397,19 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 
 		path = g_strdup (ruri + strlen (account->account_filename));
 		exchange_account_remove_shared_folder (account, path);
-		ids = gconf_client_get_list (client, 
-					     CONF_KEY_SELECTED_CAL_SOURCES, 
+		ids = gconf_client_get_list (client,
+					     CONF_KEY_SELECTED_CAL_SOURCES,
 					     GCONF_VALUE_STRING, NULL);
 		if (ids) {
 			node_to_be_deleted = g_slist_find_custom (
-						ids, 
-						source_uid, 
+						ids,
+						source_uid,
 						(GCompareFunc) strcmp);
 			if (node_to_be_deleted) {
 				g_free (node_to_be_deleted->data);
-				ids = g_slist_delete_link (ids, 
+				ids = g_slist_delete_link (ids,
 						node_to_be_deleted);
-				gconf_client_set_list (client, 
+				gconf_client_set_list (client,
 					CONF_KEY_SELECTED_CAL_SOURCES,
 					GCONF_VALUE_STRING, ids, NULL);
 			}
@@ -421,7 +421,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 		e_source_group_remove_source_by_uid (source_group, source_uid);
 		g_free (path);
 		gtk_widget_destroy (GTK_WIDGET (dialog));
-	} 
+	}
 	if (response == GTK_RESPONSE_CANCEL)
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 	if (response == GTK_RESPONSE_DELETE_EVENT)
@@ -454,7 +454,7 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 	} else if (mode == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (target->selector));
 	displayed_folder_name = (gchar *) e_source_peek_name (source);
@@ -509,7 +509,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 	} else if (mode == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (target->selector));
 	displayed_folder_name =  e_source_peek_name (source);
@@ -556,15 +556,15 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 	if (status != CONFIG_LISTENER_STATUS_OK) {
 		g_warning ("Config listener not found");
 		return;
-	}	
+	}
 	else if (mode == OFFLINE_MODE) {
-		/* Translators: this error code can be used for any operation 
-		 * (like subscribing to other user's folders, unsubscribing 
-		 * etc,) which can not be performed in offline mode 
+		/* Translators: this error code can be used for any operation
+		 * (like subscribing to other user's folders, unsubscribing
+		 * etc,) which can not be performed in offline mode
 		 */
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	create_folder_subscription_dialog (account, fname);
 }
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index df23f7f6a2..8852e993a0 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -3,16 +3,16 @@
  *  Authors: R.Raghavendran <raghavguru7@gmail.com>
  *
  * Copyright 2004 Novell, Inc. (www.novell.com)
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -39,7 +39,7 @@ void org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
 static ExchangeSendOptionsDialog *dialog=NULL;
 
-static void  
+static void
 append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
@@ -54,8 +54,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		if (dialog->options->importance) {
 			switch (dialog->options->importance) {
 				case E_IMP_HIGH :
-					e_msg_composer_modify_header (composer, "Importance", "high");		
-					break;	
+					e_msg_composer_modify_header (composer, "Importance", "high");
+					break;
 				case E_IMP_LOW :
 					e_msg_composer_modify_header (composer, "Importance", "low");
 					break;
@@ -66,7 +66,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		}
 		else
 			e_msg_composer_remove_header (composer, "Importance");
-			
+
 		if (dialog->options->sensitivity) {
 			switch (dialog->options->sensitivity) {
 				case E_SENSITIVITY_CONFIDENTIAL :
@@ -85,37 +85,37 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		}
 		else
 			e_msg_composer_remove_header (composer, "Sensitivity");
-			
+
 		hdrs = e_msg_composer_get_hdrs (composer);
 		sender_address = (CamelAddress *) e_msg_composer_hdrs_get_from (hdrs);
 		sender_id = (const char*) camel_address_encode (sender_address);
-	
+
 		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
 		sender_addr = camel_header_address_decode (sender_id, NULL);
-		
- 		if(dialog->options->send_as_del_enabled && 
-			dialog->options->delegate_address && 
+
+ 		if(dialog->options->send_as_del_enabled &&
+			dialog->options->delegate_address &&
 				g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
 
 			e_msg_composer_modify_header (composer, "Sender" , sender_id);
 
-			/* This block handles the case wherein the address to be added 
-			 * in the "From" field has no name associated with it. 
-			 * So for cases where there is no name we append the address 
+			/* This block handles the case wherein the address to be added
+			 * in the "From" field has no name associated with it.
+			 * So for cases where there is no name we append the address
 			 * (only email) within angular braces.
 			 */
 			if(!g_ascii_strcasecmp (addr->name, "")) {
-				recipient_id = g_strdup_printf ("<%s>", 
+				recipient_id = g_strdup_printf ("<%s>",
 						dialog->options->delegate_address);
 				e_msg_composer_add_header (composer, "From", recipient_id);
-			}		
-			
+			}
+
 			else
-		       		e_msg_composer_add_header (composer, "From", 
-							dialog->options->delegate_address);	
+		       		e_msg_composer_add_header (composer, "From",
+							dialog->options->delegate_address);
 		}
-		
-		
+
+
 		else {
 			e_msg_composer_remove_header (composer, "Sender");
 			e_msg_composer_add_header (composer, "From", sender_id);
@@ -123,7 +123,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 
 		if (dialog->options->delivery_enabled) {
 			EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
-			
+
 			char *mdn_address = hdrs->account->id->reply_to;
 			if (!mdn_address || !*mdn_address)
 				mdn_address = hdrs->account->id->address;
@@ -134,7 +134,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 
 		if (dialog->options->read_enabled) {
 			EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
-			
+
 			char *mdn_address = hdrs->account->id->reply_to;
 			if (!mdn_address || !*mdn_address)
 				mdn_address = hdrs->account->id->address;
@@ -145,27 +145,27 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 			e_msg_composer_remove_header (composer, "Disposition-Notification-To");
 	}
 }
-					
+
 static void
 send_options_commit (EMsgComposer *comp, gpointer user_data)
 {
 	if (!user_data && !EXCHANGE_IS_SENDOPTIONS_DIALOG (user_data))
 		return;
-		
+
 	if (dialog) {
 		g_print ("\nDialog getting unreferenced ");
 		g_object_unref (dialog);
-		dialog = NULL;	
+		dialog = NULL;
 	}
 }
 
-void 
+void
 org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 {
 	EMsgComposer *composer = target->composer;
-	EAccount *account = NULL; 
+	EAccount *account = NULL;
 	char *temp = NULL;
-	
+
 	account = e_msg_composer_get_preferred_account (composer);
 	if (!account)
 		return;
@@ -185,5 +185,5 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 
 	g_signal_connect (GTK_WIDGET (composer), "destroy",
 				  G_CALLBACK (send_options_commit), dialog);
-	
+
 }
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index 09814991cc..b407a3ab8b 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -66,9 +66,9 @@ e_plugin_lib_enable (EPluginLib *eplib, int enable)
 
 ExchangeConfigListenerStatus
 exchange_is_offline (gint *mode)
-{	
+{
 	return exchange_config_listener_get_offline_status (exchange_global_config_listener, mode);
-}	
+}
 
 /* FIXME: See if a GLib variant of this function available */
 gboolean
@@ -83,20 +83,20 @@ exchange_operations_tokenize_string (char **string, char *token, char delimit)
 		str++;
 	token[i]='\0';
 	*string = str;
-	if (i==0) 
+	if (i==0)
 		return FALSE;
 	return TRUE;
 }
 
 gboolean
-exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *ruri) 
+exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *ruri)
 {
 	GtkTreeIter iter;
 	char *luri=(char *)ruri;
 	char nodename[80];
 	gchar *uri;
 	gboolean status, found;
-	
+
 	exchange_operations_tokenize_string (&luri, nodename, '/');
 
        	if (!nodename[0]) {
@@ -133,9 +133,9 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 	}
 
 	if (!found) {
-	  gtk_tree_store_append (store, &iter, parent);		
-	  gtk_tree_store_set (store, &iter, 0, nodename, 1, uri, -1);		
-	  exchange_operations_cta_add_node_to_tree (store, &iter, luri);				
+	  gtk_tree_store_append (store, &iter, parent);
+	  gtk_tree_store_set (store, &iter, 0, nodename, 1, uri, -1);
+	  exchange_operations_cta_add_node_to_tree (store, &iter, luri);
 	}
 
 	g_free (uri);
@@ -143,7 +143,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 }
 
 void
-exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection) 
+exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection)
 {
 	char *luri=(char *)nuri;
 	char nodename[80];
@@ -185,7 +185,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter
 }
 
 ExchangeAccount *
-exchange_operations_get_exchange_account (void) 
+exchange_operations_get_exchange_account (void)
 {
 	ExchangeAccount *account = NULL;
 	ExchangeAccountResult result;
@@ -195,8 +195,8 @@ exchange_operations_get_exchange_account (void)
 	acclist = exchange_config_listener_get_accounts (exchange_global_config_listener);
 	/* FIXME: Need to be changed for handling multiple accounts */
 	if (acclist) {
-		account = acclist->data; 
-	
+		account = acclist->data;
+
 		exchange_config_listener_get_offline_status (exchange_global_config_listener,
 							     &mode);
 
@@ -216,7 +216,7 @@ exchange_operations_get_exchange_account (void)
 				return account;
 		}
 	}
-	
+
 	return NULL;
 }
 
@@ -231,15 +231,15 @@ exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResul
 
 	if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		return;
-	
+
 	error_string = g_strconcat ("org-gnome-exchange-operations:", error_ids[result], NULL);
-	
+
 	switch (result) {
 		case EXCHANGE_ACCOUNT_MAILBOX_NA:
 			widget = e_error_new (NULL, error_string, exchange_account_get_username (account), NULL);
 			break;
 		case EXCHANGE_ACCOUNT_NO_MAILBOX:
-			widget = e_error_new (NULL, error_string, exchange_account_get_username (account), 
+			widget = e_error_new (NULL, error_string, exchange_account_get_username (account),
 					      account->exchange_server, NULL);
 			break;
 		case EXCHANGE_ACCOUNT_RESOLVE_ERROR:
@@ -279,7 +279,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
 			truri = g_strjoinv (new_path, tmpv);
 			e_source_set_relative_uri (tsource->data, truri);
 			g_strfreev (tmpv);
-			g_free (truri);	
+			g_free (truri);
 		}
 	}
 }
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index 41fe731a29..d798ce8505 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -71,7 +71,7 @@ struct _ExchangePermissionsDialogPrivate {
 
 	/* Custom label is added or not */
 	gboolean custom_added;
-	
+
 	GtkWidget *separator, *custom;
 	E2kPermissionsRole selected_role;
 
@@ -220,7 +220,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
 	folder_uri = e_folder_exchange_get_internal_uri (folder);
 	folder_path = e2k_uri_relative (dialog->priv->base_uri, folder_uri);
 	dialog->priv->folder_path = g_strdup (folder_path);
-		
+
 	/* And fetch the security descriptor */
 	status = e2k_context_propfind (ctx, NULL, folder_uri,
 				       sd_props, n_sd_props,
@@ -405,7 +405,7 @@ add_clicked (GtkButton *button, gpointer user_data)
 	gc = exchange_account_get_global_catalog (dialog->priv->account);
 
 	if (!gc) {
-		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error", 
+		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error",
 			     NULL);
 		return;
 	}
@@ -451,7 +451,7 @@ add_clicked (GtkButton *button, gpointer user_data)
 					    -1);
 			bsid2 = e2k_sid_get_binary_sid (sid2);
 			if (e2k_sid_binary_sid_equal (bsid, bsid2)) {
-				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error", 
+				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error",
 					     entry->display_name, NULL);
 				e2k_global_catalog_entry_free (gc, entry);
 				gtk_tree_selection_select_iter (dialog->priv->list_selection, &iter);
@@ -588,7 +588,7 @@ display_role (ExchangePermissionsDialog *dialog)
 			dialog->priv->custom_added = FALSE;
 		}
 	}
-		
+
 	gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->role_optionmenu), role);
 }
 
@@ -802,7 +802,7 @@ exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char
 		roles[role] = e2k_permissions_role_get_name (role);
 		gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
 	}
-		
+
 	roles[role] = NULL;
 
 	g_free (roles);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index f164a2bf10..0191435145 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -49,7 +49,7 @@ struct _ExchangeSendOptionsDialogPrivate {
 
 	/*name selector dialog*/
 	ENameSelector *proxy_name_selector;
-	
+
 	/*Importance*/
 	GtkWidget *importance;
 
@@ -96,17 +96,17 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 	const char *address, *email, *name;
-	
+
 	guint count=0;
 	ENameSelectorEntry *name_selector_entry;
 	EDestinationStore *destination_store;
-	GList *destinations, *tmp;	
+	GList *destinations, *tmp;
 
 	priv = sod->priv;
 	options = sod->options;
-	
-	/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more 
-	   than one delegatee has been selected then an info dialog is popped up to help the user.	
+
+	/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more
+	   than one delegatee has been selected then an info dialog is popped up to help the user.
 	*/
 	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 
@@ -115,12 +115,12 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 		destinations = e_destination_store_list_destinations (destination_store);
 		tmp = destinations;
 
-		email = NULL;		
+		email = NULL;
 
-		/* The temporary variables address, email, and name are needed to fetch the list items. 
-		   Only the valid one is then copied into the storage variables. The "count" variable 
+		/* The temporary variables address, email, and name are needed to fetch the list items.
+		   Only the valid one is then copied into the storage variables. The "count" variable
 		   helps us keep a count of the exact number of items in the list. The g_list_length(GList *)
-		   produced ambiguous results. Hence count is used :) 
+		   produced ambiguous results. Hence count is used :)
 		*/
 		for (; tmp != NULL; tmp = g_list_next (tmp)) {
 			address = g_strdup ((char *) e_destination_get_address (tmp->data));
@@ -129,24 +129,24 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 			if (g_str_equal (email, ""))
 				continue;
 			count++;
-				
+
 			options->delegate_address = address;
 			options->delegate_name = name;
 			options->delegate_email = email;
 		}
-	
+
 		if(count == 0) {
-			e_error_run ((GtkWindow *) priv->main, 
-				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL); 
+			e_error_run ((GtkWindow *) priv->main,
+				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
 			options->delegate_name = NULL;
 			options->delegate_email = NULL;
 			return -1;
 		}
-		
+
 		if(count > 1) {
-			e_error_run ((GtkWindow *)priv->main, 
+			e_error_run ((GtkWindow *)priv->main,
 				"org-gnome-exchange-operations:more-delegates-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
@@ -172,7 +172,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 }
 
 static gboolean
-get_widgets (ExchangeSendOptionsDialog *sod) 
+get_widgets (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
 
@@ -183,7 +183,7 @@ get_widgets (ExchangeSendOptionsDialog *sod)
 	priv->main = EXCHANGE ("send_options");
 	if (!priv->main)
 		return FALSE;
-	
+
 	priv->importance = EXCHANGE ("imp_combo_box");
 	priv->sensitivity = EXCHANGE ("sensitivity_combo_box");
 	priv->button_user = EXCHANGE ("button-user");
@@ -198,20 +198,20 @@ get_widgets (ExchangeSendOptionsDialog *sod)
 	return (priv->importance
 		&&priv->sensitivity
 		&&priv->button_user
-		&&priv->delegate_enabled		
+		&&priv->delegate_enabled
 		&&priv->read_receipt
 		&&priv->delivery_receipt
 		&&priv->importance_label
 		&&priv->sensitivity_label);
 }
-	
+
 static void
 exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 	ENameSelectorEntry *name_selector_entry;
-	
+
 	priv = sod->priv;
 	options = sod->options;
 
@@ -236,8 +236,8 @@ exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
 		gtk_widget_set_sensitive ((GtkWidget *)name_selector_entry, FALSE);
 		gtk_widget_set_sensitive ((GtkWidget *)priv->button_user, FALSE);
 	}
-	
-	if (options->read_enabled) 
+
+	if (options->read_enabled)
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->read_receipt), TRUE);
 	else
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->read_receipt), FALSE);
@@ -253,7 +253,7 @@ exchange_sendoptions_dialog_new (void) {
 	ExchangeSendOptionsDialog *sod;
 
 	sod = g_object_new (EXCHANGE_TYPE_SENDOPTIONS_DIALOG, NULL);
-	
+
 	return sod;
 }
 
@@ -284,20 +284,20 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 {
    	ExchangeSendOptionsDialogPrivate *priv;
    	ExchangeSendOptionsDialog *sod;
-        GError *error = NULL;     
-		
+        GError *error = NULL;
+
 	sod = func_data;
         priv = sod->priv;
-	
-	switch (state) {			
+
+	switch (state) {
 		case GTK_RESPONSE_OK:
-		     if(exchange_send_options_get_widgets_data (sod) < 0) 
+		     if(exchange_send_options_get_widgets_data (sod) < 0)
 			return;
 		case GTK_RESPONSE_CANCEL:
 		    	gtk_widget_hide (priv->main);
 	    	    	gtk_widget_destroy (priv->main);
 	           	g_object_unref (priv->xml);
-	             	break;	     
+	             	break;
 		case GTK_RESPONSE_HELP:
 		     	gnome_help_display (
 				"evolution.xml", priv->help_section, &error);
@@ -311,7 +311,7 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 
 }
 
-/* This function acts as a listener for the toggling of "send_as_a_delegate" button. This is needed to 
+/* This function acts as a listener for the toggling of "send_as_a_delegate" button. This is needed to
    sensitize the name_selector_entry and the User Button
 */
 static void
@@ -320,19 +320,19 @@ delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptionsDialog *sod;
 	ENameSelectorEntry *name_selector_entry;
-	ExchangeSendOptions *options;	
-	
+	ExchangeSendOptions *options;
+
 	sod=func_data;
 	priv=sod->priv;
 	options=sod->options;
-	
+
 	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 
 	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 		gtk_widget_set_sensitive ((GtkWidget *) name_selector_entry, TRUE);
 		gtk_widget_set_sensitive ((GtkWidget *) priv->button_user, TRUE);
 	}
-	
+
 	else {
 		gtk_widget_set_sensitive ((GtkWidget *) name_selector_entry, FALSE);
 		gtk_widget_set_sensitive ((GtkWidget *) priv->button_user, FALSE);
@@ -355,8 +355,8 @@ addressbook_entry_changed (GtkWidget *entry, gpointer user_data)
 */
 static void
 address_button_clicked (GtkButton *button, gpointer func_data)
-{	
-	
+{
+
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptionsDialog *sod;
 	ENameSelectorDialog *name_selector_dialog;
@@ -365,12 +365,12 @@ address_button_clicked (GtkButton *button, gpointer func_data)
 	priv=sod->priv;
 
 	name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));		
+	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
-	
-gboolean 
+
+gboolean
 exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *parent)
-{	
+{
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 
@@ -384,7 +384,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 	GtkWidget *name_box;
 
 	g_return_val_if_fail (sod != NULL || EXCHANGE_IS_SENDOPTIONS_DIALOG (sod), FALSE);
-	
+
 	priv = sod->priv;
 	options = sod->options;
 
@@ -427,19 +427,19 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 		g_object_unref (des);
 	}
 
-	g_signal_connect ((GtkButton *) priv->button_user, "clicked", 
+	g_signal_connect ((GtkButton *) priv->button_user, "clicked",
 				G_CALLBACK (address_button_clicked), sod);
-	g_signal_connect (name_selector_dialog, "response", 
+	g_signal_connect (name_selector_dialog, "response",
 				G_CALLBACK (addressbook_dialog_response), sod);
-	g_signal_connect (GTK_DIALOG (priv->main), "response", 
+	g_signal_connect (GTK_DIALOG (priv->main), "response",
 				G_CALLBACK(exchange_send_options_cb), sod);
-	g_signal_connect ((GtkCheckButton *) priv->delegate_enabled, "toggled", 
+	g_signal_connect ((GtkCheckButton *) priv->delegate_enabled, "toggled",
 				G_CALLBACK(delegate_option_toggled), sod);
 
-	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, 
+	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector,
 									"Add User");
 	g_signal_connect (name_selector_entry, "changed", G_CALLBACK (addressbook_entry_changed), sod);
-	
+
 	/* The name box is just a container. The name_selector_entry is added to it. This Widget
 	   is created dynamically*/
 	name_box = glade_xml_get_widget (priv->xml, "del_name_box");
@@ -449,7 +449,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 
 	gtk_window_set_modal ((GtkWindow *) priv->main, TRUE);
 	gtk_widget_show (priv->main);
-       
+
 	return TRUE;
 }
 
@@ -479,16 +479,16 @@ exchange_sendoptions_dialog_class_init (GObjectClass *object)
 static void
 exchange_sendoptions_dialog_init (GObject *object)
 {
-	
+
 	ExchangeSendOptionsDialog *sod;
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *new;
 
 	sod = EXCHANGE_SENDOPTIONS_DIALOG (object);
 	new = g_new0 (ExchangeSendOptions, 1);
-	
+
 	priv = g_new0 (ExchangeSendOptionsDialogPrivate, 1);
-	
+
 	sod->priv = priv;
 	sod->options = new;
 	sod->options->send_as_del_enabled = FALSE;
@@ -515,10 +515,10 @@ exchange_sendoptions_dialog_finalize (GObject *object)
 {
 	ExchangeSendOptionsDialog *sod = (ExchangeSendOptionsDialog *)object;
 	ExchangeSendOptionsDialogPrivate *priv;
-	
+
 	g_return_if_fail (EXCHANGE_IS_SENDOPTIONS_DIALOG (sod));
 	priv = sod->priv;
-	
+
 	g_free (priv->help_section);
 
 	if (sod->options) {
@@ -531,9 +531,9 @@ exchange_sendoptions_dialog_finalize (GObject *object)
 		sod->priv = NULL;
 	}
 
-	if (parent_class->finalize) 
+	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
-	
+
 }
 
 static void
@@ -546,5 +546,5 @@ exchange_sendoptions_dialog_dispose (GObject *object)
 	if (parent_class->dispose)
 		(* parent_class->dispose) (object);
 
-}	
+}
 
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 965d9fbc0c..8f50ab954c 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -48,7 +48,7 @@ typedef enum {
 	E_SENSITIVITY_CONFIDENTIAL
 } ExchangeSendOptionsSensitivity;
 
-/* We require the delegate_email and delegate_name to store the address of the delegator selected into 
+/* We require the delegate_email and delegate_name to store the address of the delegator selected into
    the destination store.
 */
 typedef struct {