** 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, 442 insertions, 442 deletions

diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index bb51b8f876..002eeaa0d4 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -35,7 +35,7 @@
 void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
 GtkWidget *e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
 
-void 
+void
 commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
@@ -48,14 +48,14 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 	uri_text = e_source_get_uri (source);
 	if (strncmp (uri_text, "groupwise", 9)) {
 		g_free (uri_text);
-		
+
 		return ;
-	}	
+	}
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	relative_uri = g_strconcat (";", e_source_peek_name (source), NULL);
 	e_source_set_relative_uri (source, relative_uri);
 	g_free (relative_uri);
-  
+
 	source_group = e_source_peek_group (source);
 	l = e_source_group_peek_sources(source_group);
 	if (l && l->data ) {
@@ -69,7 +69,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 GtkWidget *
 e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
-	
-        
+
+
 	return NULL;
 }
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 5f3bef5bf1..c0bffb23e0 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -93,20 +93,20 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 				parent_name = names[parts -2];
 			else
 				parent_name = NULL;
-		}	
+		}
 		camel_exception_init (&ex);
 		if (!(store = (CamelStore *) camel_session_get_service (mail_component_peek_session(NULL), uri, CAMEL_PROVIDER_STORE, &ex))) {
 			camel_exception_clear (&ex);
 			return;
 		}
 
-		cnc = get_cnc (store);	
+		cnc = get_cnc (store);
 		if(E_IS_GW_CONNECTION (cnc)) {
-			container_id = get_container_id (cnc, parent_name);	
+			container_id = get_container_id (cnc, parent_name);
 
 			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (char *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
-				
+
 				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
 				/*changes = camel_folder_change_info_new ();
 				camel_folder_change_info_remove_uid (changes, (char *) item_id);
@@ -114,7 +114,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 				//camel_folder_delete_message (folder, item_id);
 				camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
 				camel_folder_summary_touch (folder->summary);
-				//camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);	
+				//camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);
 				uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL);
 				account = mail_config_get_account_by_source_url (uri);
 				uri = account->source->url;
@@ -131,7 +131,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 
 				em_folder_tree_model_add_store (model, store, account->name);
 				camel_object_unref (store);
-			}  
+			}
 		}
 
 		g_strfreev(names);
@@ -149,13 +149,13 @@ accept_free(void *data)
 	g_free(accept_data);
 }
 
-static void 
+static void
 accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 {
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog;
-	struct AcceptData *accept_data; 
+	struct AcceptData *accept_data;
 	char *uri;
 
 	accept_data = g_new0(struct AcceptData, 1);
@@ -221,12 +221,12 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 			g_free(start_message);
 			wizard = GNOME_DRUID (gnome_druid_new_with_window (_("Shared Folder Installation"), NULL, TRUE, (GtkWidget**)(&window)));
 			gtk_window_set_position (GTK_WINDOW (window) , GTK_WIN_POS_CENTER_ALWAYS);
-			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));	
+			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));
 			gtk_widget_show_all (GTK_WIDGET (title_page));
 			camel_object_ref(msg);
 			g_object_set_data_full((GObject *)title_page, "msg", msg, camel_object_unref);
 			g_signal_connect (title_page, "next", G_CALLBACK(accept_clicked), msg);
-		} else 
+		} else
 			g_warning ("Could not get the sender name");
 
 		camel_object_unref(content);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 89c5e9fe3c..9d7b47c5f8 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -40,7 +40,7 @@
 #include "share-folder.h"
 #include "junk-settings.h"
 
-void 
+void
 org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t);
 
 static void
@@ -63,7 +63,7 @@ junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js)
 
 }
 
-static void 
+static void
 junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 {
 	GtkWidget *dialog ,*w, *notebook, *box;
@@ -72,8 +72,8 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	EGwConnection *cnc;
 	gchar *msg;
 	CamelFolder *folder = (CamelFolder *)data;
-	CamelStore *store = folder->parent_store;	
-	cnc = get_cnc (store);	
+	CamelStore *store = folder->parent_store;
+	cnc = get_cnc (store);
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
@@ -87,7 +87,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	gtk_widget_ensure_style (dialog);
 	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
 	box = gtk_vbox_new (FALSE, 6);
-	w = gtk_label_new ("");	
+	w = gtk_label_new ("");
 	msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings"));
 	gtk_label_set_markup (GTK_LABEL (w), msg);
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
@@ -96,14 +96,14 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	junk_tab = junk_settings_new (cnc);
 	w = (GtkWidget *)junk_tab->vbox;
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
-	
+
 	/*We might have to add more options for settings i.e. more pages*/
 	while (page_count > 0 ){
 		notebook = gtk_notebook_new ();
 		gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL);
 		gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, notebook, TRUE, TRUE, 0);
 	}
-	
+
 	if (page_count == 0)
 		gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, box, TRUE, TRUE, 0);
 
@@ -115,35 +115,35 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 g_slist_free (items);
 }
 
-void 
+void
 org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
-	
+
 	int i = 0;
 	static int first = 0;
-	
+
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
-       	
+
 }
 
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 2cbf793f93..87ce3774d5 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -110,7 +110,7 @@ static void
 junk_settings_destroy (GtkObject *obj)
 {
 	JunkSettings *js = (JunkSettings *) obj;
-	free_all (js);	
+	free_all (js);
 	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
 }
 
@@ -148,16 +148,16 @@ free_node(JunkEntry *nentry)
 	return;
 }
 
-static JunkEntry * 
+static JunkEntry *
 find_node(GList *list, gchar *match)
 {
 	JunkEntry *one_entry = NULL;
-	EGwJunkEntry *ent = NULL; 
+	EGwJunkEntry *ent = NULL;
 	GList *tmp;
 	gint i ;
-	
+
 	if(list){
-		tmp = g_list_first(list); 
+		tmp = g_list_first(list);
 		for(i=0; tmp  ; i++)
 		{
 			one_entry = tmp->data;
@@ -169,11 +169,11 @@ find_node(GList *list, gchar *match)
 			tmp= g_list_next(tmp);
 		}
 	}
-	
+
 	return NULL;
 }
 
-static void 
+static void
 free_all (JunkSettings *js)
 {
 	if (js->junk_list){
@@ -190,7 +190,7 @@ get_junk_list (JunkSettings *js)
 	char *entry;
 	char *msg;
 	int use_junk, use_block, use_pab, persistence;
-	
+
 	if (E_IS_GW_CONNECTION (js->cnc)) {
 		if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) {
 			if (use_junk) {
@@ -207,15 +207,15 @@ get_junk_list (JunkSettings *js)
 		if (e_gw_connection_get_junk_entries (js->cnc, &(list)) == E_GW_CONNECTION_STATUS_OK) {
 			js->users = g_list_length (list);
 			if (js->users) {
-/* I populate the list and set flags to 0 for the existing users*/ 
+/* I populate the list and set flags to 0 for the existing users*/
 				while (list) {
 					JunkEntry *junk_entry = g_new0 (JunkEntry , 1);
 					junk_entry->entry = list->data;
-					junk_entry->flag = 0;	
+					junk_entry->flag = 0;
 					entry = g_strdup ((junk_entry->entry)->match);
 					msg = g_strdup_printf ("%s", entry);
 					gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter));
-					gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);			 
+					gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);
 					js->junk_list = g_list_append (js->junk_list, junk_entry);
 
 					g_free (msg);
@@ -224,7 +224,7 @@ get_junk_list (JunkSettings *js)
 					entry = NULL;
 					list = list->next;
 				}
-			} 
+			}
 		}
 		else
 			g_warning("Could not get the JUNK List");
@@ -243,11 +243,11 @@ commit_changes (JunkSettings *js)
 
 	for (node = js->junk_list; node; node = node->next)
 	{
-		junk_entry = node->data;	
+		junk_entry = node->data;
 		if (junk_entry->flag & 0x1)
-			new_list = g_list_append (new_list, junk_entry->entry);	
+			new_list = g_list_append (new_list, junk_entry->entry);
 		else if (junk_entry->flag & 0x4) {
-			remove_list = g_list_append (remove_list, junk_entry->entry);	
+			remove_list = g_list_append (remove_list, junk_entry->entry);
 		}
 	}
 
@@ -288,14 +288,14 @@ commit_changes (JunkSettings *js)
 	remove_list = NULL;
 }
 
-static void 
+static void
 enable_clicked (GtkRadioButton *button, JunkSettings *js)
 {
-	js->flag_for_ok = 0;        
+	js->flag_for_ok = 0;
 	gtk_widget_set_sensitive (GTK_WIDGET (js->table) ,TRUE);
 }
 
