Coding style cleanups.

17 files changed, 170 insertions, 170 deletions

diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index a5568d3bba..b55672e836 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -51,7 +51,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 	g_free (relative_uri);
 
 	source_group = e_source_peek_group (source);
-	l = e_source_group_peek_sources(source_group);
+	l = e_source_group_peek_sources (source_group);
 	if (l && l->data ) {
 		e_source_set_property(source, "auth", e_source_get_property(l->data, "auth"));
 		e_source_set_property(source, "user", e_source_get_property(l->data, "user"));
diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index 308ed517c9..fff8af3dd1 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -200,7 +200,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 
 	offline_sync = camel_url_get_param (url, "offline_sync");
 
-	client = gconf_client_get_default();
+	client = gconf_client_get_default ();
 	source_list = e_source_list_new_for_gconf (client, conf_key);
 	group = e_source_group_new (group_name,  GROUPWISE_URI_PREFIX);
 
@@ -275,7 +275,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 	GSList *node_tobe_deleted;
 	const gchar *source_selection_key;
 
-        client = gconf_client_get_default();
+        client = gconf_client_get_default ();
         list = e_source_list_new_for_gconf (client, conf_key);
 	groups = e_source_list_peek_groups (list);
 
@@ -518,7 +518,7 @@ get_addressbook_names_from_server (gchar *source_url)
 
 		cnc = e_gw_connection_new (uri, url->user, password);
 		g_free (password);
-		if (!E_IS_GW_CONNECTION(cnc)) {
+		if (!E_IS_GW_CONNECTION (cnc)) {
 			if (count == 3)
 				break;
 		}
@@ -529,7 +529,7 @@ get_addressbook_names_from_server (gchar *source_url)
 
 	g_free (key);
 
-	if (E_IS_GW_CONNECTION(cnc))  {
+	if (E_IS_GW_CONNECTION (cnc))  {
 		book_list = NULL;
 		status = e_gw_connection_get_address_book_list (cnc, &book_list);
 		if (status == E_GW_CONNECTION_STATUS_OK)
@@ -603,11 +603,11 @@ add_addressbook_sources (EAccount *account)
 	if (!temp_list)
 		return FALSE;
 	for (; temp_list != NULL; temp_list = g_list_next (temp_list)) {
-		const gchar *book_name =  e_gw_container_get_name (E_GW_CONTAINER(temp_list->data));
+		const gchar *book_name =  e_gw_container_get_name (E_GW_CONTAINER (temp_list->data));
 		/* is_writable is set to TRUE if the book has isPersonal property,
 		 * by e_gw_connection_get_address_book_list()
 		 */
-		is_writable = e_gw_container_get_is_writable (E_GW_CONTAINER(temp_list->data));
+		is_writable = e_gw_container_get_is_writable (E_GW_CONTAINER (temp_list->data));
 		if (is_writable &&
 		    !g_ascii_strncasecmp (book_name, "Novell GroupWise Address Book", strlen (book_name))) {
 			/* This is a hack to not to show multiple groupwise system address books
@@ -711,7 +711,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 
 		group = E_SOURCE_GROUP (groups->data);
-		if ( strcmp ( e_source_group_peek_base_uri(group), old_base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) {
+		if ( strcmp ( e_source_group_peek_base_uri (group), old_base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) {
 			found_group = TRUE;
 			if (!delete_group) {
 				e_source_group_set_name (group, account->name);
@@ -812,7 +812,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 		if (!parent)
 			return;
 
-		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);
+		parent_url = camel_url_new (e_account_get_string (parent, E_ACCOUNT_SOURCE_URL), NULL);
 		add_proxy_sources (info, parent_url->user);
 	} else {
 		status = add_addressbook_sources (account);
@@ -1035,7 +1035,7 @@ camel_gw_listener_new (void)
 	CamelGwListener *config_listener;
 
 	config_listener = g_object_new (CAMEL_TYPE_GW_LISTENER, NULL);
-	config_listener->priv->gconf_client = gconf_client_get_default();
+	config_listener->priv->gconf_client = gconf_client_get_default ();
 
 	camel_gw_listener_construct (config_listener);
 
diff --git a/plugins/groupwise-features/groupwise-account-setup.c b/plugins/groupwise-features/groupwise-account-setup.c
index 0872a9c2a7..4cd8c3ca56 100644
--- a/plugins/groupwise-features/groupwise-account-setup.c
+++ b/plugins/groupwise-features/groupwise-account-setup.c
@@ -33,7 +33,7 @@
 static CamelGwListener *config_listener = NULL;
 
 gint e_plugin_lib_enable (EPlugin *ep, gint enable);
-GtkWidget* org_gnome_gw_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+GtkWidget* org_gnome_gw_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target);
 
 static gboolean
@@ -88,15 +88,15 @@ ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target)
 	EAccountList *al;
 	EIterator *it;
 
-	client = gconf_client_get_default();
+	client = gconf_client_get_default ();
 	al = e_account_list_new (client);
 
-	for (it = e_list_get_iterator((EList *)al);
-			e_iterator_is_valid(it);
-			e_iterator_next(it)) {
+	for (it = e_list_get_iterator ((EList *)al);
+			e_iterator_is_valid (it);
+			e_iterator_next (it)) {
 		EAccount *a;
 
-		a = (EAccount *) e_iterator_get(it);
+		a = (EAccount *) e_iterator_get (it);
 		if (!a->enabled || !is_groupwise_account (a))
 			continue;
 		set_esource_props ("/apps/evolution/calendar/sources", a, client, a->name);
@@ -124,10 +124,10 @@ e_plugin_lib_enable (EPlugin *ep, gint enable)
 	return 0;
 }
 
-GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+GtkWidget * org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
 GtkWidget *
-org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
+org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
 	if (data->old)
 		return data->old;
diff --git a/plugins/groupwise-features/gw-ui.c b/plugins/groupwise-features/gw-ui.c
index 41529b5d41..3ca262b674 100644
--- a/plugins/groupwise-features/gw-ui.c
+++ b/plugins/groupwise-features/gw-ui.c
@@ -319,7 +319,7 @@ is_meeting_owner (ECalComponent *comp, ECal *client)
 	}
 
 	if (!ret_val)
-		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+		ret_val = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
 
 	g_free (email);
 	return ret_val;
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index db906e6952..2db4eaf4e7 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -132,19 +132,19 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 			}
 		}
 
-		g_strfreev(names);
+		g_strfreev (names);
 		gtk_widget_destroy ((GtkWidget *)emfs);
 	}
 
 }
 
 static void
-accept_free(gpointer data)
+accept_free (gpointer data)
 {
 	struct AcceptData *accept_data = data;
 
 	g_object_unref (accept_data->msg);
-	g_free(accept_data);
+	g_free (accept_data);
 }
 
 static void
@@ -159,13 +159,13 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (assistant));
 	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
-	accept_data = g_new0(struct AcceptData, 1);
+	accept_data = g_new0 (struct AcceptData, 1);
 	folder_tree = (EMFolderTree *) em_folder_tree_new ();
 
 	dialog = em_folder_selector_create_new (parent, folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
-	uri = em_folder_tree_get_selected_uri(folder_tree);
+	uri = em_folder_tree_get_selected_uri (folder_tree);
 	em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
-	g_free(uri);
+	g_free (uri);
 	accept_data->msg = msg;
 	g_object_ref (msg);
 	accept_data->model = EM_FOLDER_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree)));
@@ -194,12 +194,12 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 
 	if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
 	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
-	    || !camel_internet_address_get(from_addr, 0, &name, &email)
+	    || !camel_internet_address_get (from_addr, 0, &name, &email)
 	    || (dw = camel_medium_get_content (CAMEL_MEDIUM (msg))) == NULL) {
 		return;
 	} else {
 		if (CAMEL_IS_MULTIPART (dw)) {
-			dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0));
+			dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part ((CamelMultipart *)dw, 0));
 			if (dw == NULL)
 				return;
 		}
@@ -210,7 +210,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		camel_stream_write (stream, "", 1, NULL);
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
-		if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) {
+		if (from_addr && camel_internet_address_get (from_addr, 0, &name, &email)) {
 			GtkWidget *page;
 			GtkAssistant *assistant = GTK_ASSISTANT (gtk_assistant_new ());
 
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 6e72b67320..a633f0bcc3 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -48,7 +48,7 @@ static void
 junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js)
 {
 	if (response == GTK_RESPONSE_ACCEPT) {
-		commit_changes(js);
+		commit_changes (js);
 		abort_changes (js);
 	}
 	else
@@ -96,7 +96,7 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 	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);
-	g_free(msg);
+	g_free (msg);
 
 	junk_tab = junk_settings_new (cnc);
 	w = (GtkWidget *)junk_tab->vbox;
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 23f4a0833f..242d037bb4 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -43,7 +43,7 @@ static void junk_settings_class_init (JunkSettingsClass *class);
 static void junk_settings_init       (JunkSettings *js);
 static void junk_settings_destroy    (GtkObject *obj);
 static void junk_settings_finalise   (GObject *obj);
-static void free_all(JunkSettings *js);
+static void free_all (JunkSettings *js);
 static void get_junk_list (JunkSettings *js);
 static void disable_clicked (GtkRadioButton *button, JunkSettings *js);
 static void enable_clicked (GtkRadioButton *button, JunkSettings *js);
@@ -88,7 +88,7 @@ junk_settings_finalise (GObject *obj)
 {
 	JunkSettings *js = (JunkSettings *) obj;
 	g_object_unref (js->builder);
-	free_all(js);
+	free_all (js);
 
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
@@ -112,10 +112,10 @@ junk_settings_init (JunkSettings *js)
 }
 
 static void
-free_entry_node(EGwJunkEntry *entry)
+free_entry_node (EGwJunkEntry *entry)
 {
 	if (entry) {
-		g_free(entry->match);
+		g_free (entry->match);
 		entry->match = NULL;
 	}
 
@@ -123,12 +123,12 @@ free_entry_node(EGwJunkEntry *entry)
 }
 
 static void
-free_node(JunkEntry *nentry)
+free_node (JunkEntry *nentry)
 {
 	EGwJunkEntry *junk_entry = nentry->entry;
 
 	if (junk_entry) {
-		g_free(junk_entry->match);
+		g_free (junk_entry->match);
 		junk_entry->match = NULL;
 	}
 
@@ -136,7 +136,7 @@ free_node(JunkEntry *nentry)
 }
 
 static JunkEntry *
-find_node(GList *list, gchar *match)
+find_node (GList *list, gchar *match)
 {
 	JunkEntry *one_entry = NULL;
 	EGwJunkEntry *ent = NULL;
@@ -144,16 +144,16 @@ find_node(GList *list, gchar *match)
 	gint i;
 
 	if (list) {
-		tmp = g_list_first(list);
+		tmp = g_list_first (list);
 		for (i=0; tmp; i++)
 		{
 			one_entry = tmp->data;
 			ent = one_entry->entry;
-			if (!g_ascii_strcasecmp(ent->match, match)) {
+			if (!g_ascii_strcasecmp (ent->match, match)) {
 				return one_entry;
 	/*if found, it returns that user*/
 			}
-			tmp= g_list_next(tmp);
+			tmp= g_list_next (tmp);
 		}
 	}
 
@@ -182,8 +182,8 @@ get_junk_list (JunkSettings *js)
 		if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) {
 			if (use_junk) {
 				js->enabled = TRUE;
-				gtk_toggle_button_set_active((GtkToggleButton *) js->enable, TRUE);
-				enable_clicked(js->enable , js);
+				gtk_toggle_button_set_active ((GtkToggleButton *) js->enable, TRUE);
+				enable_clicked (js->enable , js);
 				gtk_widget_set_sensitive (GTK_WIDGET (js->table), TRUE);
 			} else {
 				gtk_toggle_button_set_active ((GtkToggleButton *) js->disable,  TRUE);
@@ -298,7 +298,7 @@ disable_clicked (GtkRadioButton *button, JunkSettings *js)
 }
 
 static void
-add_clicked(GtkButton *button, JunkSettings *js)
+add_clicked (GtkButton *button, JunkSettings *js)
 {
 	const gchar *email = NULL;
 	const gchar *self_email = NULL;
@@ -321,14 +321,14 @@ add_clicked(GtkButton *button, JunkSettings *js)
 			}
 			junk_entry = g_new0 (EGwJunkEntry, 1);
 			new_entry = g_new0 (JunkEntry, 1);
-			junk_entry->match = g_strdup(email);
+			junk_entry->match = g_strdup (email);
 /*XXX:populate more fields*/
 			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_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);
-			g_free(msg);
+			g_free (msg);
 			js->junk_list = g_list_append (js->junk_list, new_entry);
 			js->flag_for_ok = 0;
 		}
@@ -336,7 +336,7 @@ add_clicked(GtkButton *button, JunkSettings *js)
 }
 
 static void
