More whitespace cleanup.

22 files changed, 97 insertions, 97 deletions

diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 0ff48d3f69..87acc1662d 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -200,8 +200,8 @@ strip_text_msg (gchar *msg)
 	gchar *temp;
 
 	/* Note : HTML Signatures won't work. Depends on Bug #522784 */
-	while (lines [i] && g_strcmp0 (lines[i], SIGNATURE)){
-		if (!g_str_has_prefix (g_strstrip(lines[i]), ">")){
+	while (lines [i] && g_strcmp0 (lines[i], SIGNATURE)) {
+		if (!g_str_has_prefix (g_strstrip(lines[i]), ">")) {
 			temp = stripped_msg;
 
 			stripped_msg = g_strconcat (" ", stripped_msg, lines[i], NULL);
diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
index 8d383639ff..a651441e57 100644
--- a/plugins/default-mailer/default-mailer.c
+++ b/plugins/default-mailer/default-mailer.c
@@ -78,19 +78,19 @@ org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *targe
 
 	/* See whether the check default mailer key has already been set */
 	is_key = gconf_client_get(client, GCONF_KEY_CHECKDEFAULT, NULL);
-	if(!is_key)
+	if (!is_key)
 		gconf_client_set_bool(client, GCONF_KEY_CHECKDEFAULT, TRUE, NULL);
 	else
 		gconf_value_free (is_key);
 
 	/* Check whether we're supposed to check whether or not we are the default mailer */
-	if(gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) {
+	if (gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) {
 		mailer  = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL);
 
 		/* Check whether we are the default mailer */
 		if (!evolution_is_default_mailer (mailer)) {
 			/* Ask whether we should be the default mailer */
-			if(em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) {
+			if (em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) {
 				gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL);
 				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL);
 			}
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index c7fee4a2b9..81dd24d396 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -485,7 +485,7 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 			for (sub_type_index = 0; sub_type_index < temp_header_ptr->number_of_subtype_header; sub_type_index++) {
 				temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index);
 
-				if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){
+				if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)) {
 					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str,
 						(temp_header_value_ptr->sub_header_string_value)->str);
 				}
@@ -526,7 +526,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 static gint
 epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow)
 {
-	if ((compowindow) && (other_compowindow)){
+	if ((compowindow) && (other_compowindow)) {
 		if (((EmailCustomHeaderWindow *)compowindow)->epech_window == (GdkWindow *)other_compowindow) {
 			return 0;
 		}
@@ -620,8 +620,8 @@ commit_changes (ConfigData *cd)
 		/* Check if the keyword is not empty */
 		gtk_tree_model_get (model, &iter, HEADER_VALUE_COLUMN, &value, -1);
                 /* Check if the keyword is not empty */
-                if ((keyword) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)){
-                        if ((value) && (g_utf8_strlen(g_strstrip(value), -1) > 0)){
+                if ((keyword) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)) {
+                        if ((value) && (g_utf8_strlen(g_strstrip(value), -1) > 0)) {
                                 keyword = g_strconcat (keyword, "=", value, NULL);
                         }
                         header_config_list = g_slist_append (header_config_list, g_strdup(keyword));
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index a45d9bc309..2c16d2f9ab 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -326,7 +326,7 @@ add_account_esources (ExchangeAccount *account,
 						   source, -1);
 			g_object_unref (source);
 		}
-		else if (folder->type == EXCHANGE_CALENDAR_FOLDER){
+		else if (folder->type == EXCHANGE_CALENDAR_FOLDER) {
 			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
@@ -354,7 +354,7 @@ add_account_esources (ExchangeAccount *account,
 			g_free (relative_uri);
 
 		}
-		else if (folder->type == EXCHANGE_TASKS_FOLDER){
+		else if (folder->type == EXCHANGE_TASKS_FOLDER) {
 			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
@@ -542,7 +542,7 @@ remove_account_esource (ExchangeAccount *account,
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for(; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
@@ -946,7 +946,7 @@ requires_relogin (gchar *current_url, gchar *new_url)
 				break;
 			}
 		}
-		else if (current_param_val || new_param_val){
+		else if (current_param_val || new_param_val) {
 			/* check for added or deleted parameter */
 			relogin = TRUE;
 			break;
@@ -1257,7 +1257,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 		    strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for(; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *absolute_uri;
 
@@ -1374,7 +1374,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for(; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index bc8cb1e357..191ed25fc8 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -409,7 +409,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			}
 
 			eaccount = exchange_account_fetch (account);
-			if(eaccount) {
+			if (eaccount) {
 				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Account", eaccount->uid);
 				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 4cc582f25f..04065e4036 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -91,7 +91,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
 		sender_addr = camel_header_address_decode (sender_id, NULL);
 
-		if(dialog->options->send_as_del_enabled &&
+		if (dialog->options->send_as_del_enabled &&
 			dialog->options->delegate_address &&
 				g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
 
@@ -102,7 +102,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 			 * So for cases where there is no name we append the address
 			 * (only email) within angular braces.
 			 */
-			if(!g_ascii_strcasecmp (addr->name, "")) {
+			if (!g_ascii_strcasecmp (addr->name, "")) {
 				recipient_id = g_strdup_printf ("<%s>",
 						dialog->options->delegate_address);
 				e_msg_composer_add_header (composer, "From", recipient_id);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index cc707ab65e..4c6e705b9d 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -105,7 +105,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 	/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more
 	   than one delegatee has been selected then an info dialog is popped up to help the user.
 	*/
-	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 
 		name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 		destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY									       (name_selector_entry));
@@ -132,7 +132,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 			options->delegate_email = email;
 		}
 
-		if(count == 0) {
+		if (count == 0) {
 			e_error_run ((GtkWindow *) priv->main,
 				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
@@ -142,7 +142,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 			return -1;
 		}
 
-		if(count > 1) {
+		if (count > 1) {
 			e_error_run ((GtkWindow *)priv->main,
 				"org-gnome-exchange-operations:more-delegates-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
@@ -222,7 +222,7 @@ exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
 
 	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 
-	if(options->send_as_del_enabled) {
+	if (options->send_as_del_enabled) {
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled), TRUE);
 		gtk_widget_set_sensitive ((GtkWidget *)name_selector_entry, TRUE);
 		gtk_widget_set_sensitive ((GtkWidget *)priv->button_user, TRUE);
@@ -287,7 +287,7 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 
 	switch (state) {
 		case GTK_RESPONSE_OK:
-		     if(exchange_send_options_get_widgets_data (sod) < 0)
+		     if (exchange_send_options_get_widgets_data (sod) < 0)
 			return;
 		case GTK_RESPONSE_CANCEL:
 			gtk_widget_hide (priv->main);
@@ -321,7 +321,7 @@ delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
 
 	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 
-	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 		gtk_widget_set_sensitive ((GtkWidget *) name_selector_entry, TRUE);
 		gtk_widget_set_sensitive ((GtkWidget *) priv->button_user, TRUE);
 	}
@@ -411,7 +411,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 
 	exchange_send_options_fill_widgets_with_data (sod);
 
-	if(options->delegate_address) {
+	if (options->delegate_address) {
 		e_name_selector_model_peek_section (name_selector_model, "Add User", NULL, &destination_store);
 		des = e_destination_new ();
 		e_destination_set_email (des, options->delegate_email);
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 957b9da1c8..72b810feea 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -286,7 +286,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 		   strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for(; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 7ecccdf532..d78a73f5a2 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -75,7 +75,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 	CamelProvider *provider;
 	EGwConnection *cnc;
 
-	if (response == GTK_RESPONSE_CANCEL){
+	if (response == GTK_RESPONSE_CANCEL) {
 		gtk_widget_destroy (GTK_WIDGET (emfs));
 	} else {
 		model = accept_data->model;
@@ -83,7 +83,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		uri = em_folder_selector_get_selected_uri (emfs);
 		path = em_folder_selector_get_selected_path (emfs);
 		names = g_strsplit (path, "/", -1);
-		if(names == NULL){
+		if (names == NULL) {
 			folder_name = (gchar *)path;
 			parent_name = NULL;
 		} else {
@@ -103,10 +103,10 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		}
 
 		cnc = get_cnc (store);
-		if(E_IS_GW_CONNECTION (cnc)) {
+		if (E_IS_GW_CONNECTION (cnc)) {
 			container_id = get_container_id (cnc, parent_name);
 
-			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
+			if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
 				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
 				/*changes = camel_folder_change_info_new ();
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 68cbaf6f9d..bfaeee585d 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -100,7 +100,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, gpointer data)
 	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 ){
+	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);
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 5c8c76928e..f7c32ee969 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -115,7 +115,7 @@ junk_settings_init (JunkSettings *js)
 static void
 free_entry_node(EGwJunkEntry *entry)
 {
-	if(entry){
+	if (entry) {
 		g_free(entry->match);
 		entry->match = NULL;
 	}
@@ -128,7 +128,7 @@ free_node(JunkEntry *nentry)
 {
 	EGwJunkEntry *junk_entry = nentry->entry;
 
-	if(junk_entry){
+	if (junk_entry) {
 		g_free(junk_entry->match);
 		junk_entry->match = NULL;
 	}
@@ -144,13 +144,13 @@ find_node(GList *list, gchar *match)
 	GList *tmp;
 	gint i;
 
-	if(list){
+	if (list) {
 		tmp = g_list_first(list);
-		for(i=0; tmp; i++)
+		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*/
 			}
@@ -164,7 +164,7 @@ find_node(GList *list, gchar *match)
 static void
 free_all (JunkSettings *js)
 {
-	if (js->junk_list){
+	if (js->junk_list) {
 		g_list_foreach (js->junk_list,(GFunc) free_node, NULL);
 		g_list_free (js->junk_list);
 		js->junk_list = NULL;
@@ -240,7 +240,7 @@ commit_changes (JunkSettings *js)
 	}
 
 	if (E_IS_GW_CONNECTION (js->cnc)) {
-		if(js->flag_for_ok == 2 && js->enabled){  /* just turn off the bits*/
+		if (js->flag_for_ok == 2 && js->enabled){  /* just turn off the bits*/
 			use_junk = use_pab = use_block = persistence = 0;
 			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) {
 				;
@@ -272,12 +272,12 @@ commit_changes (JunkSettings *js)
 		}
 
 	}
-	if(new_list){
+	if (new_list) {
 		g_list_foreach (new_list, (GFunc) free_entry_node, NULL);
 		g_list_free (new_list);
 	}
 	new_list = NULL;
-	if(remove_list){
+	if (remove_list) {
 		g_list_foreach (remove_list,(GFunc) free_entry_node, NULL);
 		g_list_free (remove_list);
 	}
@@ -314,7 +314,7 @@ add_clicked(GtkButton *button, JunkSettings *js)
 		       return;
 		else {
 			/*check whether already exists*/
-			if (js->junk_list && email){
+			if (js->junk_list && email) {
 				new_entry = find_node (js->junk_list, (gchar *)email);
 				if (new_entry)
 					return;
@@ -361,7 +361,7 @@ 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))){
+	if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))) {
 		gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE);
 
 	}
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 637a13cb2d..91016a6126 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -146,7 +146,7 @@ proxy_dialog_finalize (GObject *object)
 	g_return_if_fail (IS_PROXY_DIALOG (prd));
 	priv = prd->priv;
 
-	if(priv->proxy_name_selector)
+	if (priv->proxy_name_selector)
 		g_object_unref (priv->proxy_name_selector);
 
 	if (priv) {
@@ -614,7 +614,7 @@ proxy_update_tree_view (EAccount *account)
 	for (;list_iter; list_iter = g_list_next(list_iter)) {
 		aclInstance = (proxyHandler *) list_iter->data;
 
-		if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
+		if (! (aclInstance->flags & E_GW_PROXY_DELETED )) {
 			gtk_tree_store_append (priv->store, &iter, NULL);
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1);
 		}
@@ -682,7 +682,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			g_signal_connect (editProxy, "clicked", G_CALLBACK(proxy_edit_account), account);
 
 			priv->proxy_list = NULL;
-		} else if (account->enabled){
+		} else if (account->enabled) {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			/*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*/
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 16c639b38e..db82ba9ca8 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -203,7 +203,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
-	if(!g_strrstr (account->source->url, "groupwise://"))
+	if (!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;
 
 	vbox = gtk_vbox_new (FALSE, 0);
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 54bb3a6eeb..791a2da541 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -79,7 +79,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 
 	uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL);
 	account = mail_config_get_account_by_source_url (uri);
-	if (!account){
+	if (!account) {
 		return;
 	}
 
@@ -164,7 +164,7 @@ create_folder_done (struct _EMCreateFolder *m)
 
 	if (m->done) {
 		ccnc = get_cnc (store);
-		if(E_IS_GW_CONNECTION (ccnc)) {
+		if (E_IS_GW_CONNECTION (ccnc)) {
 			(ssi->sf)->cnc = ccnc;
 
 			(ssi->sf)->container_id = g_strdup (get_container_id ((ssi->sf)->cnc, m->full_name));
@@ -198,7 +198,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
 {
 	struct ShareInfo *ssi = (struct ShareInfo *) user_data;
 	EMFolderSelector *emfs = ssi->emfs;
-	if (m->fi){
+	if (m->fi) {
 		refresh_folder_tree (ssi->model, m->store);
 		gtk_widget_destroy ((GtkWidget *) emfs);
 		gtk_widget_destroy ((GtkWidget *) ssi->d);
@@ -471,7 +471,7 @@ get_cnc (CamelStore *store)
 		user = g_strdup (url->user);
 		property_value =  camel_url_get_param (url, "soap_port");
 		use_ssl = g_strdup (camel_url_get_param (url, "use_ssl"));
-		if(property_value == NULL)
+		if (property_value == NULL)
 			port = g_strdup ("7191");
 		else if (strlen(property_value) == 0)
 			port = g_strdup ("7191");
@@ -506,7 +506,7 @@ get_container_id(EGwConnection *cnc, const gchar *fname)
 	gint i = 0, parts = 0;
 
 	names = g_strsplit (fname, "/", -1);
-	if(names){
+	if (names) {
 		while (names [parts])
 			parts++;
 		fname = names[i];
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 29ff8acc8a..67c58f05fd 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -129,7 +129,7 @@ share_folder_init (ShareFolder *sf)
 static void
 free_user_node(EShUsers *user)
 {
-	if(user){
+	if (user) {
 		g_free(user->email);
 		user->email = NULL;
 	}
@@ -140,7 +140,7 @@ static void
 free_node(SharedUser *usr)
 {
 	EShUsers *user = usr->user_node;
-	if(user){
+	if (user) {
 		g_free(user->email);
 		user->email = NULL;
 	}
@@ -155,13 +155,13 @@ find_node(GList *list, gchar *email)
 	GList *tmp;
 	gint i;
 
-	if(list){
+	if (list) {
 		tmp = g_list_first(list);
-		for(i=0; tmp; i++)
+		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);
@@ -173,7 +173,7 @@ find_node(GList *list, gchar *email)
 static void
 free_all (ShareFolder *sf)
 {
-	if (sf->users_list){
+	if (sf->users_list) {
 		g_list_foreach (sf->users_list,(GFunc) free_node, NULL);
 		g_list_free (sf->users_list);
 		sf->users_list = NULL;
@@ -193,12 +193,12 @@ display_container (EGwContainer *container , ShareFolder *sf)
 	EShUsers *user = NULL;
 
 	sf->gcontainer = container;
-	if(!(byme = e_gw_container_get_is_shared_by_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) {
+	if (byme || tome) {
 		e_gw_container_get_user_list (sf->gcontainer, &user_list);
 		sf->users = g_list_length (user_list);
-		if(sf->users != 0) {
+		if (sf->users != 0) {
 			sf->is_shared = TRUE;
 			gtk_toggle_button_set_active((GtkToggleButton *) sf->shared, TRUE);
 			shared_clicked(sf->shared , sf);
@@ -273,13 +273,13 @@ get_container_list (ShareFolder *sf)
 				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")){
+				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);
 				}
 
-				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);
@@ -348,7 +348,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			}
 
 			/*check whether already exists*/
-			if (sf->users_list && email){
+			if (sf->users_list && email) {
 				new_user = find_node (sf->users_list, (gchar *)email);
 				if (new_user)
 					return;
@@ -419,20 +419,20 @@ share_folder (ShareFolder *sf)
 	}
 
 	if (E_IS_GW_CONNECTION (sf->cnc)) {
-		if(sf->flag_for_ok == 2){  /* you have to remove all the users*/
+		if (sf->flag_for_ok == 2){  /* you have to remove all the users*/
 		GList *list = NULL;
 
-			if(new_list){
+			if (new_list) {
 				g_list_foreach (new_list, (GFunc) free_user_node, NULL);
 				g_list_free (new_list);
 			}
-			if(update_list){
+			if (update_list) {
 				g_list_foreach (update_list, (GFunc) free_user_node, NULL);
 				g_list_free (update_list);
 			}
 
 			new_list = NULL;
-			if(remove_list){
+			if (remove_list) {
 				g_list_foreach (remove_list,(GFunc) free_user_node, NULL);
 				g_list_free (remove_list);
 			}
@@ -579,7 +579,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	GtkTreePath *path = NULL;
 
 	path = gtk_tree_path_new_from_string (arg1);
-	if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){
+	if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)) {
 		gtk_tree_path_free (path);
 		return;
 	}
@@ -589,7 +589,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if(! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (! usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
@@ -622,7 +622,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if(! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (! usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 
@@ -656,7 +656,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if(! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (! usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 5bed477a49..23e0dbe5d6 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -257,7 +257,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 		   strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for(; sources != NULL; sources = g_slist_next (sources)) {
+			for (; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
 
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 91ef049003..7bb819cf0e 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -265,7 +265,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
-	if(!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://")))
+	if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://")))
 		return NULL;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR, "imap-headers.glade", NULL);
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index c824760409..204d150950 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1057,7 +1057,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response)
 	}
 
 	if ((response != ITIP_VIEW_RESPONSE_CANCEL)
-		&& (response != ITIP_VIEW_RESPONSE_DECLINE)){
+		&& (response != ITIP_VIEW_RESPONSE_DECLINE)) {
 		GSList *attachments = NULL, *new_attachments = NULL, *l;
 		CamelMimeMessage *msg = pitip->msg;
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 39973ba60f..3ad3ade1ae 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -514,7 +514,7 @@ pst_import_folders (PstImporter *m, pst_desc_ll *topitem)
 			d_ptr = d_ptr->next;
 		} else {
 			while (d_ptr != topitem && d_ptr->next == NULL) {
-				if(m->folder_uri) {
+				if (m->folder_uri) {
 					g_free(m->folder_uri);
 				}
 
@@ -915,13 +915,13 @@ pst_process_email (PstImporter *m, pst_item *item)
 	info = camel_message_info_new (NULL);
 
 	/* Read message flags (see comments in libpst.c */
-	if(item->email->flag && 0x01)
+	if (item->email->flag && 0x01)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
 
-	if(item->email->importance == 2)
+	if (item->email->importance == 2)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0);
 
-	if(item->email->flag && 0x08)
+	if (item->email->flag && 0x08)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
 
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 84a41f23ad..27ab11ce3c 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -495,7 +495,7 @@ url_list_enable_toggled (GtkCellRendererToggle *renderer,
 
 		url->enabled = !url->enabled;
 
-		if(url->enabled)
+		if (url->enabled)
 			gtk_widget_set_sensitive (ui->url_enable, FALSE);
 		else
 			gtk_widget_set_sensitive (ui->url_enable, TRUE);
@@ -518,7 +518,7 @@ selection_changed (GtkTreeSelection *selection, PublishUIData *ui)
 		gtk_widget_set_sensitive (ui->url_edit, TRUE);
 		gtk_widget_set_sensitive (ui->url_remove, TRUE);
 
-		if(url->enabled)
+		if (url->enabled)
 			gtk_widget_set_sensitive (ui->url_enable, FALSE);
 		else
 			gtk_widget_set_sensitive (ui->url_enable, TRUE);
@@ -662,7 +662,7 @@ url_enable_clicked (GtkButton *button, PublishUIData *ui)
 		gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1);
 		url->enabled = !url->enabled;
 
-		if(url->enabled)
+		if (url->enabled)
 			gtk_widget_set_sensitive (ui->url_enable, FALSE);
 		else
 			gtk_widget_set_sensitive (ui->url_enable, TRUE);
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 66f5a92f74..74010f2555 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -648,18 +648,18 @@ get_spamassassin_version ()
 		NULL
 	};
 
-	if (!em_junk_sa_checked_spamassassin_version){
+	if (!em_junk_sa_checked_spamassassin_version) {
 		out = g_byte_array_new ();
 
-		if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out, NULL) != 0){
-			if(out)
+		if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out, NULL) != 0) {
+			if (out)
 				g_byte_array_free (out, TRUE);
 			return em_junk_sa_spamassassin_version;
 		}
 
-		if(out->len > 0){
-			for(i = 0; i < out->len; i++){
-				if(g_ascii_isdigit (out->data[i])){
+		if (out->len > 0) {
+			for (i = 0; i < out->len; i++) {
+				if (g_ascii_isdigit (out->data[i])) {
 					em_junk_sa_spamassassin_version = (out->data[i] - '0');
 					em_junk_sa_checked_spamassassin_version = TRUE;
 					break;
@@ -667,7 +667,7 @@ get_spamassassin_version ()
 			}
 		}
 
-		if(out)
+		if (out)
 			g_byte_array_free (out, TRUE);
 	}
 
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 2acd12322e..a74dcee7a6 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -263,7 +263,7 @@ void processTnef(TNEFStruct *tnef) {
                     } else {
                         sprintf(ifilename, "%s/%s.rtf", filepath, tnef->subject.data);
                     }
-                    for(i=0; i<strlen(ifilename); i++)
+                    for (i=0; i<strlen(ifilename); i++)
                         if (ifilename[i] == ' ')
                             ifilename[i] = '_';
 
@@ -295,10 +295,10 @@ void processTnef(TNEFStruct *tnef) {
 
             /* See if the contents are stored as "attached data" */
 	    /* Inside the MAPI blocks. */
-            if((filedata = MAPIFindProperty(&(p->MAPI),
+            if ((filedata = MAPIFindProperty(&(p->MAPI),
                                     PROP_TAG(PT_OBJECT, PR_ATTACH_DATA_OBJ)))
                     == MAPI_UNDEFINED) {
-                if((filedata = MAPIFindProperty(&(p->MAPI),
+                if ((filedata = MAPIFindProperty(&(p->MAPI),
                                     PROP_TAG(PT_BINARY, PR_ATTACH_DATA_OBJ)))
 		   == MAPI_UNDEFINED) {
                     /* Nope, standard TNEF stuff. */
@@ -366,7 +366,7 @@ void processTnef(TNEFStruct *tnef) {
                 } else {
                     sprintf(ifilename, "%s/%s", filepath, filename->data);
                 }
-                for(i=0; i<strlen(ifilename); i++)
+                for (i=0; i<strlen(ifilename); i++)
                     if (ifilename[i] == ' ')
                         ifilename[i] = '_';
 
@@ -431,7 +431,7 @@ void saveVCard(TNEFStruct *tnef) {
             sprintf(ifilename, "%s/%s.vcard", filepath, vl->data);
         }
     }
-    for(i=0; i<strlen(ifilename); i++)
+    for (i=0; i<strlen(ifilename); i++)
         if (ifilename[i] == ' ')
             ifilename[i] = '_';
     printf("%s\n", ifilename);
@@ -931,7 +931,7 @@ void saveVCalendar(TNEFStruct *tnef) {
         }
         if (filename!=NULL) {
             fprintf(fptr, "UID:");
-            for(index=0;index<filename->size;index++) {
+            for (index=0;index<filename->size;index++) {
                 fprintf(fptr,"%02X", (guchar)filename->data[index]);
             }
             fprintf(fptr,"\n");
@@ -1027,7 +1027,7 @@ void saveVCalendar(TNEFStruct *tnef) {
         }
         /* Summary */
         filename = NULL;
-        if((filename=MAPIFindProperty(&(tnef->MapiProperties),
+        if ((filename=MAPIFindProperty(&(tnef->MapiProperties),
                         PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC)))
                 != MAPI_UNDEFINED) {
             fprintf(fptr, "SUMMARY:");
@@ -1156,7 +1156,7 @@ void saveVTask(TNEFStruct *tnef) {
     } else {
         sprintf(ifilename, "%s/%s.vcf", filepath, vl->data);
     }
-    for(i=0; i<strlen(ifilename); i++)
+    for (i=0; i<strlen(ifilename); i++)
         if (ifilename[i] == ' ')
             ifilename[i] = '_';
     printf("%s\n", ifilename);
@@ -1324,7 +1324,7 @@ void printRtf(FILE *fptr, variableLength *vl) {
     key = 0;
     brace_ct = 0;
 
-    for(index = 0, byte=vl->data; index < vl->size; index++, byte++) {
+    for (index = 0, byte=vl->data; index < vl->size; index++, byte++) {
         if (*byte == '}') {
             brace_ct--;
             key = 0;