-static void 
+static void
 disable_clicked (GtkRadioButton *button, JunkSettings *js)
 {
 	js->flag_for_ok = 2;
@@ -310,17 +310,17 @@ add_clicked(GtkButton *button, JunkSettings *js)
 	JunkEntry *new_entry = NULL;
 	EGwJunkEntry *junk_entry = NULL;
 	gchar *msg = NULL;
-	
+
 	self_email = g_strdup (e_gw_connection_get_user_email (js->cnc));
 		email = gtk_entry_get_text (js->entry);
 		/* You can't mark junk sender yourself*/
 		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email)) || !g_ascii_strcasecmp (email, "" ))
-		       return; 	
-		else {	
+		       return;
+		else {
 			/*check whether already exists*/
 			if (js->junk_list && email){
 				new_entry = find_node (js->junk_list, (gchar *)email);
-				if (new_entry) 
+				if (new_entry)
 					return;
 
 			}
@@ -331,13 +331,13 @@ add_clicked(GtkButton *button, JunkSettings *js)
 			new_entry->entry = junk_entry;
 			new_entry->flag = 1;
 			msg = g_strdup (email);
-			gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter)); 
+			gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter));
 			gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);
 			g_free(msg);
 			js->junk_list = g_list_append (js->junk_list, new_entry);
 			js->flag_for_ok = 0;
 		}
-	gtk_entry_set_text (GTK_ENTRY(js->entry), ""); 
+	gtk_entry_set_text (GTK_ENTRY(js->entry), "");
 }
 
 static void
@@ -348,9 +348,9 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 
 	gtk_tree_model_get ((GtkTreeModel *) js->model, &(js->iter), 0, &email, -1);
 	entry = find_node (js->junk_list, email);
-	if (entry->flag & 0x1) {	
+	if (entry->flag & 0x1) {
 		js->junk_list = g_list_remove (js->junk_list, entry);
-		free_node(entry);		
+		free_node(entry);
 	} else {
 		entry->flag = 0;
 		entry->flag |= 0x4;
@@ -360,19 +360,19 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 }
 
 
-static void 
+static void
 user_selected(GtkTreeSelection *selection, JunkSettings *js)
 {
 	GtkTreeModel *model;
-	
+
 	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 	if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))){
 		gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE);
 
-	} 
+	}
 }
-	
-static void 
+
+static void
 junk_settings_construct (JunkSettings *js)
 {
 	GladeXML *xml;
@@ -384,7 +384,7 @@ junk_settings_construct (JunkSettings *js)
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
 	g_free (gladefile);
 
-	js->xml =xml; 
+	js->xml =xml;
 
 	if (!js->xml) {
 		g_warning ("could not get xml");
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 5a9b57ce12..59204e1f14 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -59,11 +59,11 @@ struct _GtkVBox;
 
 struct _JunkSettings {
 	GtkVBox parent_object;
-	
+
 	struct _GladeXML *xml;
-	
+
 	/* General tab */
-	
+
 	/* Default Behavior */
 	struct _GtkTreeView *entry_list;
 	struct _GtkButton *add_button;
@@ -78,7 +78,7 @@ struct _JunkSettings {
 	struct _GtkVBox  *vbox;
 	struct _GtkVBox  *table;
 	struct _GtkWidget *window;
-	
+
 	GList *junk_list;
 	gint users;
 	gint flag_for_ok;
@@ -89,7 +89,7 @@ struct _JunkSettings {
 
 struct _JunkSettingsClass {
 	GtkVBoxClass parent_class;
-	
+
 };
 
 GType junk_settings_get_type (void);
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 165ceac49e..2026bb714e 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Author: 
+ *  Author:
  *  Sankar P ( psankar@novell.com )
  *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
@@ -40,17 +40,17 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder = (CamelFolder *)data;
-	CamelStore *store = folder->parent_store;	
+	CamelStore *store = folder->parent_store;
 	char *id;
-	
-	cnc = get_cnc (store);	
+
+	cnc = get_cnc (store);
 	id = (char *)item->user_data;
 
 	if (e_gw_connection_retract_request (cnc, id, NULL, FALSE, FALSE) != E_GW_CONNECTION_STATUS_OK )
 		e_error_run (NULL, "org.gnome.evolution.message.retract:retract-failure", NULL);
 	else {
 		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Message retracted successfully"));	
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Message retracted successfully"));
 		gtk_dialog_run (GTK_DIALOG(dialog));
 		gtk_widget_destroy (dialog);
 	}
@@ -87,6 +87,6 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 			menus = g_slist_prepend (menus, &popup_items[i]);
 
 		e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
-	} 
+	}
 	return ;
 }
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 84ea84733e..6fefa06e4b 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -3,16 +3,16 @@
  *  Authors: Parthasarathi Susarla <sparthasarathi@novell.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.
@@ -44,7 +44,7 @@ static ESendOptionsDialog * dialog = NULL ;
 
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
-static time_t 
+static time_t
 add_day_to_time (time_t time, int days)
 {
 	struct tm *tm;
@@ -65,7 +65,7 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 
 	comp = (EMsgComposer *) data;
 	/* we are bothered only for ok response: other cases are handled generally*/
-	if (state == GTK_RESPONSE_OK) {	
+	if (state == GTK_RESPONSE_OK) {
 		if (dialog->data->gopts->reply_enabled) {
 			if (dialog->data->gopts->reply_convenient)
 				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ;
@@ -116,13 +116,13 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 			e_msg_composer_add_header (comp, X_SEND_OPT_PRIORITY, temp);
 			g_free (temp);
 		}
-		
+
 		if (dialog->data->gopts->security) {
 			temp = g_strdup_printf ("%d",dialog->data->gopts->security);
 			e_msg_composer_add_header (comp, X_SEND_OPT_SECURITY, temp);
 			g_free (temp);
 		}
-	} 
+	}
 }
 
 static void
@@ -130,21 +130,21 @@ send_options_commit (EMsgComposer *comp, gpointer user_data)
 {
 	if (!user_data && !E_IS_SENDOPTIONS_DIALOG (user_data))
 		return;
-		
+
 	if (dialog) {
 		g_object_unref (dialog);
-		dialog = NULL;	
+		dialog = NULL;
 	}
 }
 
-void 
+void
 org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 {
 
 	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
-	EAccount *account = NULL; 
+	EAccount *account = NULL;
 	char *temp = NULL;
-	
+
 	account = e_msg_composer_get_preferred_account (comp) ;
 	if (!account)
 		return;
@@ -153,14 +153,14 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 	if (!temp) {
 		return;
 	}
-	e_msg_composer_set_send_options (comp, TRUE); 
+	e_msg_composer_set_send_options (comp, TRUE);
 	/* display the send options dialog */
 	if (!dialog) {
 		g_print ("New dialog\n\n") ;
 		dialog = e_sendoptions_dialog_new () ;
 	}
 	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
-	
+
 	g_signal_connect (dialog, "sod_response",
 				  G_CALLBACK (feed_input_data), comp);
 
diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h
index 128777ba0b..c1d9eb04b5 100644
--- a/plugins/groupwise-features/mail-send-options.h
+++ b/plugins/groupwise-features/mail-send-options.h
@@ -3,16 +3,16 @@
  *  Authors: Parthasarathi Susarla <sparthasarathi@novell.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.
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 718a10d1c9..356781f344 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -50,14 +50,14 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
 	items = NULL;
 }
 
-void 
+void
 org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
@@ -116,8 +116,8 @@ receive_objects (gpointer data)
 {
 	GError *error = NULL;
 	ReceiveData *r_data = data;
-	
-	
+
+
 	icalcomponent_set_method (r_data->icalcomp, ICAL_METHOD_REQUEST);
 
 	if (!e_cal_receive_objects (r_data->ecal, r_data->icalcomp, &error)) {
@@ -158,7 +158,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 		}
 		g_free (text);
 	}
-	
+
 	return prop;
 }
 static void
@@ -187,7 +187,7 @@ change_status (icalcomponent *ical_comp, const char *address, icalparameter_part
 	}
 }
 
-static void 
+static void
 process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 {
 	GList *selected;
@@ -202,7 +202,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 		GThread *thread = NULL;
 		GError *error = NULL;
 		char *address = NULL;
-		
+
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		address = itip_get_comp_attendee (comp, event->comp_data->client);
 
@@ -212,7 +212,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 		/* Free comp */
 		g_object_unref (comp);
 		comp = NULL;
-		
+
 		clone = icalcomponent_new_clone (event->comp_data->icalcomp);
 		change_status (clone, address, status);
 
@@ -233,11 +233,11 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 				icalproperty *prop;
 				const char *uid = icalcomponent_get_uid (r_data->icalcomp);
 
-				prop = icalproperty_new_x ("All");	
+				prop = icalproperty_new_x ("All");
 				icalproperty_set_x_name (prop, "X-GW-RECUR-INSTANCES-MOD-TYPE");
 				icalcomponent_add_property (r_data->icalcomp, prop);
 
-				prop = icalproperty_new_x (uid);	
+				prop = icalproperty_new_x (uid);
 				icalproperty_set_x_name (prop, "X-GW-RECURRENCE-KEY");
 				icalcomponent_add_property (r_data->icalcomp, prop);
 
@@ -255,7 +255,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 	}
 }
 