-remove_clicked(GtkButton *button, JunkSettings *js)
+remove_clicked (GtkButton *button, JunkSettings *js)
 {
 	JunkEntry *entry = NULL;
 	gchar *email;
@@ -345,7 +345,7 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 	entry = find_node (js->junk_list, email);
 	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;
@@ -355,11 +355,11 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 }
 
 static void
-user_selected(GtkTreeSelection *selection, JunkSettings *js)
+user_selected (GtkTreeSelection *selection, JunkSettings *js)
 {
 	GtkTreeModel *model;
 
-	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
+	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);
 
@@ -387,7 +387,7 @@ junk_settings_construct (JunkSettings *js)
 
 	js->remove = GTK_BUTTON(e_builder_get_widget(js->builder, "Remove"));
 	g_signal_connect ((GtkWidget *) js->remove, "clicked", G_CALLBACK (remove_clicked), js);
-	gtk_widget_set_sensitive(GTK_WIDGET (js->remove), FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (js->remove), FALSE);
 
 	js->entry = GTK_ENTRY (e_builder_get_widget (js->builder, "entry4"));
 		/*TODO:connect entry and label*/
@@ -420,7 +420,7 @@ junk_settings_new (EGwConnection *ccnc)
 	junk_settings_construct (new);
 	new->cnc = ccnc;
 	if (new->cnc)
-	get_junk_list(new);
+	get_junk_list (new);
 
 	return (JunkSettings *) new;
 }
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 466da1cb23..1213311e36 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -76,7 +76,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 
 	cnc = get_cnc (parent_store);
 
-	if (cnc && E_IS_GW_CONNECTION(cnc)) {
+	if (cnc && E_IS_GW_CONNECTION (cnc)) {
 		confirm_dialog = gtk_dialog_new_with_buttons (
 			_("Message Retract"),
 			GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
@@ -109,7 +109,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 			else {
 				GtkWidget *dialog;
 				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_dialog_run (GTK_DIALOG (dialog));
 				gtk_widget_destroy (dialog);
 			}
 		}
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 63bbbe7c9b..8b59946330 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -59,7 +59,7 @@ add_day_to_time (time_t time, gint days)
 }
 
 static void
-feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
+feed_input_data (ESendOptionsDialog * dialog, gint state, gpointer data)
 {
 	EMsgComposer *comp;
 	gchar value[100];
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 25518ba9a7..12d095bb31 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -317,7 +317,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 
 	for (i=0; email[i]!='\0' && email[i]!='@' ; i++);
 	if (email[i]=='@')
-		name = g_strndup(email, i);
+		name = g_strndup (email, i);
 	else {
 		e_alert_run_dialog_for_args (error_parent,
 					     "org.gnome.evolution.proxy-login:invalid-user",
@@ -343,24 +343,24 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 	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 = 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);
 		uri = camel_url_copy (parent);
 		camel_url_set_user (uri, name);
 		proxy_source_url = camel_url_to_string (uri, CAMEL_URL_HIDE_PASSWORD);
-		dstAccount = e_account_new();
-		e_account_set_string(dstAccount, E_ACCOUNT_ID_ADDRESS, email);
+		dstAccount = e_account_new ();
+		e_account_set_string (dstAccount, E_ACCOUNT_ID_ADDRESS, email);
 		dstAccount->enabled = TRUE;
-		e_account_set_string(dstAccount, E_ACCOUNT_SOURCE_URL, proxy_source_url);
+		e_account_set_string (dstAccount, E_ACCOUNT_SOURCE_URL, proxy_source_url);
 		e_account_set_string (dstAccount, E_ACCOUNT_TRANSPORT_URL, proxy_source_url);
 		e_account_set_string (dstAccount, E_ACCOUNT_NAME, email);
 		e_account_set_string (dstAccount, E_ACCOUNT_ID_NAME, name);
 		e_account_set_string (dstAccount, E_ACCOUNT_PROXY_PARENT_UID, srcAccount->uid);
-		e_account_list_add(accounts, dstAccount);
+		e_account_list_add (accounts, dstAccount);
 		e_account_list_change (accounts, srcAccount);
-		e_account_list_save(accounts);
+		e_account_list_save (accounts);
 		g_object_set_data ((GObject *)dstAccount, "permissions", GINT_TO_POINTER(permissions));
-		mail_get_store(e_account_get_string(dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount);
+		mail_get_store (e_account_get_string (dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount);
 
 		g_free (proxy_source_url);
 		g_free (parent_source_url);
@@ -395,7 +395,7 @@ proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data)
 }
 
 static void
-proxy_login_tree_view_changed_cb(GtkDialog *dialog)
+proxy_login_tree_view_changed_cb (GtkDialog *dialog)
 {
 	proxyLoginPrivate *priv = pld->priv;
 	GtkTreeSelection* account_select;
@@ -412,7 +412,7 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 	gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1);
 	account_mailid = g_strrstr (account_mailid, "\n") + 1;
 	account_name_tbox = e_builder_get_widget (priv->builder, "account_name");
-	gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid);
+	gtk_entry_set_text ((GtkEntry*) account_name_tbox,account_mailid);
 }
 
 static void
@@ -459,14 +459,14 @@ proxy_login_update_tree (void)
 
 	gtk_tree_store_clear (priv->store);
 	if (proxy_list != NULL) {
-		n = g_list_length(proxy_list);
+		n = g_list_length (proxy_list);
 		for (i=0;i<n;i=i+2) {
-			proxy_name = g_list_nth_data(proxy_list,i);
-			proxy_email = g_list_nth_data(proxy_list,i+1);
+			proxy_name = g_list_nth_data (proxy_list,i);
+			proxy_email = g_list_nth_data (proxy_list,i+1);
 			gtk_tree_store_append (priv->store, &iter, NULL);
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(proxy_name, "\n", proxy_email, NULL), -1);
 		}
-		gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree),GTK_TREE_MODEL (priv->store));
+		gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree),GTK_TREE_MODEL (priv->store));
 	}
 
 	g_free (file_name);