-/*FIXME the data does not give us the ECalendarView object. 
+/*FIXME the data does not give us the ECalendarView object.
   we should remove the global c_view variable once we get it from the data*/
 static void
 on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data)
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index cab5d594ea..6259336728 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -1,7 +1,7 @@
 
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: 
+ *  Authors:
  *  Shreyas Srinivasan <sshreyas@novell.com>
  *  Sankar P <psankar@novell.com>
  *
@@ -104,7 +104,7 @@ proxy_login_finalize (GObject *object)
 		g_free (prd->priv);
 		prd->priv = NULL;
 	}
-	
+
 	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
 }
@@ -144,7 +144,7 @@ proxy_login_init (GObject *object)
 	prd = PROXY_LOGIN (object);
 	priv = g_new0 (proxyLoginPrivate, 1);
 	prd->priv = priv;
-	
+
 	prd->proxy_list = NULL;
 	priv->xml = NULL;
 	priv->main = NULL;
@@ -152,7 +152,7 @@ proxy_login_init (GObject *object)
 	priv->tree = NULL;
 }
 
-GType 
+GType
 proxy_login_get_type (void)
 {
   static GType type = 0;
@@ -178,13 +178,13 @@ proxy_login_get_type (void)
   return type;
 }
 
-proxyLogin * 
+proxyLogin *
 proxy_login_new (void)
 {
 	proxyLogin *prd;
 
 	prd = g_object_new (TYPE_PROXY_LOGIN, NULL);
-	
+
 	return prd;
 }
 
@@ -196,27 +196,27 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
 	const char *poa_address, *use_ssl = NULL, *soap_port;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return 0;
 	*user_name = g_strdup (url->user);
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return 0;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -224,13 +224,13 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
 
 	g_free (key);
 	g_free (prompt);
-	g_free (uri); 
+	g_free (uri);
 	camel_url_free (url);
 
 	return 1;
 }
 
-static EGwConnection * 
+static EGwConnection *
 proxy_login_get_cnc (EAccount *account)
 {
 	EGwConnection *cnc;
@@ -238,27 +238,27 @@ proxy_login_get_cnc (EAccount *account)
 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
 	const char *use_ssl = NULL, *soap_port;
 	gboolean remember;
-	
+
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
 	if (!url->host || strlen (url->host) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, url->host); 
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, url->host);
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", url->host, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", url->host, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, url->host, url->user);
 
@@ -267,7 +267,7 @@ proxy_login_get_cnc (EAccount *account)
 	if (!password)
 		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
 				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
-	
+
 	g_free (prompt);
 	cnc = e_gw_connection_new (uri, url->user, password);
 	if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
@@ -275,17 +275,17 @@ proxy_login_get_cnc (EAccount *account)
 		cnc = e_gw_connection_new (http_uri, url->user, password);
 		g_free (http_uri);
 	}
-	
+
 	g_free (key);
 	g_free (password);
-	g_free (uri); 
+	g_free (uri);
 	camel_url_free (url);
 
 	return cnc;
 }
-	
 
-static void 
+
+static void
 proxy_login_cb (GtkDialog *dialog, gint state)
 {
 	GtkWidget *account_name_tbox;
@@ -300,7 +300,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 	    case GTK_RESPONSE_OK:
 		    gtk_widget_destroy (priv->main);
 		    proxy_soap_login (proxy_name);
-		    g_object_unref (pld);    
+		    g_object_unref (pld);
 		    break;
 	    case GTK_RESPONSE_CANCEL:
     		    gtk_widget_destroy (priv->main);
@@ -313,7 +313,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 	g_free (proxy_name);
 }
 
-static void 
+static void
 proxy_soap_login (char *email)
 {
 	EAccountList *accounts = mail_config_get_accounts();
@@ -326,30 +326,30 @@ proxy_soap_login (char *email)
 	char *name;
 	int i;
 	int permissions = 0;
-	
+
 	for (i=0; email[i]!='\0' && email[i]!='@' ; i++);
 	if (email[i]=='@')
 		name = g_strndup(email, i);
 	else {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:invalid-user",email ,NULL);
 		return;
-	}	
+	}
 
 	/* README: There should not be the weird scenario of the proxy itself configured as an account.
 	   If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/
 
-	if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) { 
+	if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:already-loggedin", email, NULL);
 		g_free (name);
 		return;
 	}
-	
+
 	srcAccount = pld->account;
 	cnc = proxy_login_get_cnc(srcAccount);
 	proxy_get_password (srcAccount, &user_name, &password);
-	
+
 	proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions);
-	
+
 	if (proxy_cnc) {
 		parent = camel_url_new (e_account_get_string(srcAccount, E_ACCOUNT_SOURCE_URL), NULL);
 		parent_source_url = camel_url_to_string (parent, CAMEL_URL_HIDE_PASSWORD);
@@ -375,8 +375,8 @@ proxy_soap_login (char *email)
 		camel_url_free (parent);
 	} else {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:invalid-user",email ,NULL);
-		return;  
-	}	
+		return;
+	}
 
 	g_object_unref (cnc);
 	g_free (name);
@@ -384,8 +384,8 @@ proxy_soap_login (char *email)
 	g_free (password);
 }
 
- 
-static void 
+
+static void
 proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data)
 {
 	MailComponent *component = mail_component_peek ();
@@ -402,7 +402,7 @@ proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data)
 	mail_component_add_store (component, store, account->name);
 }
 
-static void 
+static void
 proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 {
 	proxyLoginPrivate *priv = pld->priv;
@@ -420,14 +420,14 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 	gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid);
 }
 
-static void 
+static void
 proxy_login_setup_tree_view (void)
 {
 	proxyLoginPrivate *priv;
 	GtkTreeSelection *selection;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
-	
+
 	priv = pld->priv;
 	renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF,
 				 "xpad", 4,
@@ -444,7 +444,7 @@ proxy_login_setup_tree_view (void)
 	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK(proxy_login_tree_view_changed_cb), NULL);
 }
 
-static void 
+static void
 proxy_login_update_tree (void)
 {
     	GtkTreeIter iter;
@@ -457,7 +457,7 @@ proxy_login_update_tree (void)
 	proxyLoginPrivate *priv = pld->priv;
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
 	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
-	
+
 	cnc = proxy_login_get_cnc(pld->account);
 	e_gw_connection_get_proxy_list (cnc, &proxy_list);
 
@@ -511,17 +511,17 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
 	proxy_login_setup_tree_view ();
 	proxy_login_update_tree ();
 	g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(proxy_login_cb), NULL);
-	gtk_widget_show (GTK_WIDGET (priv->main));		
+	gtk_widget_show (GTK_WIDGET (priv->main));
  }
 
 static EPopupItem popup_items[] = {
-/* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise 
- * feature by which one person can send/read mails/appointments using another person's identity 
+/* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+ * feature by which one person can send/read mails/appointments using another person's identity
  * without knowing his password, for example if that other person is on vacation */
 { E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 86cabab444..4820721bd9 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -42,7 +42,7 @@ struct _proxyLogin{
     GList *proxy_list;
 
     /* Private Dialog Information*/
-    proxyLoginPrivate *priv;  
+    proxyLoginPrivate *priv;
 };
 
 struct _proxyLoginClass {
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7db7e510be..3ffb56579d 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Authors: 
+ *  Authors:
  *  Shreyas Srinivasan (sshreyas@novell.com)
  *  Sankar P ( psankar@novell.com )
  *
@@ -89,7 +89,7 @@ struct _proxyDialogPrivate {
 
 	/*name selector dialog*/
 	ENameSelector *proxy_name_selector;
-	
+
 	GtkTreeView *tree;
 	GtkTreeStore *store;
 
@@ -134,7 +134,7 @@ free_proxy_handler (proxyHandler *handler)
 		g_free (handler->proxy_name);
 
 	if (handler->proxy_email)
-		g_free (handler->proxy_email);			
+		g_free (handler->proxy_email);
 
 	handler->uniqueid = NULL;
 	handler->proxy_name = NULL;
@@ -159,7 +159,7 @@ proxy_dialog_finalize (GObject *object)
 
 	g_return_if_fail (IS_PROXY_DIALOG (prd));
 	priv = prd->priv;
-	
+
 	if(priv->proxy_name_selector)
 		g_object_unref (priv->proxy_name_selector);
 
@@ -170,7 +170,7 @@ proxy_dialog_finalize (GObject *object)
 		g_free (prd->priv);
 		prd->priv = NULL;
 	}
-	
+
 	prd = NULL;
 	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
@@ -203,7 +203,7 @@ proxy_dialog_init (GObject *object)
 	prd->priv = priv;
 
 	prd->cnc = NULL;
-	priv->tab_dialog = NULL;	
+	priv->tab_dialog = NULL;
 	priv->xml = NULL;
 	priv->xml_tab = NULL;
 	priv->main = NULL;
@@ -220,7 +220,7 @@ proxy_dialog_init (GObject *object)
 	priv->task_read = NULL;
 	priv->task_write = NULL;
 	priv->alarms = NULL;
-	priv->notifications = NULL; 
+	priv->notifications = NULL;
 	priv->options = NULL;
 	priv->private = NULL;
 	priv->help_section = NULL;
@@ -229,7 +229,7 @@ proxy_dialog_init (GObject *object)
 }
 
 GType
-proxy_dialog_get_type (void) 
+proxy_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -255,27 +255,27 @@ proxy_dialog_get_type (void)
   return type;
 }
 