@@ -513,7 +513,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view)
 	if (cnc)
 		g_object_unref (cnc);
 
-	pld = proxy_login_new();
+	pld = proxy_login_new ();
 	priv = pld->priv;
 
 	priv->builder = gtk_builder_new ();
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 65e28cdf78..3c4ba8c392 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -58,5 +58,5 @@ proxyLogin* proxy_dialog_new (void);
 static void proxy_soap_login (gchar *email, GtkWindow *error_parent);
 gchar *parse_email_for_name (gchar *email);
 static void proxy_login_update_tree (void);
-static void proxy_login_tree_view_changed_cb(GtkDialog *dialog);
+static void proxy_login_tree_view_changed_cb (GtkDialog *dialog);
 static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password);
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7b3cae23a8..5a01a6c281 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -347,7 +347,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 									     email, NULL);
 						return -1;
 					}
-					if (!g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
+					if (!g_ascii_strcasecmp (e_gw_connection_get_user_email (prd->cnc), email)) {
 						e_alert_run_dialog_for_args (parent,
 									     "org.gnome.evolution.proxy:invalid-user",
 									     email, NULL);
@@ -357,7 +357,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 					/*check whether already exists*/
 					existing_list = priv->proxy_list;
 
-					for (;existing_list; existing_list = g_list_next(existing_list)) {
+					for (;existing_list; existing_list = g_list_next (existing_list)) {
 						new_proxy = (proxyHandler *) existing_list->data;
 						if (!g_ascii_strcasecmp (new_proxy->proxy_email, email)) {
 							if (new_proxy->flags & E_GW_PROXY_DELETED) {
@@ -554,7 +554,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 		/* Handle case where the structure is new and deleted*/
 		if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
 
-			if ( !E_IS_GW_CONNECTION(prd->cnc))	/* Add check in case the connection request fails*/
+			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 )
@@ -616,7 +616,7 @@ proxy_update_tree_view (EAccount *account)
 	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 )) {
@@ -630,7 +630,7 @@ proxy_update_tree_view (EAccount *account)
 		g_object_unref (broken_image);
 
 	/*Fixme : Desensitize buttons if the list is Null*/
-	gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree), GTK_TREE_MODEL (priv->store));
+	gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree), GTK_TREE_MODEL (priv->store));
 }
 
 GtkWidget*
@@ -749,12 +749,12 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun
 				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 */
@@ -773,7 +773,7 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun
 }
 
 static void
-proxy_cancel(GtkWidget *button, EAccount *account)
+proxy_cancel (GtkWidget *button, EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
@@ -830,7 +830,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name)
 	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))
@@ -949,40 +949,40 @@ proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 	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);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->mail_read), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_MAIL_WRITE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->mail_write), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->mail_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_APPOINTMENT_READ)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->app_read), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->app_read), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_APPOINTMENT_WRITE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->app_write), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->app_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_NOTES_READ)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_read), TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->note_read), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_NOTES_WRITE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_write), TRUE);
+		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
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 0661239e59..5dc1bb47e6 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -55,7 +55,7 @@ GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data);
 static void proxy_add_account (GtkWidget *button, EAccount *account);
 static void proxy_remove_account (GtkWidget *button, EAccount *account);
 static void proxy_update_tree_view (EAccount *account);
-static void proxy_cancel(GtkWidget *button, EAccount *account);
+static void proxy_cancel (GtkWidget *button, EAccount *account);
 static void proxy_edit_account (GtkWidget *button, EAccount *account);
 void proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data);
 void proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data);
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 3951de9df1..21485a96c2 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -161,7 +161,7 @@ create_folder_done (struct _EMCreateFolder *m)
 			(ssi->sf)->cnc = ccnc;
 
 			(ssi->sf)->container_id = g_strdup (get_container_id ((ssi->sf)->cnc, m->full_name));
-			share_folder(ssi->sf);
+			share_folder (ssi->sf);
 		}
 
 		m->done (m, m->user_data);
@@ -233,7 +233,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct
 }
 
 static void
-users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
+users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	EMFolderSelector *emfs = ssi->emfs;
@@ -242,7 +242,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 
 	if (response != GTK_RESPONSE_OK) {
 		gtk_widget_destroy ((GtkWidget *) emfs);
-		gtk_widget_destroy(dialog);
+		gtk_widget_destroy (dialog);
 		return;
 	}
 
@@ -262,16 +262,16 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 		return;
 	}
 
-	if (CAMEL_IS_VEE_STORE(store)) {
+	if (CAMEL_IS_VEE_STORE (store)) {
 		EMVFolderRule *rule;
 
 		/* ensures vfolder is running */
 		vfolder_load_storage ();
 
-		rule = em_vfolder_rule_new();
-		e_filter_rule_set_name((EFilterRule *)rule, path);
-		vfolder_gui_add_rule(rule);
-		gtk_widget_destroy((GtkWidget *)emfs);
+		rule = em_vfolder_rule_new ();
+		e_filter_rule_set_name ((EFilterRule *)rule, path);
+		vfolder_gui_add_rule (rule);
+		gtk_widget_destroy ((GtkWidget *)emfs);
 	} else {
 		g_object_ref (emfs);
 		ssi->d = dialog;
@@ -292,7 +292,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	EGwConnection *cnc;
 	CamelStore *store;
 
-	ssi = g_new0(struct ShareInfo, 1);
+	ssi = g_new0 (struct ShareInfo, 1);
 	if (response != GTK_RESPONSE_OK) {
 		gtk_widget_destroy ((GtkWidget *) emfs);
 		return;
@@ -309,17 +309,17 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	users_dialog = gtk_dialog_new_with_buttons (
 			_("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 	w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions"));
-	gtk_widget_show(w);
+	gtk_widget_show (w);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog));
-	gtk_box_pack_start(GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6);
+	gtk_box_pack_start (GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6);
 	ssi->sf = share_folder_new (cnc, NULL);
 	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);
 	ssi->model = model;
 	ssi->emfs = emfs;
 	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area);
-	gtk_widget_hide((GtkWidget*) emfs);
+	gtk_widget_hide ((GtkWidget*) emfs);
 	gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300);
-	gtk_widget_show(users_dialog);
+	gtk_widget_show (users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 
 	g_object_unref (store);
@@ -343,11 +343,11 @@ gw_new_shared_folder_cb (GtkAction *action, EShellView *shell_view)
 	uri = em_folder_tree_get_selected_uri (folder_tree);
 	if (uri != NULL)
 		em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
-	g_free(uri);
+	g_free (uri);
 
 	g_signal_connect (dialog, "response", G_CALLBACK (new_folder_response), gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree)));
 	gtk_window_set_title (GTK_WINDOW (dialog), "New Shared Folder" );
-	gtk_widget_show(dialog);
+	gtk_widget_show (dialog);
 }
 
 GtkWidget *
@@ -364,7 +364,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	CamelFolder *folder = target->folder;
 
 	folder_name = g_strdup (camel_folder_get_full_name (folder));
-	folderuri = g_strdup(target->uri);
+	folderuri = g_strdup (target->uri);
 	if (folderuri && folder_name)
 		account = g_strrstr(folderuri, "groupwise");
 	else
@@ -424,7 +424,7 @@ get_cnc (CamelStore *store)
 		if (!store)
 			return  NULL;
 
-		service = CAMEL_SERVICE(store);
+		service = CAMEL_SERVICE (store);
 		url = service->url;
 		server_name = g_strdup (url->host);
 		user = g_strdup (url->user);
@@ -432,7 +432,7 @@ get_cnc (CamelStore *store)
 		use_ssl = g_strdup (camel_url_get_param (url, "use_ssl"));
 		if (property_value == NULL)
 			port = g_strdup ("7191");
-		else if (strlen(property_value) == 0)
+		else if (strlen (property_value) == 0)
 			port = g_strdup ("7191");
 		else
 			port = g_strdup (property_value);