-proxyDialog * 
+proxyDialog *
 proxy_dialog_new (void)
 {
 	proxyDialog *prd;
 
 	prd = g_object_new (TYPE_PROXY_DIALOG, NULL);
-	
+
 	return prd;
 }
 
-static int 
+static int
 proxy_get_permissions_from_dialog (EAccount *account)
 {
 	int permissions;
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	permissions = 0;
-	
+
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->mail_read)))
 		permissions |= E_GW_PROXY_MAIL_READ;
 
@@ -315,7 +315,7 @@ proxy_get_permissions_from_dialog (EAccount *account)
 	return permissions;
 }
 
-static int 
+static int
 proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 {
 	GtkTreeIter iter;
@@ -326,7 +326,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 	char *account_mailid;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
 	switch (dialog)
@@ -346,20 +346,20 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 
 				if (!tmp) {
 					e_error_run (NULL, "org.gnome.evolution.proxy:no-user",NULL ,NULL);
-					return -1; 
+					return -1;
 				}
-				
+
 				for (; tmp != NULL; tmp = g_list_next (tmp)) {
 					email = NULL;
 					email = (char *)e_destination_get_email (tmp->data);
 
 					if (g_str_equal(email, ""))
 						continue;
-					
+
 					if (g_strrstr (email, "@") == NULL) {
 						e_error_run (NULL, "org.gnome.evolution.proxy:invalid-user", email, NULL);
 						return -1;
-					} 	
+					}
 					if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
 						e_error_run (NULL, "org.gnome.evolution.proxy:invalid-user", email, NULL);
 						return -1;
@@ -380,7 +380,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 								return 0;
 							}
 
-							
+
 							e_error_run (NULL, "org.gnome.evolution.proxy:user-is-proxy",email ,NULL);
 							return -1;
 						}
@@ -407,7 +407,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 					new_proxy->uniqueid = NULL;
 					new_proxy->flags =  E_GW_PROXY_NEW;
 					new_proxy->permissions = proxy_get_permissions_from_dialog (account);
-				
+
 					priv->proxy_list = g_list_append (priv->proxy_list, new_proxy);
 				}
 			}
@@ -426,7 +426,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 			break;
 		default:
 			return -1;
-	}    
+	}
 
 	return 0;
 }
@@ -438,7 +438,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	priv->account_name = GW ("proxy_account_name");
 	priv->mail_read = GW ("mailRead");
@@ -453,7 +453,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 	priv->notifications = GW ("notifications");
 	priv->options = GW ("modify_rules");
 	priv->private = GW ("read_private");
-	
+
 	return (priv->account_name
 		&& priv->mail_read
 		&& priv->mail_write
@@ -469,7 +469,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 		&& priv->private);
 }
 
-static EGwConnection * 
+static EGwConnection *
 proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
@@ -479,27 +479,27 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -520,7 +520,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	return cnc;
 }
 
-void 
+void
 proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
@@ -529,8 +529,8 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-	prd = g_object_get_data ((GObject *)account, "prd");    
-	
+	prd = g_object_get_data ((GObject *)account, "prd");
+
 	if (!prd || !prd->priv || !prd->priv->proxy_list)
 		return;
 
@@ -538,7 +538,7 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 	prd = NULL;
 }
 
-void 
+void
 proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 {
 	EAccount *account;
@@ -550,7 +550,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 
 	/* In case of non-GroupWise preferences edit, "prd" will be NULL. */
 	if (!prd || !prd->priv || !prd->priv->proxy_list)
@@ -567,8 +567,8 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 			if ( !E_IS_GW_CONNECTION(prd->cnc)) 	/* Add check in case the connection request fails*/
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
-			if (aclInstance->flags & E_GW_PROXY_NEW )         	
-				e_gw_connection_add_proxy (prd->cnc, aclInstance);		
+			if (aclInstance->flags & E_GW_PROXY_NEW )
+				e_gw_connection_add_proxy (prd->cnc, aclInstance);
 
 			if ((aclInstance->flags & E_GW_PROXY_DELETED) && !(aclInstance->flags & E_GW_PROXY_NEW))
 				e_gw_connection_remove_proxy (prd->cnc, aclInstance);
@@ -582,7 +582,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 	prd = NULL;
 }
 
-static void 
+static void
 proxy_setup_meta_tree_view (EAccount *account)
 {
 	proxyDialog *prd = NULL;
@@ -591,7 +591,7 @@ proxy_setup_meta_tree_view (EAccount *account)
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF,
 				 "xpad", 4,
@@ -619,14 +619,14 @@ proxy_update_tree_view (EAccount *account)
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG);
 	proxyDialogPrivate *priv;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
-	
+
 	gtk_tree_store_clear (priv->store);
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	for (;list_iter; list_iter = g_list_next(list_iter)) {
 	        aclInstance = (proxyHandler *) list_iter->data;
 
 		if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
@@ -634,7 +634,7 @@ proxy_update_tree_view (EAccount *account)
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1);
 		}
 	}
-   
+
    	g_free (file_name);
 	if (broken_image)
 		g_object_unref (broken_image);
@@ -643,7 +643,7 @@ proxy_update_tree_view (EAccount *account)
 	gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree), GTK_TREE_MODEL (priv->store));
 }
 
-GtkWidget* 
+GtkWidget*
 org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
@@ -660,7 +660,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	account = target_account->account;
 
 	camel_exception_init (&ex);
-	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {	  
+	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return NULL;
 	}
@@ -677,7 +677,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL);
 		g_free (gladefile);
 
-		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {	
+		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {
 			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
 			priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list"));
 			priv->store =  gtk_tree_store_new (2,
@@ -685,28 +685,28 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 							   G_TYPE_STRING
 				);
 			proxy_setup_meta_tree_view (account);
-			
+
 			addProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "add_proxy");
 			removeProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "remove_proxy");
 			editProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "edit_proxy");
-			
-			g_signal_connect (addProxy, "clicked", G_CALLBACK(proxy_add_account), account);	
+
+			g_signal_connect (addProxy, "clicked", G_CALLBACK(proxy_add_account), account);
 			g_signal_connect (removeProxy, "clicked", G_CALLBACK(proxy_remove_account), account);
 			g_signal_connect (editProxy, "clicked", G_CALLBACK(proxy_edit_account), account);
-			
+
 			priv->proxy_list = NULL;
 		} else if (account->enabled){
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
+			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
 		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
-		}	
-			
+			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
+		}
+
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
@@ -720,11 +720,11 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 			if (priv) {
 				pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
-				gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
+				gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num);
 			}
-		}	
+		}
 	}
-	
+
 	camel_object_unref (store);
 	camel_exception_clear (&ex);
 	return NULL;
@@ -759,15 +759,15 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (notebook))));
 			priv = prd->priv;
 
-			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
+			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK)
 				return FALSE;
 
- 
+
 			list_iter = priv->proxy_list;
- 
-			for (;list_iter; list_iter = g_list_next(list_iter)) {        
+
+			for (;list_iter; list_iter = g_list_next(list_iter)) {
 				aclInstance = (proxyHandler *) list_iter->data;
- 
+
 				/* NOTE: All User Access is not supported */
 				if (!g_ascii_strcasecmp (aclInstance->proxy_name, "<All User Access>")) {
 					priv->proxy_list = g_list_delete_link (priv->proxy_list, list_iter);
@@ -796,12 +796,12 @@ proxy_cancel(GtkWidget *button, EAccount *account)
 }
 
 
-static void 
+static void
 proxy_add_ok (GtkWidget *button, EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
-	
+
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
@@ -813,12 +813,12 @@ proxy_add_ok (GtkWidget *button, EAccount *account)
 	g_object_unref (priv->xml);
 }
 
-static void 
+static void
 proxy_edit_ok (GtkWidget *button, EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
-	
+
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
@@ -830,19 +830,19 @@ proxy_edit_ok (GtkWidget *button, EAccount *account)
 	g_object_unref (priv->xml);
 }
 
-static proxyHandler * 
+static proxyHandler *
 proxy_get_item_from_list (EAccount *account, char *account_name)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 	GList *list_iter;
 	proxyHandler *iter;
-	
-	prd = g_object_get_data ((GObject *)account, "prd");    
+
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	for (;list_iter; list_iter = g_list_next(list_iter)) {
 	        iter = (proxyHandler *) list_iter->data;
 
 		if ( g_str_equal (iter->proxy_email,account_name))
@@ -852,7 +852,7 @@ proxy_get_item_from_list (EAccount *account, char *account_name)
 	return NULL;
 }
 
-static void 
+static void
 proxy_remove_account (GtkWidget *button, EAccount *account)
 {
 	GtkTreeIter iter;
@@ -863,7 +863,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account)
 	char *account_mailid;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 
@@ -897,13 +897,13 @@ address_button_clicked (GtkButton *button, EAccount *account)
 	proxyDialogPrivate *priv;
 	ENameSelectorDialog *name_selector_dialog;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector);
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
-static void 
+static void
 proxy_add_account (GtkWidget *button, EAccount *account)
 {
 	GtkButton *contacts, *cancel;
@@ -916,7 +916,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	proxyDialog *prd = NULL;
 	char *gladefile;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
@@ -938,7 +938,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	g_signal_connect ((GtkWidget *)cancel, "clicked", G_CALLBACK (proxy_cancel), account);
 	g_signal_connect ((GtkWidget *)contacts, "clicked", G_CALLBACK (address_button_clicked), account);
 	g_signal_connect (name_selector_dialog, "response", G_CALLBACK (addressbook_dialog_response), account);
-	gtk_widget_show (GTK_WIDGET (priv->main));		
+	gtk_widget_show (GTK_WIDGET (priv->main));
 
 	name_selector_model = e_name_selector_peek_model (priv->proxy_name_selector);
 	e_name_selector_model_add_section (name_selector_model, "Add User", "Add User", NULL);
@@ -955,17 +955,17 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 }
 
-static void 
+static void
 proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	gtk_entry_set_text ((GtkEntry *) priv->account_name, edited->proxy_email);
 	gtk_widget_set_sensitive (priv->account_name, FALSE);
-	
+
 	if (edited->permissions & E_GW_PROXY_MAIL_READ)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->mail_read), TRUE);
 
@@ -985,25 +985,25 @@ proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_TASK_READ)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_read), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_read), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_TASK_WRITE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_write), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_GET_ALARMS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->alarms), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->alarms), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_GET_NOTIFICATIONS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->notifications), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->notifications), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_MODIFY_FOLDERS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->options), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->options), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_READ_PRIVATE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->private), TRUE); 
-}	
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->private), TRUE);
+}
 
-static void 
+static void
 proxy_edit_account (GtkWidget *button, EAccount *account)
 {
 	GtkTreeIter iter;
@@ -1017,11 +1017,11 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 	proxyDialog *prd = NULL;
 	char *gladefile;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
-	
+
 	/*FIXME: If multiple properties dialogs are launched then the widgets lose data*/
-		
+
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 
         if (gtk_tree_selection_get_selected (account_select, &model, &iter)) {
@@ -1045,7 +1045,7 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 			g_signal_connect ((GtkWidget *)proxyCancel, "clicked", G_CALLBACK (proxy_cancel), account);
 			proxy_load_edit_dialog (account, edited);
 			gtk_widget_hide (contacts);
-			gtk_widget_show (GTK_WIDGET (priv->main));		
-		}	
+			gtk_widget_show (GTK_WIDGET (priv->main));
+		}
         }
 }
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 1d3562536f..36e1fc688c 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2005 Novell, Inc.
  *
- * Authors: 
+ * Authors:
  * Shreyas Srinivasan <sshreyas@novell.com>
  * Sankar P <psankar@novell.com>
  *
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index e6b07664ae..abfde2fd61 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -49,7 +49,7 @@ void send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_changed (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data);
 
-static EGwConnection * 
+static EGwConnection *
 get_cnc (GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
@@ -59,27 +59,27 @@ get_cnc (GtkWindow *parent_window)
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -101,7 +101,7 @@ get_cnc (GtkWindow *parent_window)
 }
 
 
-static void 
+static void
 e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
 	time_t temp;
@@ -113,12 +113,12 @@ e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 	gopts->reply_enabled = ggopts->reply_enabled;
 	gopts->reply_convenient = ggopts->reply_convenient;
 	gopts->reply_within = ggopts->reply_within;
-	
+
 	gopts->expiration_enabled = ggopts->expiration_enabled;
 	gopts->expire_after = ggopts->expire_after;
 
 	gopts->delay_enabled = ggopts->delay_enabled;
-	
+
 	/* TODO convert int to timet comparing the current day */
 	if (ggopts->delay_until) {
 		gopts->delay_until = time_add_day_with_zone (temp, ggopts->delay_until, NULL);
@@ -141,12 +141,12 @@ e_send_options_load_status_options (ESendOptionsStatusTracking *sopts, EGwSendOp
 }
 
 static void
-e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod) 
+e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod)
 {
 	EGwSendOptionsGeneral *ggopts;
-	EGwSendOptionsStatusTracking *gmopts;	
-	EGwSendOptionsStatusTracking *gcopts;	
-	EGwSendOptionsStatusTracking *gtopts;	
+	EGwSendOptionsStatusTracking *gmopts;
+	EGwSendOptionsStatusTracking *gcopts;
+	EGwSendOptionsStatusTracking *gtopts;
 
 	ggopts = e_gw_sendoptions_get_general_options (opts);
 	gmopts = e_gw_sendoptions_get_status_tracking_options (opts, "mail");
@@ -165,16 +165,16 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 	EGwConnectionStatus status;
 	account = (EAccount *) data;
 	if (!sod) {
-		sod = e_sendoptions_dialog_new ();	
+		sod = e_sendoptions_dialog_new ();
 		e_sendoptions_set_global (sod, TRUE);
-		if (!n_cnc) 
+		if (!n_cnc)
 			n_cnc = get_cnc (GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 		if (!n_cnc) {
 			g_warning ("Send Options: Could not get the connection to the server \n");
 			return;
 		}
-			
+
 		status = e_gw_connection_get_settings (n_cnc, &opts);
 		if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 			status = e_gw_connection_get_settings (n_cnc, &opts);
@@ -184,7 +184,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 		}
 		e_send_options_load_default_data (opts, sod);
 	}
-	
+
 	if (n_cnc)
 		e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
 	else
@@ -196,21 +196,21 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	GtkWidget *frame, *button, *label, *vbox;
-	
+
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
 	if(!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;
-	
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	frame = gtk_frame_new ("");
 	label = gtk_frame_get_label_widget (GTK_FRAME (frame));
-	gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>"); 
+	gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>");
 	button = gtk_button_new_with_label ("Advanced send options");
 	gtk_widget_show (button);
 
-	g_signal_connect(button, "clicked", 
+	g_signal_connect(button, "clicked",
 			    G_CALLBACK (e_sendoptions_clicked_cb), account);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (data->parent));
@@ -221,7 +221,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, 0);
 	gtk_container_add (GTK_CONTAINER (frame), button);
 	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-	gtk_widget_show (frame);	
+	gtk_widget_show (frame);
 	gtk_box_set_spacing (GTK_BOX (data->parent), 12);
 	gtk_box_pack_start (GTK_BOX (data->parent), vbox, FALSE, FALSE, 0);
 
@@ -235,7 +235,7 @@ send_options_finalize (void)
 		g_object_unref (n_cnc);
 		n_cnc = NULL;
 	}
-	
+
 	if (sod) {
 		g_object_unref (sod);
 		sod = NULL;
@@ -247,7 +247,7 @@ send_options_finalize (void)
 	}
 }
 
-static void 
+static void
 e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
 	ggopts->priority = gopts->priority;
@@ -255,7 +255,7 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 	ggopts->reply_enabled = gopts->reply_enabled;
 	ggopts->reply_convenient = gopts->reply_convenient;
 	ggopts->reply_within = gopts->reply_within;
-	
+
 	ggopts->expire_after = gopts->expire_after;
 
 	if (gopts->expire_after == 0) {
@@ -265,11 +265,11 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 		ggopts->expiration_enabled = gopts->expiration_enabled;
 
 	ggopts->delay_enabled = gopts->delay_enabled;
-	
+
 	if (gopts->delay_until) {
 		int diff;
 		icaltimetype temp, current;
-		
+
 		temp = icaltime_from_timet (gopts->delay_until, 0);
 		current = icaltime_today ();
 		diff = temp.day - current.day;
@@ -302,7 +302,7 @@ check_status_options_changed (EGwSendOptionsStatusTracking *n_sopts, EGwSendOpti
 		&& n_sopts->declined == o_sopts->declined
 		&& n_sopts->accepted == o_sopts->accepted
 		&& n_sopts->completed == o_sopts->completed));
-		
+
 }
 
 static gboolean