@@ -456,7 +456,7 @@ get_cnc (CamelStore *store)
 }
 
 gchar *
-get_container_id(EGwConnection *cnc, const gchar *fname)
+get_container_id (EGwConnection *cnc, const gchar *fname)
 {
 	GList *container_list = NULL;
 	gchar *id = NULL;
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 365b7c1fb1..d27a463f5b 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -45,18 +45,18 @@ static void share_folder_class_init (ShareFolderClass *class);
 static void share_folder_init       (ShareFolder *sf);
 static void share_folder_destroy    (GtkObject *obj);
 static void share_folder_finalise   (GObject *obj);
-static void free_user_node(EShUsers *user);
-static void free_node(SharedUser *user);
-static void free_all(ShareFolder *sf);
-static SharedUser * find_node(GList *list, gchar *email);
+static void free_user_node (EShUsers *user);
+static void free_node (SharedUser *user);
+static void free_all (ShareFolder *sf);
+static SharedUser * find_node (GList *list, gchar *email);
 static void get_container_list (ShareFolder *sf);
-static void user_selected(GtkTreeSelection *selection, ShareFolder *sf);
+static void user_selected (GtkTreeSelection *selection, ShareFolder *sf);
 static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf);
 static void shared_clicked (GtkRadioButton *button, ShareFolder *sf);
-static void add_clicked(GtkButton *button, ShareFolder *sf);
-static void remove_clicked(GtkButton *button, ShareFolder *sf);
-static void not_ok_clicked(GtkButton *button, ShareFolder *sf);
-static void not_cancel_clicked(GtkButton *button, GtkWidget *window);
+static void add_clicked (GtkButton *button, ShareFolder *sf);
+static void remove_clicked (GtkButton *button, ShareFolder *sf);
+static void not_ok_clicked (GtkButton *button, ShareFolder *sf);
+static void not_cancel_clicked (GtkButton *button, GtkWidget *window);
 static void share_folder_construct (ShareFolder *sf);
 GType share_folder_get_type (void);
 
@@ -100,7 +100,7 @@ share_folder_finalise (GObject *obj)
 {
 	ShareFolder *sf = (ShareFolder *) obj;
 	g_object_unref (sf->builder);
-	free_all(sf);
+	free_all (sf);
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -127,28 +127,28 @@ share_folder_init (ShareFolder *sf)
 }
 
 static void
-free_user_node(EShUsers *user)
+free_user_node (EShUsers *user)
 {
 	if (user) {
-		g_free(user->email);
+		g_free (user->email);
 		user->email = NULL;
 	}
 	return;
 }
 
 static void
-free_node(SharedUser *usr)
+free_node (SharedUser *usr)
 {
 	EShUsers *user = usr->user_node;
 	if (user) {
-		g_free(user->email);
+		g_free (user->email);
 		user->email = NULL;
 	}
 	return;
 }
 
 static SharedUser *