@@ -319,12 +319,12 @@ check_general_changed (EGwSendOptionsGeneral *n_gopts, EGwSendOptionsGeneral *o_
 }
 
 static void
-send_options_copy_check_changed (EGwSendOptions *n_opts) 
+send_options_copy_check_changed (EGwSendOptions *n_opts)
 {
 	EGwSendOptionsGeneral *ggopts, *o_gopts;
-	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;	
-	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;	
-	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;	
+	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;
+	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;
+	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;
 
 	ggopts = e_gw_sendoptions_get_general_options (n_opts);
 	gmopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail");
@@ -340,7 +340,7 @@ send_options_copy_check_changed (EGwSendOptions *n_opts)
 	e_send_options_copy_status_options (sod->data->mopts, gmopts);
 	e_send_options_copy_status_options (sod->data->copts, gcopts);
 	e_send_options_copy_status_options (sod->data->topts, gtopts);
-	
+
         if (check_general_changed (ggopts, o_gopts))
 		changed = TRUE;
 	if (check_status_options_changed (gmopts, o_gmopts))
@@ -357,21 +357,21 @@ get_source (ESourceList *list)
 	GSList *p, *l;
 	char **temp = g_strsplit (account->source->url, ";", -1);
 	char *uri = temp [0];
-	
-	
+
+
 	l = e_source_list_peek_groups (list);
 
 	for (p = l; p != NULL; p = p->next) {
 		char *so_uri;
-		GSList *r, *s;	
+		GSList *r, *s;
 		ESourceGroup *group = E_SOURCE_GROUP (p->data);
 
 		s = e_source_group_peek_sources (group);
 		for (r = s; r != NULL; r = r->next) {
 			ESource *so = E_SOURCE (r->data);
-			so_uri = e_source_get_uri (so); 
-			
-			if (so_uri) {	
+			so_uri = e_source_get_uri (so);
+
+			if (so_uri) {
 				if (!strcmp (so_uri, uri)) {
 					g_free (so_uri), so_uri = NULL;
 					return E_SOURCE (r->data);
@@ -386,31 +386,31 @@ get_source (ESourceList *list)
 	return NULL;
 }
 
-static void 
+static void
 add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify)
 {
 	char *value;
-	
+
 	switch (track) {
 		case E_GW_RETURN_NOTIFY_MAIL:
 			value =  g_strdup ("mail");
 			break;
 		default:
-			value = g_strdup ("none");		
+			value = g_strdup ("none");
 	}
-	
+
 	e_source_set_property (source, notify, value);
 	g_free (value), value = NULL;
 }
 
-static void 
+static void
 put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOptionsStatusTracking *sopts)
 {
 	char *value;
 	const char *val;
 	icaltimetype tt;
 	CamelURL  *url;
-      
+
        url = camel_url_new (account->source->url, NULL);
 
 	if (gopts) {
@@ -437,13 +437,13 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		if (gopts->reply_enabled) {
 			if (gopts->reply_convenient)
 				value = g_strdup ("convinient");
-			else 
+			else
 				value = g_strdup_printf ("%d",gopts->reply_within);
 		 } else
 			value = g_strdup ("none");
 		e_source_set_property (source, "reply-requested", value);
 		g_free (value), value = NULL;
-		
+
 			/* Delay delivery */
 		if (gopts->delay_enabled) {
 				tt = icaltime_today ();
@@ -452,7 +452,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		} else
 			val = "none";
 		e_source_set_property (source, "delay-delivery", val);
-		
+
 			/* Expiration date */
 		if (gopts->expiration_enabled)
 			value =  g_strdup_printf ("%d", gopts->expire_after);
@@ -461,7 +461,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		e_source_set_property (source, "expiration", value);
 		g_free (value), value = NULL;
 	}
-		
+
 	if (sopts) {
 			/* status tracking */
 		if (sopts->tracking_enabled) {
@@ -480,14 +480,14 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		e_source_set_property (source, "status-tracking", value);
 		g_free (value), value = NULL;
 
-		add_return_value (sopts->opened, source, "return-open"); 
-		add_return_value (sopts->accepted, source, "return-accept"); 
-		add_return_value (sopts->declined, source, "return-decline"); 
-		add_return_value (sopts->completed, source, "return-complete"); 
+		add_return_value (sopts->opened, source, "return-open");
+		add_return_value (sopts->accepted, source, "return-accept");
+		add_return_value (sopts->declined, source, "return-decline");
+		add_return_value (sopts->completed, source, "return-complete");
 	}
 }
-	
-static void 
+
+static void
 add_send_options_to_source (EGwSendOptions *n_opts)
 {
 	GConfClient *gconf = gconf_client_get_default ();
@@ -501,14 +501,14 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 
 	list = e_source_list_new_for_gconf (gconf, "/apps/evolution/tasks/sources");
 	tsource = get_source (list);
-	
+
 	gopts = e_gw_sendoptions_get_general_options (n_opts);
 	copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar");
 	topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task");
 
 	if (csource)
 		put_options_in_source (csource, gopts, copts);
-	
+
 	if (tsource)
 		put_options_in_source (tsource, gopts, topts);
 
@@ -518,16 +518,16 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 void
 send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
-	EGwSendOptions *n_opts;	
+	EGwSendOptions *n_opts;
 	EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK;
-	
+
 	if (sod) {
 		n_opts = e_gw_sendoptions_new ();
 		send_options_copy_check_changed (n_opts);
-	
-		if (changed) 
+
+		if (changed)
 			status = e_gw_connection_modify_settings (n_cnc, n_opts);
-	
+
 		if (!changed || status != E_GW_CONNECTION_STATUS_OK) {
 			g_warning (G_STRLOC "Cannot modify Send Options:  %s", e_gw_connection_get_error_message (status));
 			g_object_unref (n_opts);
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 5db802ffc3..20acd894d4 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -58,7 +58,7 @@ struct ShareInfo {
 	EMFolderTreeModel *model;
 	EMFolderSelector *emfs;
 };
-	
+
 GtkWidget * org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 void org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *target);
 static void create_shared_folder(EPopup *ep, EPopupItem *p, void *data);
@@ -68,7 +68,7 @@ void shared_folder_abort (EPlugin *ep, EConfigTarget *target);
 
 static void refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store);
 
-static void 
+static void
 refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 {
 	gchar *uri;
@@ -96,12 +96,12 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 	//camel_object_unref (store);
 }
 
-void 
+void
 shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 {
 	EMConfigTargetFolder *target =  (EMConfigTargetFolder *)tget->config->target;
 	CamelFolder *folder = target->folder;
-	CamelStore *store = folder->parent_store;	
+	CamelStore *store = folder->parent_store;
 	EMFolderTreeModel *model = mail_component_peek_tree_model (mail_component_peek ());
 	if (common) {
 		share_folder (common);
@@ -111,7 +111,7 @@ shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 	}
 }
 
-void 
+void
 shared_folder_abort (EPlugin *ep, EConfigTarget *target)
 {
 	if (common) {
@@ -122,26 +122,26 @@ shared_folder_abort (EPlugin *ep, EConfigTarget *target)
 
 struct _EMCreateFolder {
 	struct _mail_msg msg;
-	
+
 	/* input data */
 	CamelStore *store;
 	char *full_name;
 	char *parent;
 	char *name;
-	
+
 	/* output data */
 	CamelFolderInfo *fi;
-	
+
 	/* callback data */
 	void (* done) (struct _EMCreateFolder *m, void *user_data);
 	void *user_data;
 };
-	
+
 static char *
 create_folder__desc (struct _mail_msg *mm, int done)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	return g_strdup_printf (_("Creating folder `%s'"), m->full_name);
 }
 
@@ -149,9 +149,9 @@ static void
 create_folder__create (struct _mail_msg *mm)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name));
-	
+
 	if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) {
 		if (camel_store_supports_subscriptions (m->store))
 			camel_store_subscribe_folder (m->store, m->full_name, &mm->ex);
@@ -165,7 +165,7 @@ create_folder__created (struct _mail_msg *mm)
 	struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
 	CamelStore *store = CAMEL_STORE (m->store) ;
 	EGwConnection *ccnc;
-	
+
 	if (m->done) {
 		ccnc = get_cnc (store);
 		if(E_IS_GW_CONNECTION (ccnc)) {
@@ -178,12 +178,12 @@ create_folder__created (struct _mail_msg *mm)
 		m->done (m, m->user_data);
 	}
 }
-	
+
 static void
 create_folder__free (struct _mail_msg *mm)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	camel_store_free_folder_info (m->store, m->fi);
 	camel_object_unref (m->store);
 	g_free (m->full_name);
@@ -228,7 +228,7 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _
 		*name++ = '\0';
 		parent = namebuf;
 	}
-	
+
 	m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder));
 	camel_object_ref (store);
 	m->store = store;
@@ -240,11 +240,11 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _
 	g_free (namebuf);
 	id = m->msg.seq;
 	e_thread_put (mail_thread_new, (EMsg *) m);
-		
+
 	return id;
 }
 