-find_node(GList *list, gchar *email)
+find_node (GList *list, gchar *email)
 {
 	SharedUser *user = NULL;
 	EShUsers *usr = NULL;
@@ -156,15 +156,15 @@ find_node(GList *list, gchar *email)
 	gint i;
 
 	if (list) {
-		tmp = g_list_first(list);
+		tmp = g_list_first (list);
 		for (i=0; tmp; i++)
 		{
 			user = tmp->data;
 			usr = user->user_node;
-			if (!g_ascii_strcasecmp(usr->email, email)) {
+			if (!g_ascii_strcasecmp (usr->email, email)) {
 				return user; /*if found, it returns that user*/
 			}
-			tmp= g_list_next(tmp);
+			tmp= g_list_next (tmp);
 		}
 	}
 	return NULL;
@@ -193,15 +193,15 @@ display_container (EGwContainer *container , ShareFolder *sf)
 	EShUsers *user = NULL;
 
 	sf->gcontainer = container;
-	if (!(byme = e_gw_container_get_is_shared_by_me(container)))
-		tome = e_gw_container_get_is_shared_to_me(container);
+	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);
 		sf->users = g_list_length (user_list);
 		if (sf->users != 0) {
 			sf->is_shared = TRUE;
-			gtk_toggle_button_set_active((GtkToggleButton *) sf->shared, TRUE);
-			shared_clicked(sf->shared , sf);
+			gtk_toggle_button_set_active ((GtkToggleButton *) sf->shared, TRUE);
+			shared_clicked (sf->shared , sf);
 			if (tome) {
 				g_print ("Entered: inside too\n");
 
@@ -270,16 +270,16 @@ get_container_list (ShareFolder *sf)
 				gchar *id_shared = NULL;
 				gchar *id_unshared = NULL;
 
-				id_shared = g_strdup(e_gw_container_get_id (container->data));
+				id_shared = g_strdup (e_gw_container_get_id (container->data));
 
 				/* this has to be done since id changes after the folder is shared*/
 				if ( g_str_has_suffix (id_shared, "35")) {
 					tail = g_strsplit(id_shared, "@", 2);
 					id_unshared = g_strconcat(tail[0], "@", "13", NULL);
-					g_strfreev(tail);
+					g_strfreev (tail);
 				}
 
-				if ((id_shared && !g_ascii_strcasecmp(id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp(id_unshared, sf->container_id))) {
+				if ((id_shared && !g_ascii_strcasecmp (id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp (id_unshared, sf->container_id))) {
 
 					display_container (E_GW_CONTAINER (container->data), sf);
 					g_free (id_shared);
@@ -317,7 +317,7 @@ not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 }
 
 static void
-add_clicked(GtkButton *button, ShareFolder *sf)
+add_clicked (GtkButton *button, ShareFolder *sf)
 {
 	const gchar *email = NULL;
 	const gchar *self_email = NULL;
@@ -359,7 +359,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			}
 			usr = g_new0 (EShUsers, 1);
 			new_user = g_new0 (SharedUser, 1);
-			usr->email = g_strdup(email);
+			usr->email = g_strdup (email);
 			usr->rights = rights;
 			new_user->user_node = usr;
 			new_user->flag = 1;
@@ -368,7 +368,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 
 		/*  have to add code for rights*/
 			gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);
-			g_free(msg);
+			g_free (msg);
 			sf->users_list = g_list_append (sf->users_list, new_user);
 			sf->flag_for_ok = 0;
 		}
@@ -378,7 +378,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 }
 
 static void
-remove_clicked(GtkButton *button, ShareFolder *sf)
+remove_clicked (GtkButton *button, ShareFolder *sf)
 {
 
 	SharedUser *usr = NULL;
@@ -388,7 +388,7 @@ remove_clicked(GtkButton *button, ShareFolder *sf)
 	usr = find_node (sf->users_list, email);
 	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;
@@ -474,7 +474,7 @@ share_folder (ShareFolder *sf)
 }
 
 static void
-not_ok_clicked(GtkButton *button, ShareFolder *sf)
+not_ok_clicked (GtkButton *button, ShareFolder *sf)
 {
 
 	gchar *subj = NULL;
@@ -498,13 +498,13 @@ not_ok_clicked(GtkButton *button, ShareFolder *sf)
 }
 
 static void
-not_cancel_clicked(GtkButton *button, GtkWidget *window)
+not_cancel_clicked (GtkButton *button, GtkWidget *window)
 {
-	gtk_widget_destroy(window);
+	gtk_widget_destroy (window);
 }
 
 static void
-notification_clicked(GtkButton *button, ShareFolder *sf)
+notification_clicked (GtkButton *button, ShareFolder *sf)
 {
 	static  GtkBuilder *builder;
 	GtkButton *not_ok;
@@ -520,7 +520,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
 	vbox = GTK_WIDGET (e_builder_get_widget (builder, "vbox191"));
 	gtk_container_add (GTK_CONTAINER (sf->window), vbox);
 	sf->subject = GTK_ENTRY (e_builder_get_widget (builder, "entry3"));
-	gtk_entry_set_text(GTK_ENTRY (sf->subject) , sf->sub);
+	gtk_entry_set_text (GTK_ENTRY (sf->subject) , sf->sub);
 	sf->message = GTK_TEXT_VIEW (e_builder_get_widget (builder, "textview1"));
 	not_ok = GTK_BUTTON (e_builder_get_widget (builder, "nOK"));
 	g_signal_connect ((gpointer) not_ok, "clicked", G_CALLBACK (not_ok_clicked), sf);
@@ -552,7 +552,7 @@ user_selected (GtkTreeSelection *selection, ShareFolder *sf)
 {
 	GtkTreeModel *model;
 
-	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
+	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 	if (gtk_tree_selection_get_selected (selection, &model, &sf->iter))
 		gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), TRUE);
 }
@@ -572,7 +572,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1);
-	usr = find_node(sf->users_list, email);
+	usr = find_node (sf->users_list, email);
 	if (!usr) {
 		gtk_tree_path_free (path);
 		return;
@@ -591,7 +591,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 }
 
 static void
-edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
+edit_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 {
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
@@ -605,7 +605,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 2, &right , -1);
-	usr = find_node(sf->users_list, email);
+	usr = find_node (sf->users_list, email);
 	if (!usr) {
 		gtk_tree_path_free (path);
 		return;
@@ -625,7 +625,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 }
 
 static void
-delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
+delete_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 {
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
@@ -639,7 +639,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 3, &right , -1);
-	usr = find_node(sf->users_list, email);
+	usr = find_node (sf->users_list, email);
 	if (!usr) {
 		gtk_tree_path_free (path);
 		return;
@@ -700,14 +700,14 @@ share_folder_construct (ShareFolder *sf)
 
 	sf->remove = GTK_BUTTON(e_builder_get_widget(sf->builder, "Remove"));
 	g_signal_connect ((GtkWidget *) sf->remove, "clicked", G_CALLBACK (remove_clicked), sf);
-	gtk_widget_set_sensitive(GTK_WIDGET (sf->remove), FALSE);
+	gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), FALSE);
 
 	sf->notification = GTK_BUTTON (e_builder_get_widget (sf->builder, "Notification"));
 	g_signal_connect((GtkWidget *) sf->notification, "clicked", G_CALLBACK (notification_clicked), sf);
 
 	sf->name = GTK_ENTRY (e_builder_get_widget (sf->builder, "entry4"));
 		/*TODO:connect name and label*/
-	gtk_widget_hide (GTK_WIDGET(sf->name));
+	gtk_widget_hide (GTK_WIDGET (sf->name));
 	box = GTK_WIDGET (e_builder_get_widget (sf->builder, "hbox227"));
 	gtk_box_pack_start (GTK_BOX (box), (GtkWidget *) name_selector_entry, TRUE, TRUE, 0);
 	gtk_widget_show ((GtkWidget *) name_selector_entry);