-static void 
+static void
 users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
@@ -263,13 +263,13 @@ users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
 	path = em_folder_selector_get_selected_path (emfs);
 
 	d(printf ("Creating new folder: %s (%s)\n", path, uri));
-	
+
 	camel_exception_init (&ex);
 	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return;
 	}
-	
+
 	if (!(si = g_hash_table_lookup ((ssi->model)->store_hash, store))) {
 		g_assert_not_reached ();
 		camel_object_unref (store);
@@ -308,7 +308,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 		gtk_widget_destroy ((GtkWidget *) emfs);
 		return;
 	}
-	
+
 	/* i want store at this point to get cnc not sure proper or not*/
 	uri = em_folder_selector_get_selected_uri (emfs);
 	camel_exception_init (&ex);
@@ -324,7 +324,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 	gtk_widget_show(w);
 	gtk_box_pack_start(GTK_BOX (GTK_DIALOG (users_dialog)->vbox), (GtkWidget *) w, TRUE, TRUE, 6);
 	ssi->sf = share_folder_new (cnc, NULL);
-	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);	
+	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);
 	ssi->model = model;
 	ssi->emfs = emfs;
 	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), GTK_DIALOG (users_dialog)->vbox);
@@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 	gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300);
 	gtk_widget_show(users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
-	
+
 	camel_object_unref (store);
 	return ;
 
@@ -342,39 +342,39 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 g_slist_free (items);
 }
 
-void 
+void
 org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 {
 	GSList *menus = NULL;
 	int i = 0;
 	static int first = 0;
-	
+
 
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, NULL);
-       	
+
 }
-	
-static void 
+
+static void
 create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 {
 
@@ -382,7 +382,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog ;
 	char *uri;
-	
+
 	model = mail_component_peek_tree_model (mail_component_peek ());
 	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
 	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
@@ -392,7 +392,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 	g_signal_connect (dialog, "response", G_CALLBACK (new_folder_response), model);
 	gtk_window_set_title (GTK_WINDOW (dialog), "New Shared Folder" );
 	gtk_widget_show(dialog);
-	
+
 }
 
 GtkWidget *
@@ -407,26 +407,26 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	ShareFolder *sharing_tab;
 	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
 	CamelFolder *folder = target->folder;
-	
+
 	folder_name = g_strdup (folder->full_name);
 	folderuri = g_strdup(target->uri);
-	if (folderuri && folder_name) 
+	if (folderuri && folder_name)
 		account = g_strrstr(folderuri, "groupwise");
 	else
 		return NULL;
 
 	 /* This is kind of bad..but we don't have types for all these folders.*/
 
-	if ( !( strcmp (folder_name, "Mailbox") 
-	     && strcmp (folder_name, "Calendar") 
-	     && strcmp (folder_name, "Contacts") 
-	     && strcmp (folder_name, "Documents") 
-	     && strcmp (folder_name, "Authored") 
-	     && strcmp (folder_name, "Default Library") 
-	     && strcmp (folder_name, "Work In Progress") 
-	     && strcmp (folder_name, "Cabinet") 
-	     && strcmp (folder_name, "Sent Items") 
-	     && strcmp (folder_name, "Trash") 
+	if ( !( strcmp (folder_name, "Mailbox")
+	     && strcmp (folder_name, "Calendar")
+	     && strcmp (folder_name, "Contacts")
+	     && strcmp (folder_name, "Documents")
+	     && strcmp (folder_name, "Authored")
+	     && strcmp (folder_name, "Default Library")
+	     && strcmp (folder_name, "Work In Progress")
+	     && strcmp (folder_name, "Cabinet")
+	     && strcmp (folder_name, "Sent Items")
+	     && strcmp (folder_name, "Trash")
 	     && strcmp (folder_name, "Checklist"))) {
 
 		g_free (folderuri);
@@ -434,19 +434,19 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	}
 
 	if (account) {
-		CamelStore *store = folder->parent_store;	
-		cnc = get_cnc (store);	
-	
-		if (E_IS_GW_CONNECTION (cnc)) 
+		CamelStore *store = folder->parent_store;
+		cnc = get_cnc (store);
+
+		if (E_IS_GW_CONNECTION (cnc))
 			id = get_container_id (cnc, folder_name);
 		else
 			g_warning("Could not Connnect\n");
-		
+
 		if (cnc && id)
 			sharing_tab = share_folder_new (cnc, id);
-		else 
+		else
 			return NULL;
-		
+
 		gtk_notebook_append_page((GtkNotebook *) hook_data->parent, (GtkWidget *) sharing_tab->vbox, gtk_label_new_with_mnemonic N_("Sharing"));
 		common = sharing_tab;
 		g_free (folderuri);
@@ -455,7 +455,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 		return NULL;
 }
 
-EGwConnection * 
+EGwConnection *
 get_cnc (CamelStore *store)
 {
 		EGwConnection *cnc;
@@ -463,7 +463,7 @@ get_cnc (CamelStore *store)
 		char *use_ssl;
 		CamelService *service;
 		CamelURL *url;
-		
+
 		if (!store)
 			return  NULL;
 
@@ -481,7 +481,7 @@ get_cnc (CamelStore *store)
 			port = g_strdup (property_value);
 
 		if (use_ssl && !g_str_equal (use_ssl, "never"))
-			uri = g_strconcat ("https://", server_name, ":", port, "/soap", NULL);	
+			uri = g_strconcat ("https://", server_name, ":", port, "/soap", NULL);
 		else
 			uri = g_strconcat ("http://", server_name, ":", port, "/soap", NULL);
 
@@ -501,7 +501,7 @@ get_cnc (CamelStore *store)
 gchar *
 get_container_id(EGwConnection *cnc, gchar *fname)
 {
-	GList *container_list = NULL;	
+	GList *container_list = NULL;
 	gchar *id = NULL;
 	gchar *name;
 	gchar **names;
@@ -511,7 +511,7 @@ get_container_id(EGwConnection *cnc, gchar *fname)
 	if(names){
 		while (names [parts])
 			parts++;
-		fname = names[i]; 
+		fname = names[i];
 	}
 
 	/* get list of containers */
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 104da0fd60..b6982c520d 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -114,7 +114,7 @@ share_folder_finalise (GObject *obj)
 {
 	ShareFolder *sf = (ShareFolder *) obj;
 	g_object_unref (sf->xml);
-	free_all(sf);	
+	free_all(sf);
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -123,7 +123,7 @@ share_folder_destroy (GtkObject *obj)
 {
 
 	ShareFolder *sf = (ShareFolder *) obj;
-	free_all (sf);	
+	free_all (sf);
 	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
 }
 
@@ -161,16 +161,16 @@ free_node(SharedUser *usr)
 	return ;
 }
 
-static SharedUser * 
+static SharedUser *
 find_node(GList *list, gchar *email)
 {
 	SharedUser *user = NULL;
-	EShUsers *usr = NULL; 
+	EShUsers *usr = NULL;
 	GList *tmp;
 	gint i ;
-	
+
 	if(list){
-		tmp = g_list_first(list); 
+		tmp = g_list_first(list);
 		for(i=0; tmp  ; i++)
 		{
 			user = tmp->data;
@@ -184,7 +184,7 @@ find_node(GList *list, gchar *email)
 	return NULL;
 }
 
-static void 
+static void
 free_all (ShareFolder *sf)
 {
 	if (sf->users_list){
@@ -197,7 +197,7 @@ free_all (ShareFolder *sf)
 }
 
 
-static void	
+static void
 display_container (EGwContainer *container , ShareFolder *sf)
 {
 	gboolean byme = FALSE;
@@ -211,7 +211,7 @@ display_container (EGwContainer *container , ShareFolder *sf)
 	if(!(byme = e_gw_container_get_is_shared_by_me(container)))
 		tome = e_gw_container_get_is_shared_to_me(container);
 	if(byme || tome) {
-		e_gw_container_get_user_list (sf->gcontainer, &user_list);	
+		e_gw_container_get_user_list (sf->gcontainer, &user_list);
 		sf->users = g_list_length (user_list);
 		if(sf->users != 0) {
 			sf->is_shared = TRUE;
@@ -229,20 +229,20 @@ display_container (EGwContainer *container , ShareFolder *sf)
 				email = g_strdup (e_gw_container_get_owner (sf->gcontainer));
 				msg = g_strconcat (email, "  (Owner)", NULL);
 				gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);			 
+				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);
 				g_free (msg);
 				g_free (email);
 
 			} else
 				gtk_widget_set_sensitive (GTK_WIDGET (sf->table), TRUE);
-			/* I populate the list and set flags to 0 for the existing users*/ 
+			/* I populate the list and set flags to 0 for the existing users*/
 			while (user_list) {
 				SharedUser *shared_user = g_new0 (SharedUser , 1);
 				gboolean add, edit, delete;
 				add = edit = delete = FALSE;
 				user = user_list->data;
 				shared_user->user_node = user;
-				shared_user->flag = 0;	
+				shared_user->flag = 0;
 				email = g_strdup (user->email);
 				if (user->rights & 0x1)
 					add = TRUE;
@@ -253,7 +253,7 @@ display_container (EGwContainer *container , ShareFolder *sf)
 
 				msg = g_strdup_printf ("%s", email);
 				gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, 1, add, 2, edit, 3, delete, -1);			 
+				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, 1, add, 2, edit, 3, delete, -1);
 				sf->users_list = g_list_append (sf->users_list, shared_user);
 				g_free (msg);
 				g_free (email);
@@ -301,7 +301,7 @@ get_container_list (ShareFolder *sf)
 					g_free (id_unshared);
 					break;
 				}
-			
+
 				g_free (id_shared);
 				g_free (id_unshared);
 			}
@@ -312,15 +312,15 @@ get_container_list (ShareFolder *sf)
 }
 
 
-static void 
+static void
 shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 {
 
 	gtk_widget_set_sensitive (GTK_WIDGET (sf->table) ,TRUE);
-	sf->flag_for_ok = 0;        
+	sf->flag_for_ok = 0;
 }
 
-static void 
+static void
 not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 {
 	if (!sf->is_shared) {
@@ -354,9 +354,9 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 	for (; tmp != NULL; tmp = g_list_next (tmp)) {
 		email = e_destination_get_email (tmp->data);
 		/* You can't share a folder with yourself*/
-		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email))) 
+		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email)))
 			e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:invalid-user",email ,NULL);
-		else {	
+		else {
 			if (!g_ascii_strcasecmp (email, "" )) {
 				e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL);
 
@@ -367,7 +367,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			/*check whether already exists*/
 			if (sf->users_list && email){
 				new_user = find_node (sf->users_list, (gchar *)email);
-				if (new_user) 
+				if (new_user)
 					return ;
 
 			}
@@ -379,8 +379,8 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			new_user->flag = 1;
 			msg = g_strdup (email);
 			gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-			
-		/*  have to add code for rights*/	
+
+		/*  have to add code for rights*/
 			gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);
 			g_free(msg);
 			sf->users_list = g_list_append (sf->users_list, new_user);
@@ -400,9 +400,9 @@ remove_clicked(GtkButton *button, ShareFolder *sf)
 
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, -1);
 	usr = find_node (sf->users_list, email);
-	if (usr->flag & 0x1) {	
+	if (usr->flag & 0x1) {
 		sf->users_list = g_list_remove (sf->users_list, usr);
-		free_node(usr);		
+		free_node(usr);
 	} else {
 		usr->flag = 0;
 		usr->flag |= 0x4;
@@ -413,10 +413,10 @@ remove_clicked(GtkButton *button, ShareFolder *sf)
 	sf->flag_for_ok = 1;
 }
 
-void 
+void
 share_folder (ShareFolder *sf)
 {
-	
+
 	GList *new_list = NULL;
 	GList *update_list = NULL;
 	GList *remove_list = NULL;
@@ -425,13 +425,13 @@ share_folder (ShareFolder *sf)
 
 	for (node = sf->users_list; node; node = node->next)
 	{
-		user = node->data;	
+		user = node->data;
 		if (user->flag & 0x1)
-			new_list = g_list_append (new_list, user->user_node);	
+			new_list = g_list_append (new_list, user->user_node);
 		else if (user->flag & 0x2)
-			update_list = g_list_append (update_list, user->user_node);	
+			update_list = g_list_append (update_list, user->user_node);
 		else if (user->flag & 0x4) {
-			remove_list = g_list_append (remove_list, user->user_node);	
+			remove_list = g_list_append (remove_list, user->user_node);
 		}
 	}
 
@@ -460,7 +460,7 @@ share_folder (ShareFolder *sf)
 
 			} else {
 				g_warning("Container is Null");
-			}	
+			}
 
 
 		} else {
@@ -473,7 +473,7 @@ share_folder (ShareFolder *sf)
 
 				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK);
 			}
-		}  
+		}
 		if (remove_list) {
 			sf->sub = "Shared Folder removed";
 			if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK);
@@ -507,7 +507,7 @@ not_ok_clicked(GtkButton *button, ShareFolder *sf)
 
 }
 
-static void 
+static void
 not_cancel_clicked(GtkButton *button, GtkWidget *window)
 {
 	gtk_widget_destroy(window);
@@ -546,7 +546,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
 	gtk_widget_reparent (GTK_WIDGET (sf->window), GTK_WIDGET (sf->vbox));
 	gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW(sf->vbox));
 	gtk_window_set_modal ((GtkWindow *)sf->window, TRUE);
-	gtk_window_present ((GtkWindow *)sf->window); 
+	gtk_window_present ((GtkWindow *)sf->window);
 	gtk_widget_show_all (sf->window);
 }
 
@@ -572,7 +572,7 @@ address_button_clicked_cb (GtkButton *button, gpointer data)
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
-	static void 
+	static void
 user_selected(GtkTreeSelection *selection, ShareFolder *sf)
 {
 	GtkTreeModel *model;
@@ -581,7 +581,7 @@ user_selected(GtkTreeSelection *selection, ShareFolder *sf)
 	if (gtk_tree_selection_get_selected (selection, &model, &sf->iter))
 		gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), TRUE);
 }
-	
+
 static void
 add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 {
@@ -603,13 +603,13 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
-		user->rights |= 0x1;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, TRUE, -1);		
+		user->rights |= 0x1;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, TRUE, -1);
 	} else {
-		user->rights &= 0x6;	
+		user->rights &= 0x6;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
@@ -636,14 +636,14 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 
 	if (!right) {
-		user->rights |= 0x2;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, TRUE, -1);		
+		user->rights |= 0x2;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, TRUE, -1);
 	} else {
-		user->rights &= 0x5;	
+		user->rights &= 0x5;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
@@ -670,19 +670,19 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
-		user->rights |= 0x4;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, TRUE, -1);		
+		user->rights |= 0x4;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, TRUE, -1);
 	} else {
-		user->rights &= 0x3;	
+		user->rights &= 0x3;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
 }
 
-static void 
+static void
 share_folder_construct (ShareFolder *sf)
 {
 	GladeXML *xml;
@@ -698,7 +698,7 @@ share_folder_construct (ShareFolder *sf)
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
 	g_free (gladefile);
 
-	sf->xml =xml; 
+	sf->xml =xml;
 
 	if (!sf->xml) {
 		g_warning ("could not get xml");
@@ -766,7 +766,7 @@ share_folder_construct (ShareFolder *sf)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 	g_signal_connect (sf->cell, "toggled", G_CALLBACK (add_right_clicked), sf);
-	
+
 	sf->cell = gtk_cell_renderer_toggle_new ();
 	sf->column = gtk_tree_view_column_new_with_attributes (_("Modify"), sf->cell, "active", 2, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 5baeb6ac09..76516ac778 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -60,11 +60,11 @@ struct _GtkVBox;
 
 struct _ShareFolder {
 	GtkVBox parent_object;
-	
+
 	struct _GladeXML *xml;
-	
+
 	/* General tab */
-	
+
 	/* Default Behavior */
 	struct _GtkTreeView *user_list;
 	struct _GtkTextView *message;
@@ -83,7 +83,7 @@ struct _ShareFolder {
 	struct _GtkVBox  *vbox;
 	struct _GtkVBox  *table;
 	struct _GtkWidget *window;
-	
+
 	GList *users_list;
 	EGwContainer *gcontainer;
 	gint users;
@@ -99,12 +99,12 @@ struct _ShareFolder {
 	GList *container_list;
 	GtkTreeIter iter;
 	ENameSelector *name_selector;
-	
+
 };
 
 struct _ShareFolderClass {
 	GtkVBoxClass parent_class;
-	
+
 };
 
 GType share_folderget_type (void);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 0db1aab090..baf3f243cf 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -58,7 +58,7 @@ format_date (const char * value)
 	return str;
 }
 
-static void 
+static void
 track_status (EPopup *ep, EPopupItem *item, void *data)
 {
 	EMPopupTargetSelect *t = (EMPopupTargetSelect *)data;
@@ -97,7 +97,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 		/* No need to make any call if this header is not available.
 		This is the server side identifier for sent-items */
 		return ;
-	} 
+	}
 
 	/*Create the dialog*/
 	d = (GtkDialog *) gtk_dialog_new ();
@@ -249,7 +249,7 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
@@ -258,24 +258,24 @@ popup_free (EPopup *ep, GSList *items, void *data)
 void org_gnome_track_status (void *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
-	
+
 	int i = 0;
 	static int first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://") || g_ascii_strncasecmp ((t->folder)->full_name, "Sent Items", 10))
 		return;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, t);
-       	
+
 }