@@ -757,7 +757,7 @@ share_folder_new (EGwConnection *ccnc, gchar *id)
 	new->cnc = ccnc;
 	new->container_id = id;
 	if (ccnc && id)
-	get_container_list(new);
+	get_container_list (new);
 
 	return (ShareFolder *) new;
 }
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 4df979d4ef..2f4bf0c9f1 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -91,7 +91,7 @@ struct _ShareFolderClass {
 
 GType share_folderget_type (void);
 struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id);
-void share_folder(struct _ShareFolder *sf);
+void share_folder (struct _ShareFolder *sf);
 gchar * get_container_id (EGwConnection *cnc, const gchar *fname);
 EGwConnection * get_cnc (CamelStore *store);
 
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index d350ef08ee..2ff2764a12 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -50,7 +50,7 @@ format_date (const gchar * value)
 	time = e_gw_connection_get_date_from_string (value);
 	str = ctime (&time);
 
-	str[strlen(str)-1] = '\0';
+	str[strlen (str)-1] = '\0';
 	return str;
 }
 
@@ -126,7 +126,7 @@ gw_track_message_status_cb (GtkAction *action,
 	win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL);
 	gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (win));
 	vbox = (GtkVBox *) gtk_vbox_new (FALSE, 12);
-	gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET(vbox));
+	gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET (vbox));
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
 	gtk_scrolled_window_set_policy (win, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
@@ -140,7 +140,7 @@ gw_track_message_status_cb (GtkAction *action,
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
-	widget = gtk_label_new (camel_mime_message_get_subject(msg));
+	widget = gtk_label_new (camel_mime_message_get_subject (msg));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_table_attach (table, widget , 1, 2, row,  row + 1, GTK_FILL, 0, 0, 0);
 	row++;
@@ -162,7 +162,7 @@ gw_track_message_status_cb (GtkAction *action,
 	/* creation date */
 	time = camel_mime_message_get_date (msg, NULL);
 	time_str = ctime (&time);
-	time_str[strlen(time_str)-1] = '\0' ;
+	time_str[strlen (time_str)-1] = '\0' ;
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:"));
 	widget = gtk_label_new (boldmsg);
 	g_free (boldmsg);
@@ -186,7 +186,7 @@ gw_track_message_status_cb (GtkAction *action,
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
 	cnc = get_cnc (camel_folder_get_parent_store (folder));
 
-	if (E_IS_GW_CONNECTION(cnc)) {
+	if (E_IS_GW_CONNECTION (cnc)) {
 		GSList *recipient_list;
 		e_gw_connection_get_item (
 			cnc, get_container_id (cnc, "Sent Items"),
@@ -211,46 +211,46 @@ gw_track_message_status_cb (GtkAction *action,
 
 			if (recipient->delivered_date) {
 				label = g_string_append (label, _("Delivered: "));
-				label = g_string_append (label, format_date(recipient->delivered_date));
+				label = g_string_append (label, format_date (recipient->delivered_date));
 				label = g_string_append_c (label, '\n');
 			}
 
 			if (recipient->opened_date) {
 				label = g_string_append (label, _("Opened: "));
-				label = g_string_append (label, format_date(recipient->opened_date));
+				label = g_string_append (label, format_date (recipient->opened_date));
 				label = g_string_append_c (label, '\n');
 			}
 			if (recipient->accepted_date) {
 				label = g_string_append (label, _("Accepted: "));
-				label = g_string_append (label, format_date(recipient->accepted_date));
+				label = g_string_append (label, format_date (recipient->accepted_date));
 				label = g_string_append_c (label, '\n');
 			}
 			if (recipient->deleted_date) {
 				label = g_string_append (label, _("Deleted: "));
-				label = g_string_append (label, format_date(recipient->deleted_date));
+				label = g_string_append (label, format_date (recipient->deleted_date));
 				label = g_string_append_c (label, '\n');
 			}
 			if (recipient->declined_date) {
 				label = g_string_append (label, _("Declined: "));
-				label = g_string_append (label, format_date(recipient->declined_date));
+				label = g_string_append (label, format_date (recipient->declined_date));
 				label = g_string_append_c (label, '\n');
 			}
 			if (recipient->completed_date) {
 				label = g_string_append (label, _("Completed: "));
-				label = g_string_append (label, format_date(recipient->completed_date));
+				label = g_string_append (label, format_date (recipient->completed_date));
 				label = g_string_append_c (label, '\n');
 			}
 			if (recipient->undelivered_date) {
 				label = g_string_append (label, _("Undelivered: "));
-				label = g_string_append (label, format_date(recipient->undelivered_date));
+				label = g_string_append (label, format_date (recipient->undelivered_date));
 				label = g_string_append_c (label, '\n');
 			}
 
-			detail = GTK_LABEL(gtk_label_new (label->str));
+			detail = GTK_LABEL (gtk_label_new (label->str));
 			g_string_free (label, TRUE);
 			gtk_label_set_selectable (detail, TRUE);
 			gtk_label_set_use_markup (detail, TRUE);
-			gtk_table_attach (table, GTK_WIDGET(detail) , 1, 2, row,  row+1, GTK_FILL, 0, 0, 0);
+			gtk_table_attach (table, GTK_WIDGET (detail) , 1, 2, row,  row+1, GTK_FILL, 0, 0, 0);
 			row++;
 		}
 	}