More whitespace cleanup.

129 files changed, 593 insertions, 593 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index d7b97233e3..67bba341e7 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -172,18 +172,18 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 	gint retval = 0; /* 0 is the Unfiled category */
 	LOG(g_message("e_pilot_add_category_if_possible\n"));
 
-	for(i=0; i<PILOT_MAX_CATEGORIES; i++){
+	for (i=0; i<PILOT_MAX_CATEGORIES; i++) {
 		/* if strlen is 0, then the category is empty
 		   the PalmOS doesn't let 0-length strings for
 		   categories */
-		if(strlen(category->name[i]) == 0){
+		if (strlen(category->name[i]) == 0) {
 			gint cat_to_add_len;
 			gint desktopUniqueID;
 
 			cat_to_add_len = strlen(cat_to_add);
 			retval = i;
 
-			if(cat_to_add_len > 15){
+			if (cat_to_add_len > 15) {
 				gchar tmpstr[16];
 				strncpy(tmpstr, cat_to_add,16);
 				tmpstr[16] = '\0';
@@ -197,11 +197,11 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 			 * '\0' can't do direct mem transfer due to
 			 * declaration type
 			 */
-			for(j=0; j<cat_to_add_len; j++){
+			for (j=0; j<cat_to_add_len; j++) {
 				category->name[i][j] = cat_to_add[j];
 			}
 
-			for(j=cat_to_add_len; j<16; j++) {
+			for (j=cat_to_add_len; j<16; j++) {
 				category->name[i][j] = '\0';
 			}
 
@@ -213,7 +213,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 			 */
 			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
 				gint found = 0;
-				for(j=0; j<PILOT_MAX_CATEGORIES; j++){
+				for (j=0; j<PILOT_MAX_CATEGORIES; j++) {
 					if (category->ID[j] == desktopUniqueID) {
 						found = 1;
 					}
@@ -233,7 +233,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 		}
 	}
 
-	if(retval == 0){
+	if (retval == 0) {
 		LOG (g_warning ("*** not adding category - category list already full ***"));
 	}
 
@@ -263,7 +263,7 @@ void e_pilot_local_category_to_remote(gint * pilotCategory,
 		first_category = e_pilot_utf8_to_pchar((const gchar *)c_list->data);
 	}
 	l = c_list;
-	while(l && *pilotCategory == 0) {
+	while (l && *pilotCategory == 0) {
 		/* list != 0, so at least 1 category is assigned */
 		category_string = e_pilot_utf8_to_pchar((const gchar *)l->data);
 		for (i=0; i < PILOT_MAX_CATEGORIES; i++) {
@@ -307,7 +307,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory,
 
 		LOG(g_message("PDA Category: %s\n", category_string));
 
-		if(e_categories_exist(category_string) == FALSE){
+		if (e_categories_exist(category_string) == FALSE) {
 			/* add if it doesn't exist */
 			LOG(g_message("Category created on pc\n"));
 			e_categories_add(category_string, NULL, NULL, TRUE);
@@ -329,7 +329,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory,
 
 		/* remove old item from list so we don't have duplicate entries */
 		newcat_in_list = g_list_find_custom(c_list, category_string, (GCompareFunc)strcmp);
-		if(newcat_in_list != NULL)
+		if (newcat_in_list != NULL)
 		{
 			g_free(newcat_in_list->data);
 			c_list = g_list_remove(c_list, newcat_in_list->data);
@@ -756,11 +756,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&addr, 0, sizeof (struct Address));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -1112,7 +1112,7 @@ local_record_to_pilot_record (EAddrLocalRecord *local,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -1159,7 +1159,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
 #ifdef PILOT_LINK_0_12
 		pi_buffer_t * record;
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -1371,12 +1371,12 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
 	memset (&address, 0, sizeof (struct Address));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return NULL;
 	}
@@ -1676,7 +1676,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 	}
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 5040b96570..2ffe6fcc4a 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -176,7 +176,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
 
 	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_NAME:
 		e_contact_name_free(e_contact_editor_fullname->name);
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 1d1d16c55b..00a89e32db 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -396,7 +396,7 @@ style_makes_sense (const EContactName *name, const gchar *company, gint style)
 	case 1:
 		return TRUE;
         case 2:
-                if(name) {
+                if (name) {
                         if (name->additional && *name->additional)
                                 return TRUE;
                         else
@@ -450,7 +450,7 @@ name_to_style (const EContactName *name, const gchar *company, gint style)
 		break;
         case 2:
                 midstrptr=midstring;
-                if(name){
+                if (name) {
                         if (name->family && *name->family)
 				*(midstrptr++) = name->family;
                        if (name->given && *name->given)
@@ -2347,7 +2347,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 
 						prompt_response = e_error_run (GTK_WINDOW (editor->app), "addressbook:prompt-resize", NULL);
 
-						if (prompt_response == GTK_RESPONSE_YES){
+						if (prompt_response == GTK_RESPONSE_YES) {
 							if ( width > height) {
 								height = height * 96 / width;
 								width = 96;
@@ -2764,7 +2764,7 @@ categories_clicked (GtkWidget *button, EContactEditor *editor)
 	else if (editor->contact)
 		categories = e_contact_get (editor->contact, E_CONTACT_CATEGORIES);
 
-	if (editor->categories_dialog != NULL){
+	if (editor->categories_dialog != NULL) {
 		gtk_window_present (GTK_WINDOW(editor->categories_dialog));
 		g_free (categories);
 		return;
@@ -3594,7 +3594,7 @@ e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *val
 
 	editor = E_CONTACT_EDITOR (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_SOURCE_BOOK: {
 		gboolean  writable;
 		gboolean  changed = FALSE;
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 010b0dcdba..86ed4e9de6 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -86,7 +86,7 @@ name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean stri
 	if (!(a && b && *a && *b))
 		return FALSE;
 
-	if(!e_utf8_casefold_collate (a, b))
+	if (!e_utf8_casefold_collate (a, b))
 		return TRUE;
 
 	/* Check for nicknames.  Yes, the linear search blows. */
@@ -425,7 +425,7 @@ match_email_hostname (const gchar *addr1, const gchar *addr2)
 		--addr1;
 		--addr2;
 	}
-	if((*addr1 == '@' && *addr2 != '@' ) || (*addr2 == '@' && *addr1 != '@'))
+	if ((*addr1 == '@' && *addr2 != '@' ) || (*addr2 == '@' && *addr1 != '@'))
 	       return FALSE;
 
 	return TRUE;
@@ -526,10 +526,10 @@ eab_contact_compare (EContact *contact1, EContact *contact2)
 	g_return_val_if_fail (contact2 && E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
 
 	result = EAB_CONTACT_MATCH_NONE;
-	if(!e_contact_get (contact1, E_CONTACT_IS_LIST)){
+	if (!e_contact_get (contact1, E_CONTACT_IS_LIST)) {
 		result = combine_comparisons (result, eab_contact_compare_name      (contact1, contact2));
 		result = combine_comparisons (result, eab_contact_compare_nickname  (contact1, contact2));
-		if(!e_contact_get (contact2, E_CONTACT_IS_LIST))
+		if (!e_contact_get (contact2, E_CONTACT_IS_LIST))
 			result = combine_comparisons (result, eab_contact_compare_email (contact1, contact2));
 		result = combine_comparisons (result, eab_contact_compare_address   (contact1, contact2));
 		result = combine_comparisons (result, eab_contact_compare_telephone (contact1, contact2));
@@ -691,7 +691,7 @@ use_common_book_cb (EBook *book, gpointer closure)
 	/* Build up our full query from the parts. */
 	query_parts[p] = NULL;
 	qj = g_strjoinv (" ", query_parts);
-	for(i = 0; query_parts[i] != NULL; i++)
+	for (i = 0; query_parts[i] != NULL; i++)
 		g_free(query_parts[i]);
 	if (p > 1) {
 		gchar *s;
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 78f179c176..b927918d22 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -102,7 +102,7 @@ free_lookup (EContactMergingLookup *lookup)
 	g_object_unref (lookup->book);
 	g_object_unref (lookup->contact);
 	g_list_free (lookup->avoid);
-	if(lookup->match)
+	if (lookup->match)
 		g_object_unref (lookup->match);
 	g_free (lookup);
 }
@@ -217,7 +217,7 @@ mergeit (EContactMergingLookup *lookup)
 	num_of_email = g_list_length (email_attr_list);
 
 	/*we match all the string fields of the already existing contact and the new contact.*/
-	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
+	for (field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
 		dropdown_data *data = NULL;
 		string = (gchar *)e_contact_get_const (lookup->contact, field);
 		string1 = (gchar *)e_contact_get_const (lookup->match, field);
@@ -230,14 +230,14 @@ mergeit (EContactMergingLookup *lookup)
 			    || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email < 4)) {
 				row++;
 				str = (gchar *)e_contact_get_const (lookup->contact, field);
-				switch(num_of_email)
+				switch (num_of_email)
 				{
 				case 0:
 					field = E_CONTACT_EMAIL_1;
 					break;
 				case 1:
 					/*New contact has email that is NOT equal to email in duplicate contact*/
-					if((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_1),str))) {
+					if ((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_1),str))) {
 						field = E_CONTACT_EMAIL_2;
 						break;
 					}
@@ -245,7 +245,7 @@ mergeit (EContactMergingLookup *lookup)
 						continue;
 				case 2:
 					/*New contact has email and it is equal to neither of the 2 emails in the duplicate contact*/
-					if((str && *str) &&
+					if ((str && *str) &&
 							(g_ascii_strcasecmp(str,e_contact_get_const (lookup->match, E_CONTACT_EMAIL_1))) &&
 							(g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_2),str))) {
 						field = E_CONTACT_EMAIL_3;
@@ -255,7 +255,7 @@ mergeit (EContactMergingLookup *lookup)
 						continue;
 				case 3:
 					/*New contact has email and it is equal to none of the 3 emails in the duplicate contact*/
-					if((str && *str) &&
+					if ((str && *str) &&
 							(g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_1),str)) &&
 							(g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_2),str)) &&
 							(g_ascii_strcasecmp(e_contact_get_const (lookup->match, E_CONTACT_EMAIL_3),str)))
@@ -302,7 +302,7 @@ mergeit (EContactMergingLookup *lookup)
 			}
 
 			/*for all string fields except name and email*/
-			if(!(string1 && *string1) || (g_ascii_strcasecmp(string, string1))) {
+			if (!(string1 && *string1) || (g_ascii_strcasecmp(string, string1))) {
 				row++;
 				label = gtk_label_new (e_contact_pretty_name(field));
 				hbox = gtk_hbox_new (FALSE, 0);
@@ -368,26 +368,26 @@ check_if_same (EContact *contact, EContact *match)
 	gint num_of_email;
 	gchar *str = NULL, *string = NULL, *string1 = NULL;
 
-	for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
+	for (field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
 		email_attr_list = e_contact_get_attributes (match, E_CONTACT_EMAIL);
 		num_of_email = g_list_length (email_attr_list);
 
 		if ((field == E_CONTACT_EMAIL_1 || field == E_CONTACT_EMAIL_2
 		     || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email<4)) {
 			str = (gchar *)e_contact_get_const (contact, field);
-			switch(num_of_email)
+			switch (num_of_email)
 			{
 			case 0:
 				return FALSE;
 			case 1:
-				if((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_1),str)))
+				if ((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_1),str)))
 					return FALSE;
 			case 2:
-				if((str && *str) && (g_ascii_strcasecmp(str,e_contact_get_const (match, E_CONTACT_EMAIL_1))) &&
+				if ((str && *str) && (g_ascii_strcasecmp(str,e_contact_get_const (match, E_CONTACT_EMAIL_1))) &&
 						(g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_2),str)))
 					return FALSE;
 			case 3:
-				if((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_1),str)) &&
+				if ((str && *str) && (g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_1),str)) &&
 						(g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_2),str)) &&
 						(g_ascii_strcasecmp(e_contact_get_const (match, E_CONTACT_EMAIL_3),str)))
 					return FALSE;
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 7ae371d411..71de495f13 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -391,7 +391,7 @@ addressbook_model_set_property (GObject *object,
                                 const GValue *value,
                                 GParamSpec *pspec)
 {
-	switch (property_id){
+	switch (property_id) {
 		case PROP_BOOK:
 			e_addressbook_model_set_book (
 				E_ADDRESSBOOK_MODEL (object),
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index e562d9989f..500b045077 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -148,7 +148,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
 	height = text_height (layout, string ? string : "") + 10.0;
 	g_free(string);
 
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) {
+	for (field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) {
 
 		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
 			continue;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index ae79ead397..601e7f9546 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -491,7 +491,7 @@ addressbook_view_set_property (GObject *object,
                                const GValue *value,
                                GParamSpec *pspec)
 {
-	switch (property_id){
+	switch (property_id) {
 		case PROP_SHELL_VIEW:
 			addressbook_view_set_shell_view (
 				E_ADDRESSBOOK_VIEW (object),
@@ -1095,7 +1095,7 @@ e_addressbook_view_print (EAddressbookView *view,
 static void
 delete_contacts_cb (EBook *book,  EBookStatus status,  gpointer closure)
 {
-	switch(status) {
+	switch (status) {
 		case E_BOOK_ERROR_OK :
 		case E_BOOK_ERROR_CANCELLED :
 			break;
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 414b760e1e..074bf9f8e3 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -205,7 +205,7 @@ e_minicard_label_set_property  (GObject *object, guint prop_id, const GValue *va
 	e_minicard_label = E_MINICARD_LABEL (object);
 	item = GNOME_CANVAS_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_WIDTH:
 		e_minicard_label->width = g_value_get_double (value);
 		e_minicard_label_resize_children(e_minicard_label);
@@ -347,7 +347,7 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	e_minicard_label = E_MINICARD_LABEL (item);
 
-	switch( event->type ) {
+	switch ( event->type ) {
 	case GDK_KEY_PRESS:
 		if (event->key.keyval == GDK_Escape) {
 			GnomeCanvasItem *parent;
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 5030793938..cb3904728e 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -220,7 +220,7 @@ e_minicard_view_widget_set_property (GObject *object,
 
 	emvw = E_MINICARD_VIEW_WIDGET (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_BOOK:
 		if (emvw->book)
 			g_object_unref (emvw->book);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index d849d9fe47..80d7291113 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -228,7 +228,7 @@ e_minicard_view_set_property (GObject *object,
 
 	view = E_MINICARD_VIEW (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_ADAPTER:
 		if (view->adapter) {
 			if (view->writable_status_id || view->stop_state_id) {
@@ -378,7 +378,7 @@ e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	view = E_MINICARD_VIEW (item);
 
-	switch( event->type ) {
+	switch ( event->type ) {
 	case GDK_2BUTTON_PRESS:
 		if (((GdkEventButton *)event)->button == 1) {
 			gboolean editable;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index b47acd0938..1f6bc14117 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -311,7 +311,7 @@ e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, G
 	item = GNOME_CANVAS_ITEM (object);
 	e_minicard = E_MINICARD (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_WIDTH:
 		if (e_minicard->width != g_value_get_double (value)) {
 			e_minicard->width = g_value_get_double (value);
@@ -548,7 +548,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	e_minicard = E_MINICARD (item);
 
-	switch( event->type ) {
+	switch ( event->type ) {
 	case GDK_FOCUS_CHANGE:
 		{
 			GdkEventFocus *focus_event = (GdkEventFocus *) event;
@@ -882,7 +882,7 @@ get_left_width (EMinicard *e_minicard, gboolean is_list)
 		return 0;
 
 	layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), "");
-	for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
+	for (field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) {
 		gint this_width;
 
 		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
@@ -932,7 +932,7 @@ remodel( EMinicard *e_minicard )
 		list = e_minicard->fields;
 		e_minicard->fields = NULL;
 
-		for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) && count < 5; field++) {
+		for (field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) && count < 5; field++) {
 			EMinicardField *minicard_field = NULL;
 			gboolean is_email=FALSE;
 
@@ -1022,7 +1022,7 @@ e_minicard_reflow(GnomeCanvasItem *item, gint flags)
 				       "y2", text_height + 9.0,
 				       NULL);
 
-		for(list = e_minicard->fields; list; list = g_list_next(list)) {
+		for (list = e_minicard->fields; list; list = g_list_next(list)) {
 			EMinicardField *field = E_MINICARD_FIELD(list->data);
 			/* Why not use the item that is passed in? */
 			GnomeCanvasItem *item = field->label;
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index 07d76c3a77..ffccbfa1d1 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -217,11 +217,11 @@ static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj)
 	GObject *gobj = NULL;
 
 	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if( !state_set )
+	if ( !state_set )
 		state_set = atk_state_set_new ();
 
 	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if( !gobj )
+	if ( !gobj )
 		return state_set;
 
 	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
@@ -303,7 +303,7 @@ selection_interface_clear_selection (AtkSelection *selection)
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
 	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
 
-	if( !reflow )
+	if ( !reflow )
 		return FALSE;
 
 	e_selection_model_clear (reflow->selection);
@@ -341,7 +341,7 @@ selection_interface_is_child_selected (AtkSelection *selection, gint i)
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
 	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
 
-	if( !reflow )
+	if ( !reflow )
 		return FALSE;
 
 	return e_selection_model_is_row_selected (reflow->selection, i);
@@ -404,7 +404,7 @@ atk_action_interface_get_description (AtkAction *iface, gint i)
 static G_CONST_RETURN gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
-	if( i >= G_N_ELEMENTS (action_name) || i < 0)
+	if ( i >= G_N_ELEMENTS (action_name) || i < 0)
 		return NULL;
 
 	return action_name[i];
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index b1b1ebbe33..8791a68e73 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -191,11 +191,11 @@ static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj)
 	GObject *gobj = NULL;
 
 	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if( !state_set )
+	if ( !state_set )
 		state_set = atk_state_set_new ();
 
 	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if( !gobj )
+	if ( !gobj )
 		return state_set;
 
 	atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
@@ -233,10 +233,10 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
 	EMinicard *minicard = NULL;
 
 	minicard = E_MINICARD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (iface)));
-	if( minicard == NULL )
+	if ( minicard == NULL )
 		return FALSE;
 
-	if( i >= G_N_ELEMENTS (action_name) || i < 0 )
+	if ( i >= G_N_ELEMENTS (action_name) || i < 0 )
 		return FALSE;
 
 	switch (i) {
@@ -265,7 +265,7 @@ atk_action_interface_get_description (AtkAction *iface, gint i)
 static G_CONST_RETURN gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
-	if( i >= G_N_ELEMENTS (action_name) || i < 0)
+	if ( i >= G_N_ELEMENTS (action_name) || i < 0)
 		return NULL;
 
 	return action_name[i];
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 6f88bb9cbd..231d799957 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -283,7 +283,7 @@ add_to_notes(EContact *contact, gint i, gchar *val) {
 		return;
 
 	new_text = g_string_new(old_text);
-	if(strlen(new_text->str) != 0)
+	if (strlen(new_text->str) != 0)
 		new_text = g_string_append_c(new_text, '\n');
 	new_text = g_string_append(new_text, field_text);
 	new_text = g_string_append_c(new_text, ':');
@@ -357,12 +357,12 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 		ptr = do_free;
 	}
 
-	while(*ptr != '\n') {
+	while (*ptr != '\n') {
 		value = g_string_new("");
-		while(*ptr != delimiter) {
-			if(*ptr == '\n')
+		while (*ptr != delimiter) {
+			if (*ptr == '\n')
 				break;
-			if(*ptr != '"') {
+			if (*ptr != '"') {
 				g_string_append_unichar (value, g_utf8_get_char (ptr));
 			}
 			else {
@@ -381,13 +381,13 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 		contact_field = NOMAP;
 		flags = FLAG_INVALID;
 
-		if(importer == OUTLOOK_IMPORTER) {
+		if (importer == OUTLOOK_IMPORTER) {
 			if (i >= 0 && i < G_N_ELEMENTS (csv_fields_outlook)) {
 				contact_field = csv_fields_outlook[i].contact_field;
 				flags = csv_fields_outlook[i].flags;
 			}
 		}
-		else if(importer == MOZILLA_IMPORTER) {
+		else if (importer == MOZILLA_IMPORTER) {
 			if (i >= 0 && i < G_N_ELEMENTS (csv_fields_mozilla)) {
 				contact_field = csv_fields_mozilla[i].contact_field;
 				flags = csv_fields_mozilla[i].flags;
@@ -400,12 +400,12 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 			}
 		}
 
-		if(strlen(value->str) != 0) {
+		if (strlen(value->str) != 0) {
 			if (contact_field != NOMAP) {
-				if(importer == OUTLOOK_IMPORTER) {
+				if (importer == OUTLOOK_IMPORTER) {
 					if (i >= 0 && i < G_N_ELEMENTS (csv_fields_outlook))
 						e_contact_set (contact, csv_fields_outlook[i].contact_field, value->str);
-				} else if(importer == MOZILLA_IMPORTER) {
+				} else if (importer == MOZILLA_IMPORTER) {
 					if (i >= 0 && i < G_N_ELEMENTS (csv_fields_mozilla))
 						e_contact_set (contact, csv_fields_mozilla[i].contact_field, value->str);
 				} else {
@@ -421,7 +421,7 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 				switch (flags) {
 
 				case FLAG_HOME_ADDRESS|FLAG_STREET:
-					if(strlen(home_street->str) != 0) {
+					if (strlen(home_street->str) != 0) {
 						home_street = g_string_append(home_street, ",\n");
 					}
 					home_street = g_string_append(home_street, value->str);
@@ -443,7 +443,7 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 					break;
 
 				case FLAG_WORK_ADDRESS|FLAG_STREET:
-					if(strlen(work_street->str) != 0) {
+					if (strlen(work_street->str) != 0) {
 						work_street = g_string_append(work_street, ",\n");
 					}
 					work_street = g_string_append(work_street, value->str);
@@ -465,7 +465,7 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 					break;
 
 				case FLAG_OTHER_ADDRESS|FLAG_STREET:
-					if(strlen(other_street->str) != 0) {
+					if (strlen(other_street->str) != 0) {
 						other_street = g_string_append(other_street, ",\n");
 					}
 					other_street = g_string_append(other_street, value->str);
@@ -515,30 +515,30 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 		}
 		i++;
 		g_string_free(value, TRUE);
-		if(*ptr != '\n')
+		if (*ptr != '\n')
 			ptr = g_utf8_next_char (ptr);
 	}
-	if(strlen(home_street->str) != 0)
+	if (strlen(home_street->str) != 0)
 		home_address->street = g_strdup(home_street->str);
-	if(strlen(work_street->str) != 0)
+	if (strlen(work_street->str) != 0)
 		work_address->street = g_strdup(work_street->str);
-	if(strlen(other_street->str) != 0)
+	if (strlen(other_street->str) != 0)
 		other_address->street = g_strdup(other_street->str);
 	g_string_free(home_street, TRUE);
 	g_string_free(work_street, TRUE);
 	g_string_free(other_street, TRUE);
 
-	if(home_address->locality || home_address->country ||
+	if (home_address->locality || home_address->country ||
 	   home_address->code || home_address->region || home_address->street)
 		e_contact_set (contact, E_CONTACT_ADDRESS_HOME, home_address);
-	if(work_address->locality || work_address->country ||
+	if (work_address->locality || work_address->country ||
 	   work_address->code || work_address->region || work_address->street)
 		e_contact_set (contact, E_CONTACT_ADDRESS_WORK, work_address);
-	if(other_address->locality || other_address->country ||
+	if (other_address->locality || other_address->country ||
 	   other_address->code || other_address->region || other_address->street)
 		e_contact_set (contact, E_CONTACT_ADDRESS_OTHER, other_address);
 
-	if(importer !=  OUTLOOK_IMPORTER) {
+	if (importer !=  OUTLOOK_IMPORTER) {
 		if (bday->day || bday->year || bday->month)
 			e_contact_set(contact, E_CONTACT_BIRTH_DATE, bday);
 	}
@@ -557,11 +557,11 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 	gchar c;
 
 	/*
-	if(!fgets(line, sizeof(line),f))
+	if (!fgets(line, sizeof(line),f))
 		return NULL;
 
-	if(gci->count == 0 && importer != MOZILLA_IMPORTER) {
-		if(!fgets(line, sizeof(line),f))
+	if (gci->count == 0 && importer != MOZILLA_IMPORTER) {
+		if (!fgets(line, sizeof(line),f))
 			return NULL;
 		gci->count ++;
 	}
@@ -589,7 +589,7 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 			g_string_append_c (line, c);
 	}
 
-	if(gci->count == 0 && importer != MOZILLA_IMPORTER) {
+	if (gci->count == 0 && importer != MOZILLA_IMPORTER) {
 		g_string_free (line, TRUE);
 		line = g_string_new("");
 		while (1) {
@@ -620,7 +620,7 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 
 	g_string_free (line, TRUE);
 
-	if(strlen(str->str) == 0) {
+	if (strlen(str->str) == 0) {
 		g_string_free(str, TRUE);
 		return NULL;
 	}
@@ -629,7 +629,7 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) {
 
 	buf = str->str;
 
-	if(!parseLine (gci, contact, buf)) {
+	if (!parseLine (gci, contact, buf)) {
 		g_object_unref(contact);
 		return NULL;
 	}
@@ -649,10 +649,10 @@ csv_import_contacts(gpointer d) {
 		e_book_add_contact(gci->book, contact, NULL);
 		gci->contacts = g_slist_prepend(gci->contacts, contact);
 	}
-	if(contact == NULL) {
+	if (contact == NULL) {
 		gci->state = 1;
 	}
-	if(gci->state == 1) {
+	if (gci->state == 1) {
 		csv_import_done(gci);
 		return FALSE;
 	}
@@ -769,7 +769,7 @@ csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 	EImportTargetURI *s = (EImportTargetURI *) target;
 
 	book = e_book_new(g_datalist_get_data(&target->data, "csv-source"), NULL);
-	if(book == NULL) {
+	if (book == NULL) {
 		g_message("Couldn't Create EBook");
 		e_import_complete(ei, target);
 		return;
@@ -824,7 +824,7 @@ static void
 csv_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) {
 	CSVImporter *gci = g_datalist_get_data(&target->data, "csv-data");
 
-	if(gci)
+	if (gci)
 		gci->state = 1;
 }
 
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 2c8b24cac5..efc4a2bf71 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -137,7 +137,7 @@ getValue( gchar **src )
 	gboolean need_base64 = (*s == ':');
 
  copy_line:
-	while( *s != 0 && *s != '\n' && *s != '\r' )
+	while ( *s != 0 && *s != '\n' && *s != '\r' )
 		dest = g_string_append_c (dest, *s++);
 
 	if (*s == '\r') s++;
@@ -250,7 +250,7 @@ parseLine (LDIFImporter *gci, EContact *contact,
 	}
 
 	/* first, check for a 'continuation' line */
-	if( ptr[0] == ' ' && ptr[1] != '\n' ) {
+	if ( ptr[0] == ' ' && ptr[1] != '\n' ) {
 		g_warning ("unexpected continuation line");
 		return FALSE;
 	}
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 2f752e015f..0052c13f30 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -419,11 +419,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&appt, 0, sizeof (struct Appointment));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -853,7 +853,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -908,7 +908,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 		pi_buffer_t * record;
 
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -1208,11 +1208,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -1604,7 +1604,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index 1be106929d..eee54e71fc 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -65,18 +65,18 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 	gint retval = 0; /* 0 is the Unfiled category */
 	LOG(g_message("e_pilot_add_category_if_possible\n"));
 
-	for(i=0; i<PILOT_MAX_CATEGORIES; i++){
+	for (i=0; i<PILOT_MAX_CATEGORIES; i++) {
 		/* if strlen is 0, then the category is empty
 		   the PalmOS doesn't let 0-length strings for
 		   categories */
-		if(strlen(category->name[i]) == 0){
+		if (strlen(category->name[i]) == 0) {
 			gint cat_to_add_len;
 			gint desktopUniqueID;
 
 			cat_to_add_len = strlen(cat_to_add);
 			retval = i;
 
-			if(cat_to_add_len > 15){
+			if (cat_to_add_len > 15) {
 				/* Have to truncate the category name */
 				cat_to_add_len = 15;
 			}
@@ -85,18 +85,18 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 			 * '\0' can't do direct mem transfer due to
 			 * declaration type
 			 */
-			for(j=0; j<cat_to_add_len; j++){
+			for (j=0; j<cat_to_add_len; j++) {
 				category->name[i][j] = cat_to_add[j];
 			}
 
-			for(j=cat_to_add_len; j<16; j++) {
+			for (j=cat_to_add_len; j<16; j++) {
 				category->name[i][j] = '\0';
 			}
 
 			/* find a desktop id that is not in use between 128 and 255 */
 			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
 				gint found = 0;
-				for(j=0; j<PILOT_MAX_CATEGORIES; j++){
+				for (j=0; j<PILOT_MAX_CATEGORIES; j++) {
 					if (category->ID[i] == desktopUniqueID) {
 						found = 1;
 					}
@@ -116,7 +116,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 		}
 	}
 
-	if(retval == 0){
+	if (retval == 0) {
 		LOG (g_warning ("*** not adding category - category list already full ***"));
 	}
 
@@ -173,7 +173,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, s
 		LOG(g_message("Category: %s\n", category_string));
 
 		/* TODO The calendar editor page and search bar are not updated until a restart of the evolution client */
-		if(e_categories_exist(category_string) == FALSE){
+		if (e_categories_exist(category_string) == FALSE) {
 			/* add if it doesn't exist */
 			LOG(g_message("Category created on pc\n"));
 			e_categories_add(category_string, NULL, NULL, TRUE);
@@ -195,7 +195,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, s
 
 		/* remove old item from list so we don't have duplicate entries */
 		newcat_in_list = g_slist_find_custom(c_list, category_string, (GCompareFunc)strcmp);
-		if(newcat_in_list != NULL)
+		if (newcat_in_list != NULL)
 		{
 			c_list = g_slist_remove(c_list, newcat_in_list->data);
 		}
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index ae45e82439..ac28e0465c 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -332,11 +332,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&memo, 0, sizeof (struct Memo));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -482,7 +482,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -543,7 +543,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 
 #ifdef PILOT_LINK_0_12
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -580,7 +580,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 	e_cal_component_get_description_list (comp, &d_list);
 	if (d_list) {
 		description = (ECalComponentText *) d_list->data;
-		if (description && description->value){
+		if (description && description->value) {
 			local->memo->text = e_pilot_utf8_to_pchar (description->value);
 		}
 		else{
@@ -656,11 +656,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -698,16 +698,16 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 		GSList l;
 		ECalComponentText text, sumText;
 
-		for(i = 0; i<ntext && i<50; i++){
-			if(memo.text[i] == '\n'){
+		for (i = 0; i<ntext && i<50; i++) {
+			if (memo.text[i] == '\n') {
 				idxToUse = i;
 				foundNL = TRUE;
 				break;
 			}
 		}
 
-		if(foundNL == FALSE){
-			if(ntext > 50){
+		if (foundNL == FALSE) {
+			if (ntext > 50) {
 				txt2 = g_strndup(memo.text, 50);
 			}
 			else{
@@ -884,7 +884,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 42e79d778c..89e012bfd7 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -402,11 +402,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&todo, 0, sizeof (struct ToDo));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -623,7 +623,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -678,7 +678,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
 #ifdef PILOT_LINK_0_12
 		pi_buffer_t * record;
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -828,11 +828,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -1075,7 +1075,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 052340fbca..e7fbdc7090 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -973,17 +973,17 @@ free_tray_icon_data (TrayIconData *tray_data)
 {
 	g_return_if_fail (tray_data != NULL);
 
-	if (tray_data->summary){
+	if (tray_data->summary) {
 		g_free (tray_data->summary);
 		tray_data->summary = NULL;
 	}
 
-	if (tray_data->description){
+	if (tray_data->description) {
 		g_free (tray_data->description);
 		tray_data->description = NULL;
 	}
 
-	if (tray_data->location){
+	if (tray_data->location) {
 		g_free (tray_data->location);
 		tray_data->location = NULL;
 	}
@@ -1130,7 +1130,7 @@ tray_list_remove_async (Message *msg)
 
 		TrayIconData *tray_data = list->data;
 
-		if (!tray_data->snooze_set){
+		if (!tray_data->snooze_set) {
 			GList *temp = list->next;
 			gboolean status;
 
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index c770c833f7..672c921852 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -420,7 +420,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const gchar *field, const
 	g_free (text);
 
 	/* Apply the selected view on search */
-	if (view && *view){
+	if (view && *view) {
 	    sexp = g_strconcat ("(and ",sexp, view, ")", NULL);
 	}
 
@@ -710,7 +710,7 @@ make_suboptions (CalSearchBar *cal_search)
 		e_search_bar_set_viewoption_menu ((ESearchBar *)cal_search, menu);
 	}
 
-	if(subitems != NULL)
+	if (subitems != NULL)
 		g_free (subitems);
 }
 
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ab411f9e7b..5ac97f7a13 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -623,7 +623,7 @@ populate_widgets_from_alarm (Dialog *dialog)
                 g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
 	}
 
-	switch ( trigger->u.rel_duration.is_neg ){
+	switch ( trigger->u.rel_duration.is_neg ) {
 	case 1:
 		e_dialog_combo_box_set (dialog->relative_combo, BEFORE, relative_map);
 		break;
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index de7025fd96..9b396ce2cf 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -270,7 +270,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y calendar contents locally for offline operation"));
 		else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO)
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y task list contents locally for offline operation"));
-		else if(sdialog->source_type == E_CAL_SOURCE_TYPE_JOURNAL)
+		else if (sdialog->source_type == E_CAL_SOURCE_TYPE_JOURNAL)
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y memo list contents locally for offline operation"));
 
 		gtk_widget_show (offline_setting);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index a133904b65..ed31badd11 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1541,7 +1541,7 @@ time_sel_changed (GtkComboBox *combo, EventPage *epage)
 		gtk_widget_show (priv->end_time);
 		hour_sel_changed (GTK_SPIN_BUTTON (priv->hour_selector), epage);
 		minute_sel_changed (GTK_SPIN_BUTTON (priv->minute_selector), epage);
-	} else if (!selection){
+	} else if (!selection) {
 		gtk_widget_show (priv->time_hour);
 		gtk_widget_hide (priv->end_time);
 
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index fd218a8ec1..1edee08466 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -586,7 +586,7 @@ memo_page_fill_component (CompEditorPage *page,
 	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
 	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
 
-	if (!str || strlen (str) == 0){
+	if (!str || strlen (str) == 0) {
 		e_cal_component_set_description_list (comp, NULL);
 	}
 	else {
@@ -596,7 +596,7 @@ memo_page_fill_component (CompEditorPage *page,
 		gchar *txt, *p;
 		gunichar uc;
 
-		for(i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
+		for (i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
 		    i < 50 && p && uc < (gunichar)-2;
 		    i++, p = g_utf8_next_char (p), uc = g_utf8_get_char_validated (p, -1)) {
 			idxToUse = p - str;
@@ -755,7 +755,7 @@ get_widgets (MemoPage *mpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("memo-page");
-	if (!priv->main){
+	if (!priv->main) {
 		g_warning("couldn't find memo-page!");
 		return FALSE;
 	}
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 3f47312d22..7284f1d0d5 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -45,7 +45,7 @@ save_component_dialog (GtkWindow *parent, ECalComponent *comp)
 {
 	ECalComponentVType vtype = e_cal_component_get_vtype(comp);
 
-	switch(vtype) {
+	switch (vtype) {
 		case E_CAL_COMPONENT_EVENT:
 			return e_error_run (parent, "calendar:prompt-save-appointment", NULL);
 		case E_CAL_COMPONENT_TODO:
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 462ed7d82a..bae86827b9 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -48,7 +48,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 		gconf_key = "/apps/evolution/calendar/sources";
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		gconf_key = "/apps/evolution/tasks/sources";
-        else if(obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
+        else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
                 gconf_key = "/apps/evolution/memos/sources";
 	else
 		return NULL;
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 0bb086b4f2..38e55ef71a 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -151,7 +151,7 @@ ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 	}
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data){
+	if (!comp_data) {
 		g_warning("couldn't get component data: row == %d", row);
 		return;
 	}
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index acf3175765..6d841c495e 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -444,7 +444,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 			icalparameter *param;
 			const gchar *tzid;
 
-			if(!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER)))
+			if (!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER)))
 				return E_CAL_MODEL_TASKS_DUE_FUTURE;
 
 			/* Get the current time in the same timezone as the DUE date.*/
@@ -1214,7 +1214,7 @@ e_cal_model_tasks_update_due_tasks (ECalModelTasks *model)
 	{
 		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 		status = get_due_status (E_CAL_MODEL_TASKS (model), comp_data);
-		if((status == E_CAL_MODEL_TASKS_DUE_TODAY) || (status == E_CAL_MODEL_TASKS_DUE_OVERDUE))
+		if ((status == E_CAL_MODEL_TASKS_DUE_TODAY) || (status == E_CAL_MODEL_TASKS_DUE_OVERDUE))
 		{
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 			e_table_model_row_changed (E_TABLE_MODEL (model), row);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index af99121433..54b7bcb783 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2454,7 +2454,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category)
 	     property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) {
 		gchar *value = icalproperty_get_value_as_string_r (property);
 
-		if (value && strcmp (category, value) == 0){
+		if (value && strcmp (category, value) == 0) {
 			g_free (value);
 			return TRUE;
 		}
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 180b3adb1c..c4865ee707 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -426,7 +426,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 		GdkColormap *colormap;
 
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)){
+		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
 			red = bg_color.red;
 			green = bg_color.green;
 			blue = bg_color.blue;
@@ -487,7 +487,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 
 	draw_curved_rectangle (cr, x0, y0, rect_width, rect_height, radius);
 
-	if (gradient){
+	if (gradient) {
 		pat = cairo_pattern_create_linear (item_x - x + 5.5, item_y + 2.5 - y,
 						item_x - x + 5, item_y - y + item_h + 7.5);
 		cairo_pattern_add_color_stop_rgba (pat, 1, red/cc, green/cc, blue/cc, 0.8);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f3cb3f0715..871a6d81c7 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1318,7 +1318,7 @@ e_day_view_style_set (GtkWidget *widget,
 	day_view = E_DAY_VIEW (widget);
 	e_day_view_set_colors(day_view, widget);
 
-	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
+	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++) {
 		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
 			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
 			if (event->canvas_item) {
@@ -1847,7 +1847,7 @@ e_day_view_update_event_label (EDayView *day_view,
 	if ((interval/day_view->mins_per_row) >= 2)
 		short_event = FALSE;
 	else if ((interval%day_view->mins_per_row)==0) {
-		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)){
+		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)) {
 			short_event = TRUE;
 		}
 	} else
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 4d2803d442..88abd1b007 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -918,7 +918,7 @@ set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,
 	g_string_truncate (buffer, 0);
 
 	e_cal_component_get_dtend (comp, &datetime);
-	if (datetime.value){
+	if (datetime.value) {
 		/* For Translators : 'ends' is ends:date implying a task ends on what date */
 		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
 		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 55e3af816e..d4b87fc270 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -396,7 +396,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 		gchar *name = names->data, *email = addresses->data;
 		gint existing_row;
 
-		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){
+		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)) {
 			if (existing_attendee) {
 				removed = TRUE;
 				e_meeting_list_view_remove_attendee_from_name_selector (E_MEETING_LIST_VIEW (view),
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 90a12b51df..041ae6e403 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -294,7 +294,7 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	    && (meeting_end_x - meeting_start_x > 2)) {
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &mts->meeting_time_bg_color);
-		if (is_display_top){
+		if (is_display_top) {
 			cairo_rectangle (cr, meeting_start_x + 1 - x, mts->row_height * 2 - y,
 					    meeting_end_x - meeting_start_x - 2, mts->row_height);
 			cairo_fill (cr);
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 8ad8b608a2..66c1bed136 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -501,7 +501,7 @@ e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
 
 		draw_curved_rectangle (cr, cx0, cy0, rect_width, rect_height, radius);
 
-		if (gradient){
+		if (gradient) {
 			pat = cairo_pattern_create_linear (rect_x + 2, y1 + 1,
 						rect_x + 2, y2 - 7.25);
 			cairo_pattern_add_color_stop_rgba (pat, 1, red/cc, green/cc, blue/cc, 0.8);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 838fda8478..749b3ed504 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -896,7 +896,7 @@ e_week_view_style_set (GtkWidget *widget,
 				span_num++) {
 			span = &g_array_index (week_view->spans,
 					EWeekViewEventSpan, span_num);
-			if (span->text_item){
+			if (span->text_item) {
 				gnome_canvas_item_set (span->text_item,
 						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						NULL);
@@ -2247,7 +2247,7 @@ e_week_view_on_scroll (GtkWidget *widget,
 		g_object_set_data (G_OBJECT (week_view), "tooltip-window", NULL);
 	}
 
-	switch (scroll->direction){
+	switch (scroll->direction) {
 	case GDK_SCROLL_UP:
 		new_value = adj->value - adj->page_increment;
 		break;
@@ -3053,7 +3053,7 @@ e_week_view_start_editing_event (EWeekView *week_view,
 		/* Unfocussing can cause a removal but not a new
 		 * addition so just run backwards through the
 		 * events */
-		for (event_num--; event_num >= 0; event_num--){
+		for (event_num--; event_num >= 0; event_num--) {
 			event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 			if (event->comp_data == comp_data)
 				break;
@@ -3401,7 +3401,7 @@ e_week_view_scroll_a_step (EWeekView *week_view, ECalViewMoveDirection direction
 	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
 	gfloat new_value;
 
-	switch (direction){
+	switch (direction) {
 	case E_CAL_VIEW_MOVE_UP:
 		new_value = adj->value - adj->step_increment;
 		break;
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index 57554427da..e4b28e3d59 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -376,7 +376,7 @@ component_interface_get_extents (AtkComponent *component,
                         *width = week_view->col_widths[cell->column - 1];
                         *x += week_view->col_offsets[cell->column - 1]- scroll_x;
                         *y += week_view->row_offsets[cell->row*2 + 1]- scroll_y;
-                } else if (week_view->compress_weekend && (cell->column > (6 - start_day))){
+                } else if (week_view->compress_weekend && (cell->column > (6 - start_day))) {
                         *height = week_view->row_heights[cell->row*2]*2;
                         *width = week_view->col_widths[cell->column - 1];
                         *x += week_view->col_offsets[cell->column - 1] - scroll_x;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index bd131327c6..bb95c4d9aa 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -895,7 +895,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointe
 	gcal = GNOME_CALENDAR (data);
 
 	/* Choose List view if the search made in the search bar is based on date */
-	if(sexp != NULL && strstr (sexp, d_sexp ) != NULL) {
+	if (sexp != NULL && strstr (sexp, d_sexp ) != NULL) {
 		gcal->priv->lview_select_daten_range = FALSE;
 		gtk_widget_hide (GTK_WIDGET (gcal->priv->date_navigator));
 		gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 10eda35811..5acabdbc25 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -496,7 +496,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 
 	case E_CAL_COMPONENT_METHOD_REPLY:
 
-		if (reply_all){
+		if (reply_all) {
 			e_cal_component_get_attendee_list (comp, &attendees);
 			len = g_slist_length (attendees);
 
@@ -567,7 +567,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 			if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP)
 				continue;
 
-			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))){
+			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))) {
 
 				if (!(att->delfrom && *att->delfrom))
 					break;
@@ -583,7 +583,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 
 		break;
 	case E_CAL_COMPONENT_METHOD_PUBLISH:
-		if(users) {
+		if (users) {
 			GList *list;
 
 			array = g_ptr_array_new ();
@@ -1364,7 +1364,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	top_level = comp_toplevel_with_zones (method, comp, client, zones);
 	ical_string = icalcomponent_as_ical_string_r (top_level);
 
-	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){
+	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT) {
 
 		GString *body;
 		gchar *orig_from = NULL;
@@ -1382,7 +1382,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 
 		e_cal_component_get_description_list (comp, &text_list);
 
-		if (text_list){
+		if (text_list) {
 			ECalComponentText text = *((ECalComponentText *)text_list->data);
 			if (text.value)
 				description = text.value;
@@ -1525,7 +1525,7 @@ fb_sort (struct icalperiodtype *ipt, gint fb_count)
 			if (icaltime_compare (ipt[i].start, ipt[j].start) < 0)
 				continue;
 
-			if (icaltime_compare (ipt[i].start, ipt[j].start) == 0){
+			if (icaltime_compare (ipt[i].start, ipt[j].start) == 0) {
 				if (icaltime_compare (ipt[i].end,
 						     ipt[j].start) < 0)
 					continue;
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index 898a1933dc..dacd132dd2 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -43,7 +43,7 @@ e_bit_array_insert_real(EBitArray *eba, gint row)
 {
 	gint box;
 	gint i;
-	if(eba->bit_count >= 0) {
+	if (eba->bit_count >= 0) {
 		/* Add another word if needed. */
 		if ((eba->bit_count & 0x1f) == 0) {
 			eba->data = g_renew(guint32, eba->data, (eba->bit_count >> 5) + 1);
@@ -70,7 +70,7 @@ e_bit_array_delete_real(EBitArray *eba, gint row, gboolean move_selection_mode)
 	gint i;
 	gint last;
 	gint selected = FALSE;
-	if(eba->bit_count >= 0) {
+	if (eba->bit_count >= 0) {
 		guint32 bitmask;
 		box = row >> 5;
 		last = eba->bit_count >> 5;
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index ae431ee094..d02a42572b 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -147,7 +147,7 @@ window_is_wm_toplevel (Display *display, Window window)
  * @parent_widget: the parent for @dialog
  *
  * This sets the parent for @dialog to be @parent_widget. Unlike
- * gtk_window_set_transient_for(), this doesn't need @parent_widget to
+ * gtk_window_set_transient_for (), this doesn't need @parent_widget to
  * be the actual toplevel, and also works if @parent_widget is
  * embedded as a Bonobo control by an out-of-process container.
  * @parent_widget must already be realized before calling this
@@ -191,7 +191,7 @@ e_dialog_set_transient_for (GtkWindow *dialog,
 	e_dialog_set_transient_for_xid (dialog, parent);
 #endif
 #ifdef GDK_WINDOWING_WIN32
-	g_warning ("Not implemented on Win32: e_dialog_set_transient_for() for plug windows");
+	g_warning ("Not implemented on Win32: e_dialog_set_transient_for () for plug windows");
 #endif
 }
 
@@ -206,7 +206,7 @@ dialog_realized (GtkWindow *dialog, gpointer xid)
  * @dialog: a dialog window
  * @xid: the X Window parent
  *
- * Like e_dialog_set_transient_for(), but use an XID to specify the
+ * Like e_dialog_set_transient_for (), but use an XID to specify the
  * parent window.
  **/
 void
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 0671bdecf5..dd5dddf64e 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -431,7 +431,7 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap)
 	if (parent == NULL && ee_parent_list)
 		parent = (GtkWindow *)ee_parent_list->data;
 	if (parent)
-		gtk_window_set_transient_for((GtkWindow *)dialog, parent);
+		gtk_window_set_transient_for ((GtkWindow *)dialog, parent);
 	else
 		g_warning("No parent set, or default parent available for error dialog");
 
diff --git a/e-util/e-event.c b/e-util/e-event.c
index a94c238035..6cbe26453e 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -249,7 +249,7 @@ e_event_emit(EEvent *emp, const gchar *id, EEventTarget *target)
 
 	d(printf("emit event %s\n", id));
 
-	if (emp->target != NULL){
+	if (emp->target != NULL) {
 		g_warning ("Event already in progress.\n");
 		return;
 	}
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 85985ef673..1336164347 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -152,7 +152,7 @@ load_icon (const gchar *icon_key, const gchar *icon_name, gint size, gint scale)
 
 	g_free (filename);
 	if (unscaled != NULL) {
-		if(gdk_pixbuf_get_width(unscaled) != size || gdk_pixbuf_get_height(unscaled) != size)
+		if (gdk_pixbuf_get_width(unscaled) != size || gdk_pixbuf_get_height(unscaled) != size)
 		{
 			pixbuf = e_icon_factory_pixbuf_scale (unscaled, size, size);
 			g_object_unref (unscaled);
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 8f44c0c2a2..7e70d1b731 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -192,7 +192,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 				command.action = E_TEP_NOP;
 			else
 				command.action = E_TEP_MOVE;
-			switch(key.keyval) {
+			switch (key.keyval) {
 			case GDK_Home:
 			case GDK_KP_Home:
 				if (key.state & GDK_CONTROL_MASK)
@@ -275,7 +275,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 				break;
 			case GDK_Delete:
 			case GDK_KP_Delete:
-				if (key.state & GDK_CONTROL_MASK){
+				if (key.state & GDK_CONTROL_MASK) {
 					command.action = E_TEP_DELETE;
 					command.position = E_TEP_FORWARD_WORD;
 				} else if (key.state & GDK_SHIFT_MASK) {
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8423665d08..57ec251c55 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1356,7 +1356,7 @@ e_file_lock_create ()
 	gboolean status = FALSE;
 
 	gint fd = g_creat (fname, S_IRUSR|S_IWUSR);
-	if (fd == -1){
+	if (fd == -1) {
 		g_warning ("Lock file '%s' creation failed, error %d\n", fname, errno);
 	} else {
 		status = TRUE;
@@ -1371,7 +1371,7 @@ e_file_lock_destroy ()
 {
 	const gchar *fname = get_lock_filename ();
 
-	if (g_unlink (fname) == -1){
+	if (g_unlink (fname) == -1) {
 		g_warning ("Lock destroy: failed to unlink file '%s'!",fname);
 	}
 }
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 69813448f9..934434c619 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -329,7 +329,7 @@ get_values (FilterDatespec *fds)
 {
 	struct _FilterDatespecPrivate *p = PRIV(fds);
 
-	switch(fds->priv->type) {
+	switch (fds->priv->type) {
 	case FDST_SPECIFIED: {
 		guint year, month, day;
 		struct tm tm;
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 472d499b06..8370496c19 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1516,7 +1516,7 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 	camel_object_unref (addr);
 
 	camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>");
-	if(account) {
+	if (account) {
 		camel_medium_set_header (CAMEL_MEDIUM (receipt),
 					"X-Evolution-Account", account->uid);
 		camel_medium_set_header (CAMEL_MEDIUM (receipt),
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 7b64ef9aa6..4af699d583 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -211,7 +211,7 @@ xml_decode(FilterElement *fe, xmlNodePtr node)
 	}
 
 	n = node->children;
-	while(n) {
+	while (n) {
 		if (!strcmp((gchar *)n->name, "folder")) {
 			gchar *uri;
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index f298d19629..cadb8fee65 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2239,7 +2239,7 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders)
 	tree_view = GTK_TREE_VIEW (emft);
 	selection = gtk_tree_view_get_selection (tree_view);
 
-	if (gtk_tree_selection_get_selected(selection, &model, &iter)){
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
 
 		current_path = gtk_tree_model_get_path (model, &iter);
 		do {
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 904e3908ce..e483942885 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -621,7 +621,7 @@ static void
 new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data)
 {
 	struct _EMCreateFolderTempData *emcftd=user_data;
-	if (fi){
+	if (fi) {
 		gtk_widget_destroy ((GtkWidget *) emcftd->emfs);
 
 		/* Exapnding newly created folder */
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 26ebac670f..1b5bd1b63c 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -972,7 +972,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold
 	tkey = strrchr(entry->key, '/');
 	g_return_if_fail (tkey != NULL);
 
-	switch(GPOINTER_TO_INT(g_hash_table_lookup(emfv_setting_key, tkey+1))) {
+	switch (GPOINTER_TO_INT(g_hash_table_lookup(emfv_setting_key, tkey+1))) {
 	case EMFV_CHARSET:
 		em_format_set_default_charset((EMFormat *)emfv->preview, gconf_value_get_string (value));
 		break;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 375eadafe2..270db0e698 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -223,7 +223,7 @@ efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button,
 		g_signal_connect(w, "response", G_CALLBACK(gtk_widget_destroy), NULL);
 
 		if (w && po->widget)
-			gtk_window_set_transient_for((GtkWindow *)w, (GtkWindow *)po->widget);
+			gtk_window_set_transient_for ((GtkWindow *)w, (GtkWindow *)po->widget);
 
 		g_object_unref(ec);
 	} else {
@@ -1105,7 +1105,7 @@ efhd_image_fit_width(GtkWidget *widget, GdkEventButton *event, struct _attach_pu
 	if (info->shown && info->image) {
 		if (info->fit_width != 0) {
 			if (em_icon_stream_is_resized(info->puri.cid, info->fit_width, info->fit_height)) {
-				if(info->fit_width != width) {
+				if (info->fit_width != width) {
 					info->fit_width = width;
 					e_cursor_set (widget->window, E_CURSOR_ZOOM_IN);
 				} else {
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 31c4cf0e88..fa713282c1 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2477,7 +2477,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 
 	if (header_sender && header_from && mail_from_delegate) {
 		camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
-		if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
+		if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
 			camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">");
 		else
 			camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">");
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 2b68ed65b9..5daae1109b 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -214,7 +214,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 
 		*inptr++ = 0;
 
-		switch(emif->state) {
+		switch (emif->state) {
 		case EMIF_PLAIN:
 			/* This could use some funky plugin shit, but this'll do for now */
 			if (strncmp(start, "begin ", 6) == 0
diff --git a/mail/em-utils.c b/mail/em-utils.c
index b47b934ee2..da0e3e2a57 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -328,7 +328,7 @@ em_filename_make_safe (gchar *string)
 	g_return_if_fail (string != NULL);
 	p = string;
 
-	while(p && *p) {
+	while (p && *p) {
 		c = g_utf8_get_char (p);
 		ts = p;
 		p = g_utf8_next_char (p);
@@ -696,7 +696,7 @@ emu_add_address_or_vcard (GtkWindow *parent, const gchar *email, const gchar *vc
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title((GtkWindow *)win, _("Add address"));
 
-	gtk_window_set_transient_for((GtkWindow *)win, parent);
+	gtk_window_set_transient_for ((GtkWindow *)win, parent);
 
 	gtk_window_set_position((GtkWindow *)win, GTK_WIN_POS_CENTER_ON_PARENT);
 	gtk_window_set_type_hint((GtkWindow *)win, GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2146,12 +2146,12 @@ em_utils_contact_photo (CamelInternetAddress *cia, gboolean local)
 	EBook *book = NULL;
 	CamelMimePart *part;
 
-	if (cia == NULL || !camel_internet_address_get(cia, 0, NULL, &addr)){
+	if (cia == NULL || !camel_internet_address_get(cia, 0, NULL, &addr)) {
 		return NULL;
 	}
 
-	if (!emu_addr_list){
-		if (!e_book_get_addressbooks(&emu_addr_list, &err)){
+	if (!emu_addr_list) {
+		if (!e_book_get_addressbooks(&emu_addr_list, &err)) {
 			g_error_free(err);
 			return NULL;
 		}
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 4d690115ac..c357065414 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -281,7 +281,7 @@ set_with(EMVFolderRule *vr, const gchar *name)
 {
 	gint i;
 
-	for(i=0;i<sizeof(with_names)/sizeof(with_names[0]);i++) {
+	for (i=0;i<sizeof(with_names)/sizeof(with_names[0]);i++) {
 		if (!strcmp(name, with_names[i])) {
 			vr->with = i;
 			return;
@@ -511,7 +511,7 @@ source_add(GtkWidget *widget, struct _source_data *data)
 	em_folder_tree_set_excluded (emft, EMFT_EXCLUDE_NOSELECT);
 
 	dialog = em_folder_selector_new(emft, EM_FOLDER_SELECTOR_CAN_CREATE, _("Select Folder"), NULL, _("_Add"));
-	gtk_window_set_transient_for((GtkWindow *)dialog, (GtkWindow *)gtk_widget_get_toplevel(widget));
+	gtk_window_set_transient_for ((GtkWindow *)dialog, (GtkWindow *)gtk_widget_get_toplevel(widget));
 	gtk_window_set_modal((GtkWindow *)dialog, TRUE);
 	g_signal_connect(dialog, "response", G_CALLBACK(vfr_folder_response), data);
 	gtk_widget_show(dialog);
@@ -637,7 +637,7 @@ get_widget(FilterRule *fr, RuleContext *rc)
 
 	g_object_set_data_full((GObject *)frame, "data", data, g_free);
 
-	for(i = 0; i < BUTTON_LAST; i++) {
+	for (i = 0; i < BUTTON_LAST; i++) {
 		data->buttons[i] =(GtkButton *)glade_xml_get_widget(gui, edit_buttons[i].name);
 		g_signal_connect(data->buttons[i], "clicked", edit_buttons[i].func, data);
 	}
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index eb14674117..93fb40aad6 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -796,7 +796,7 @@ do_call(struct _call_msg *m)
 
 	G_VA_COPY(ap, m->ap);
 
-	switch(m->type) {
+	switch (m->type) {
 	case MAIL_CALL_p_p:
 		p1 = va_arg(ap, gpointer );
 		m->ret = m->func(p1);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index eb3fd0cb00..74cf74aeca 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2190,7 +2190,7 @@ save_part_exec (struct _save_part_msg *m)
 	else
 		path = g_filename_to_uri (m->path, NULL, NULL);
 
-	if(!m->readonly){
+	if (!m->readonly) {
 		if (!(stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE))) {
 			camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM,
 					      _("Cannot create output file: %s:\n %s"),
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 323d21f4d7..39fc67e614 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -241,7 +241,7 @@ dialog_destroy_cb (struct _send_data *data, GObject *deadbeef)
 static void
 dialog_response(GtkDialog *gd, gint button, struct _send_data *data)
 {
-	switch(button) {
+	switch (button) {
 	case GTK_RESPONSE_CANCEL:
 		d(printf("cancelled whole thing\n"));
 		if (!data->cancelled) {
@@ -955,7 +955,7 @@ mail_send_receive (GtkWindow *parent)
 	while (scan) {
 		struct _send_info *info = scan->data;
 
-		switch(info->type) {
+		switch (info->type) {
 		case SEND_RECEIVE:
 			mail_fetch_mail(info->uri, info->keep_on_server,
 					FILTER_SOURCE_INCOMING,
diff --git a/mail/message-list.c b/mail/message-list.c
index d3db1f37ba..8f96a27f55 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -927,7 +927,7 @@ ml_get_node_by_id (ETreeModel *etm, const gchar *save_id, gpointer data)
 static gpointer
 ml_duplicate_value (ETreeModel *etm, gint col, gconstpointer value, gpointer data)
 {
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 	case COL_FLAGGED:
 	case COL_SCORE:
@@ -961,7 +961,7 @@ ml_duplicate_value (ETreeModel *etm, gint col, gconstpointer value, gpointer dat
 static void
 ml_free_value (ETreeModel *etm, gint col, gpointer value, gpointer data)
 {
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 	case COL_FLAGGED:
 	case COL_SCORE:
@@ -995,7 +995,7 @@ ml_free_value (ETreeModel *etm, gint col, gpointer value, gpointer data)
 static gpointer
 ml_initialize_value (ETreeModel *etm, gint col, gpointer data)
 {
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 	case COL_FLAGGED:
 	case COL_SCORE:
@@ -1030,7 +1030,7 @@ ml_initialize_value (ETreeModel *etm, gint col, gpointer data)
 static gboolean
 ml_value_is_empty (ETreeModel *etm, gint col, gconstpointer value, gpointer data)
 {
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 	case COL_FLAGGED:
 	case COL_SCORE:
@@ -1085,7 +1085,7 @@ ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer dat
 {
 	guint i;
 
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 		i = GPOINTER_TO_UINT(value);
 		if (i > 5)
@@ -1425,7 +1425,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
 	msg_info = e_tree_memory_node_get_data (E_TREE_MEMORY(etm), path);
 	g_return_val_if_fail (msg_info != NULL, NULL);
 
-	switch (col){
+	switch (col) {
 	case COL_MESSAGE_STATUS:
 		flags = camel_message_info_flags(msg_info);
 		if (flags & CAMEL_MESSAGE_ANSWERED)
@@ -1616,7 +1616,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
 	case COL_SENDER:{
 		gchar **sender_name = NULL;
 		str = camel_message_info_from (msg_info);
-		if(str && str[0] != '\0'){
+		if (str && str[0] != '\0') {
 			gchar *res;
 			sender_name = g_strsplit (str,"<",2);
 			res = g_strdup (*sender_name);
@@ -3912,7 +3912,7 @@ glib_crapback(gpointer key, gpointer data, gpointer x)
 	struct _glibsuxcrap *y = x;
 	CamelMessageInfo *mi;
 
-	if(y->count)
+	if (y->count)
 		return;
 
 	mi = camel_folder_get_message_info(y->folder, key);
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 8c1c3376ec..86b355e095 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -1234,7 +1234,7 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 	target = eab_config_target_new_source(ec, sdialog->source);
 	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
 
-	if(source)
+	if (source)
 		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("Address Book Properties"));
 	else
 		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book"));
diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h
index 2d8c34b242..29175fb494 100644
--- a/modules/addressbook/openldap-extract.h
+++ b/modules/addressbook/openldap-extract.h
@@ -742,8 +742,8 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 
 static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr )
 {
-	for(; *str != '\0'; LDAP_UTF8_INCR(str) ) {
-		if( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) {
+	for (; *str != '\0'; LDAP_UTF8_INCR(str) ) {
+		if ( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) {
 			return (gchar *) str;
 		}
 	}
@@ -756,9 +756,9 @@ static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set )
 	const gchar *cstr;
 	const gchar *cset;
 
-	for( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
-		for( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) {
-			if( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
+	for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
+		for ( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) {
+			if ( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
 				return cstr - str;
 			}
 		}
@@ -772,13 +772,13 @@ static gsize ldap_utf8_strspn( const gchar *str, const gchar *set )
 	const gchar *cstr;
 	const gchar *cset;
 
-	for( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
-		for( cset = set; ; LDAP_UTF8_INCR(cset) ) {
-			if( *cset == '\0' ) {
+	for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
+		for ( cset = set; ; LDAP_UTF8_INCR(cset) ) {
+			if ( *cset == '\0' ) {
 				return cstr - str;
 			}
 
-			if( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
+			if ( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
 				break;
 			}
 		}
@@ -792,20 +792,20 @@ static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last)
 	gchar *begin;
 	gchar *end;
 
-	if( last == NULL ) return NULL;
+	if ( last == NULL ) return NULL;
 
 	begin = str ? str : *last;
 
 	begin += ldap_utf8_strspn( begin, sep );
 
-	if( *begin == '\0' ) {
+	if ( *begin == '\0' ) {
 		*last = NULL;
 		return NULL;
 	}
 
 	end = &begin[ ldap_utf8_strcspn( begin, sep ) ];
 
-	if( *end != '\0' ) {
+	if ( *end != '\0' ) {
 		gchar *next = LDAP_UTF8_NEXT( end );
 		*end = '\0';
 		end = next;
@@ -1023,7 +1023,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 
 	/* protect the input string from strtok */
 	str = LDAP_STRDUP( str_in );
-	if( str == NULL ) {
+	if ( str == NULL ) {
 		return NULL;
 	}
 
@@ -1036,7 +1036,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 
 	res = (gchar **) LDAP_MALLOC( (i + 1) * sizeof(gchar *) );
 
-	if( res == NULL ) {
+	if ( res == NULL ) {
 		LDAP_FREE( str );
 		return NULL;
 	}
@@ -1049,8 +1049,8 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 	{
 		res[i] = LDAP_STRDUP( s );
 
-		if(res[i] == NULL) {
-			for( --i; i >= 0; i-- ) {
+		if (res[i] == NULL) {
+			for ( --i; i >= 0; i-- ) {
 				LDAP_FREE( res[i] );
 			}
 			LDAP_FREE( res );
@@ -1081,7 +1081,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	const gchar *url_tmp;
 	gchar *url;
 
-	if( url_in == NULL || ludpp == NULL ) {
+	if ( url_in == NULL || ludpp == NULL ) {
 		return LDAP_URL_ERR_PARAM;
 	}
 
@@ -1104,7 +1104,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	if ( enclosed ) {
 		p = &url[strlen(url)-1];
 
-		if( *p != '>' ) {
+		if ( *p != '>' ) {
 			LDAP_FREE( url );
 			return LDAP_URL_ERR_BADENCLOSURE;
 		}
@@ -1141,7 +1141,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* scan forward for '/' that marks end of hostport and begin. of dn */
 	p = strchr( url, '/' );
 
-	if( p != NULL ) {
+	if ( p != NULL ) {
 		/* terminate hostport; point to start of dn */
 		*p++ = '\0';
 	}
@@ -1166,7 +1166,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		*q++ = '\0';
 		ldap_pvt_hex_unescape( q );
 
-		if( *q == '\0' ) {
+		if ( *q == '\0' ) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADURL;
@@ -1185,7 +1185,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* If [ip address]:port syntax, url is [ip and we skip the [ */
 	ludp->lud_host = LDAP_STRDUP( url + ( *url == '[' ) );
 
-	if( ludp->lud_host == NULL ) {
+	if ( ludp->lud_host == NULL ) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_MEM;
@@ -1200,12 +1200,12 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	 * but we need to account for it. Fortunately it can't be confused with
 	 * anything real.
 	 */
-	if( (p == NULL) && (q != NULL) && ((q = strchr( q, '?')) != NULL)) {
+	if ( (p == NULL) && (q != NULL) && ((q = strchr( q, '?')) != NULL)) {
 		q++;
 		/* ? immediately followed by question */
-		if( *q == '?') {
+		if ( *q == '?') {
 			q++;
-			if( *q != '\0' ) {
+			if ( *q != '\0' ) {
 				/* parse dn part */
 				ldap_pvt_hex_unescape( q );
 				ludp->lud_dn = LDAP_STRDUP( q );
@@ -1213,7 +1213,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 				ludp->lud_dn = LDAP_STRDUP( "" );
 			}
 
-			if( ludp->lud_dn == NULL ) {
+			if ( ludp->lud_dn == NULL ) {
 				LDAP_FREE( url );
 				ldap_free_urldesc( ludp );
 				return LDAP_URL_ERR_MEM;
@@ -1221,7 +1221,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		}
 	}
 
-	if( p == NULL ) {
+	if ( p == NULL ) {
 		LDAP_FREE( url );
 		*ludpp = ludp;
 		return LDAP_URL_SUCCESS;
@@ -1230,12 +1230,12 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* scan forward for '?' that may marks end of dn */
 	q = strchr( p, '?' );
 
-	if( q != NULL ) {
+	if ( q != NULL ) {
 		/* terminate dn part */
 		*q++ = '\0';
 	}
 
-	if( *p != '\0' ) {
+	if ( *p != '\0' ) {
 		/* parse dn part */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_dn = LDAP_STRDUP( p );
@@ -1243,13 +1243,13 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		ludp->lud_dn = LDAP_STRDUP( "" );
 	}
 
-	if( ludp->lud_dn == NULL ) {
+	if ( ludp->lud_dn == NULL ) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_MEM;
 	}
 
-	if( q == NULL ) {
+	if ( q == NULL ) {
 		/* no more */
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -1260,17 +1260,17 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if( q != NULL ) {
+	if ( q != NULL ) {
 		/* terminate attributes part */
 		*q++ = '\0';
 	}
 
-	if( *p != '\0' ) {
+	if ( *p != '\0' ) {
 		/* parse attributes */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_attrs = ldap_str2charray( p, "," );
 
-		if( ludp->lud_attrs == NULL ) {
+		if ( ludp->lud_attrs == NULL ) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADATTRS;
@@ -1288,17 +1288,17 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if( q != NULL ) {
+	if ( q != NULL ) {
 		/* terminate the scope part */
 		*q++ = '\0';
 	}
 
-	if( *p != '\0' ) {
+	if ( *p != '\0' ) {
 		/* parse the scope */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_scope = str2scope( p );
 
-		if( ludp->lud_scope == -1 ) {
+		if ( ludp->lud_scope == -1 ) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADSCOPE;
@@ -1316,16 +1316,16 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if( q != NULL ) {
+	if ( q != NULL ) {
 		/* terminate the filter part */
 		*q++ = '\0';
 	}
 
-	if( *p != '\0' ) {
+	if ( *p != '\0' ) {
 		/* parse the filter */
 		ldap_pvt_hex_unescape( p );
 
-		if( ! *p ) {
+		if ( ! *p ) {
 			/* missing filter */
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
@@ -1335,7 +1335,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		LDAP_FREE( ludp->lud_filter );
 		ludp->lud_filter = LDAP_STRDUP( p );
 
-		if( ludp->lud_filter == NULL ) {
+		if ( ludp->lud_filter == NULL ) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_MEM;
@@ -1353,7 +1353,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if( q != NULL ) {
+	if ( q != NULL ) {
 		/* extra '?' */
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
@@ -1363,22 +1363,22 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* parse the extensions */
 	ludp->lud_exts = ldap_str2charray( p, "," );
 
-	if( ludp->lud_exts == NULL ) {
+	if ( ludp->lud_exts == NULL ) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_BADEXTS;
 	}
 
-	for( i=0; ludp->lud_exts[i] != NULL; i++ ) {
+	for ( i=0; ludp->lud_exts[i] != NULL; i++ ) {
 		ldap_pvt_hex_unescape( ludp->lud_exts[i] );
 
-		if( *ludp->lud_exts[i] == '!' ) {
+		if ( *ludp->lud_exts[i] == '!' ) {
 			/* count the number of critical extensions */
 			ludp->lud_crit_exts++;
 		}
 	}
 
-	if( i == 0 ) {
+	if ( i == 0 ) {
 		/* must have 1 or more */
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
@@ -1396,7 +1396,7 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 {
 	gint rc = ldap_url_parse_ext( url_in, ludpp );
 
-	if( rc != LDAP_URL_SUCCESS ) {
+	if ( rc != LDAP_URL_SUCCESS ) {
 		return rc;
 	}
 
@@ -1410,13 +1410,13 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	}
 
 	if ((*ludpp)->lud_port == 0) {
-		if( strcmp((*ludpp)->lud_scheme, "ldap") == 0 ) {
+		if ( strcmp((*ludpp)->lud_scheme, "ldap") == 0 ) {
 			(*ludpp)->lud_port = LDAP_PORT;
 #ifdef LDAP_CONNECTIONLESS
-		} else if( strcmp((*ludpp)->lud_scheme, "cldap") == 0 ) {
+		} else if ( strcmp((*ludpp)->lud_scheme, "cldap") == 0 ) {
 			(*ludpp)->lud_port = LDAP_PORT;
 #endif
-		} else if( strcmp((*ludpp)->lud_scheme, "ldaps") == 0 ) {
+		} else if ( strcmp((*ludpp)->lud_scheme, "ldaps") == 0 ) {
 			(*ludpp)->lud_port = LDAPS_PORT;
 		}
 	}
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;
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index e0434754a8..fc976bffba 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -953,7 +953,7 @@ default_nickname (CERTCertificate *cert)
 		CERT_DestroyCertificate(dummycert);
 		if (tmp != nickname) PR_Free(nickname);
 		count++;
-	} /* end of while(1) */
+	} /* end of while (1) */
 
  loser:
 	if ( nickname ) {
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 0cea3c50fc..02b6ccdb3b 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -523,7 +523,7 @@ process_version (SECItem     *versionItem,
 		version = 0;
 	}
 
-	switch (version){
+	switch (version) {
 	case 0:
 		e_asn1_object_set_display_value (item, _("Version 1"));
 		break;
@@ -1006,7 +1006,7 @@ process_name (CERTName *name, gchar **value)
 
 			/* This function returns a string in UTF8 format. */
 			decodeItem = CERT_DecodeAVAValue(&ava->value);
-			if(!decodeItem) {
+			if (!decodeItem) {
 				return FALSE;
 			}
 
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 3670218456..148960e4d5 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -391,7 +391,7 @@ gal_define_views_dialog_set_property (GObject *object, guint prop_id, const GVal
 
 	dialog = GAL_DEFINE_VIEWS_DIALOG (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_COLLECTION:
 		if (g_value_get_object (value))
 			gal_define_views_dialog_set_collection(dialog, GAL_VIEW_COLLECTION(g_value_get_object (value)));
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index a977e0a787..e5425f7552 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -213,7 +213,7 @@ gal_define_views_model_set_property (GObject *object, guint prop_id, const GValu
 
 	model = GAL_DEFINE_VIEWS_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_EDITABLE:
 		model->editable = g_value_get_boolean (value);
 		break;
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 9d061ed401..da90fb024d 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -241,7 +241,7 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue *
 
 	dialog = GAL_VIEW_NEW_DIALOG (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_NAME:
 		entry = glade_xml_get_widget(dialog->gui, "entry-name");
 		if (entry && GTK_IS_ENTRY(entry)) {
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 41b03d7f65..04c163ef06 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -212,7 +212,7 @@ ecb_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FILL_COLOR:
 		if (g_value_get_string (value))
 			gdk_color_parse (g_value_get_string (value), &color);
@@ -288,7 +288,7 @@ ecb_get_property (GObject *object,
 
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FILL_COLOR_GDK:
 		g_value_set_boxed (value, gdk_color_copy (&ecb->priv->color));
 		break;
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index a7e8191bc4..af159b2000 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -126,7 +126,7 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value,
 	item = GNOME_CANVAS_ITEM (object);
 	e_canvas_vbox = E_CANVAS_VBOX (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_WIDTH:
 	case PROP_MINIMUM_WIDTH:
 		e_canvas_vbox->minimum_width = g_value_get_double (value);
@@ -329,7 +329,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 				max_width = item_width;
 			list = g_list_next(list);
 
-			for(; list; list = g_list_next(list)) {
+			for (; list; list = g_list_next(list)) {
 				running_height += e_canvas_vbox->spacing;
 
 				g_object_get (list->data,
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index e8f4221b60..4ec2717d1c 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -80,12 +80,12 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch
 	black_color = '.';
 
 	yofs = colors + 1;
-	for (y = 0; y < 32; y++){
-		for (x = 0; x < 32;){
+	for (y = 0; y < 32; y++) {
+		for (x = 0; x < 32;) {
 			gchar value = 0, maskv = 0;
 
-			for (pix = 0; pix < 8; pix++, x++){
-				if (xpm [y + yofs][x] != transparent_color){
+			for (pix = 0; pix < 8; pix++, x++) {
+				if (xpm [y + yofs][x] != transparent_color) {
 					maskv |= 1 << pix;
 
 					/*
@@ -94,7 +94,7 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch
 					 * We reverse the foreground & background in the next
 					 * routine to compensate.
 					 */
-					if (xpm [y + yofs][x] == black_color){
+					if (xpm [y + yofs][x] == black_color) {
 						value |= 1 << pix;
 					}
 				}
@@ -114,7 +114,7 @@ e_cursors_init (void)
 
 	e_color_init ();
 
-	for (i = 0; cursors [i].hot_x; i++){
+	for (i = 0; cursors [i].hot_x; i++) {
 		if (cursors [i].hot_x < 0)
 			cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
 		else {
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index e7b1a0555e..775ab3b8a3 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -200,7 +200,7 @@ e_date_edit_get_type		(void)
 {
 	static GType date_edit_type = 0;
 
-	if (!date_edit_type){
+	if (!date_edit_type) {
 		static const GTypeInfo date_edit_info =  {
 			sizeof (EDateEditClass),
 			NULL,           /* base_init */
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 6cd4958127..d33e3c1139 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -50,7 +50,7 @@ e_popup_menu (GtkMenu *menu, GdkEvent *event)
 		else if ((event->type == GDK_BUTTON_PRESS) ||
 			 (event->type == GDK_BUTTON_RELEASE) ||
 			 (event->type == GDK_2BUTTON_PRESS) ||
-			 (event->type == GDK_3BUTTON_PRESS)){
+			 (event->type == GDK_3BUTTON_PRESS)) {
 			gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
 					event->button.button,
 					event->button.time);
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 129a52e0ca..953d0c67dd 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -53,7 +53,7 @@ make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name, GtkWidget *pixma
 
 	gtk_container_add (GTK_CONTAINER (item), label);
 
-	if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)){
+	if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)) {
 		gtk_widget_show (pixmap);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap);
 	}
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 84a18eb925..9a2a6a8e68 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -194,7 +194,7 @@ esma_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		g_value_set_int (value, esma->cursor_row);
 		break;
@@ -211,7 +211,7 @@ esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		e_selection_model_do_something(esm, g_value_get_int (value), esma->cursor_col, 0);
 		break;
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index cc1d3b3780..fb43d73ffb 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -84,7 +84,7 @@ esm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_SORTER:
 		g_value_set_object (value, esm->sorter);
 		break;
@@ -104,7 +104,7 @@ esm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_SORTER:
 		drop_sorter(esm);
 		add_sorter(esm, g_value_get_object (value) ? E_SORTER(g_value_get_object(value)) : NULL);
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index eff79544fd..aa6c41e6d2 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -249,7 +249,7 @@ sensitize_widgets (ESendOptionsDialog *sod)
 	if (!gopts->expiration_enabled)
 		gtk_widget_set_sensitive (priv->expire_after, FALSE);
 
-	if (!gopts->delay_enabled){
+	if (!gopts->delay_enabled) {
 		gtk_widget_set_sensitive (priv->delay_until, FALSE);
 	}
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 5c7d931321..9f7d7f113a 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -290,7 +290,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit)
 	text = edit->text;
 	if (edit->tep)
 		g_object_unref (edit->tep);
-	if (! edit->default_cursor_shown){
+	if (! edit->default_cursor_shown) {
 		gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL);
 		edit->default_cursor_shown = TRUE;
 	}
@@ -412,7 +412,7 @@ ect_unrealize (ECellView *ecv)
 	g_object_unref (text_view->gc);
 	text_view->gc = NULL;
 
-	if (text_view->edit){
+	if (text_view->edit) {
 		ect_cancel_edit (text_view);
 	}
 
@@ -979,7 +979,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 				return 1;
 		}
 
-		if (event->key.keyval == GDK_Escape){
+		if (event->key.keyval == GDK_Escape) {
 			/* if not changed, then pass this even to parent */
 			return_val = text_view->edit != NULL && text_view->edit->text && text_view->edit->old_text && 0 != strcmp (text_view->edit->text, text_view->edit->old_text);
 			ect_cancel_edit (text_view);
@@ -1109,7 +1109,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		edit->pointer_in = TRUE;
 #endif
 		if (edit_display) {
-			if (edit->default_cursor_shown){
+			if (edit->default_cursor_shown) {
 				gdk_window_set_cursor (canvas->window, text_view->i_cursor);
 				edit->default_cursor_shown = FALSE;
 			}
@@ -1120,7 +1120,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		text_view->pointer_in = FALSE;
 #endif
 		if (edit_display) {
-			if (! edit->default_cursor_shown){
+			if (! edit->default_cursor_shown) {
 				gdk_window_set_cursor (canvas->window, NULL);
 				edit->default_cursor_shown = TRUE;
 			}
@@ -1213,8 +1213,8 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 	edit->text = g_strdup (edit->old_text);
 
 #if 0
-	if (edit->pointer_in){
-		if (edit->default_cursor_shown){
+	if (edit->pointer_in) {
+		if (edit->default_cursor_shown) {
 			gdk_window_set_cursor (GTK_WIDGET(item->canvas)->window, text_view->i_cursor);
 			edit->default_cursor_shown = FALSE;
 		}
@@ -1234,7 +1234,7 @@ ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row,
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	CellEdit *edit = text_view->edit;
 
-	if (edit){
+	if (edit) {
 		ect_stop_editing (text_view, TRUE);
 	} else {
 		/*
@@ -1968,9 +1968,9 @@ e_cell_text_delete_surrounding_cb   (GtkIMContext *context,
 					      edit->text + MIN (edit->selection_start, edit->selection_end));
 	begin_pos += offset;
 	end_pos = begin_pos + n_chars;
-	if(begin_pos < 0 || text_len < begin_pos)
+	if (begin_pos < 0 || text_len < begin_pos)
 		return FALSE;
-	if(end_pos > text_len)
+	if (end_pos > text_len)
 		end_pos = text_len;
 	edit->selection_start = g_utf8_offset_to_pointer (edit->text, begin_pos)
 				- edit->text;
@@ -2009,9 +2009,9 @@ e_cell_text_init (ECellText *ect)
 ECell *
 e_cell_text_construct (ECellText *cell, const gchar *fontname, GtkJustification justify)
 {
-	if(!cell)
+	if (!cell)
 		return E_CELL(NULL);
-	if(fontname)
+	if (fontname)
 		cell->font_name = g_strdup (fontname);
 	cell->justify = justify;
 	return E_CELL(cell);
@@ -2143,7 +2143,7 @@ _blink_scroll_timeout (gpointer data)
 			redraw = TRUE;
 		edit->show_cursor = FALSE;
 	}
-	if (redraw){
+	if (redraw) {
 		ect_queue_redraw (text_view, edit->view_col, edit->row);
 	}
 	return TRUE;
@@ -2561,7 +2561,7 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *
 		}
 	}
 
-	if (redraw){
+	if (redraw) {
 		ect_queue_redraw (text_view, edit->view_col, edit->row);
 	}
 }
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index d83e6775b9..db047f1220 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -122,7 +122,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	const gint value = GPOINTER_TO_INT (
 		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
 
-	if (value < 0 || value >= toggle->n_states){
+	if (value < 0 || value >= toggle->n_states) {
 		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
 			   value, toggle->n_states);
 		return;
@@ -141,7 +141,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 
 	image = toggle->images[value];
 
-	if ((x2 - x1) < gdk_pixbuf_get_width (image)){
+	if ((x2 - x1) < gdk_pixbuf_get_width (image)) {
 		x = x1;
 		width = x2 - x1;
 	} else {
@@ -149,7 +149,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		width = gdk_pixbuf_get_width (image);
 	}
 
-	if ((y2 - y1) < gdk_pixbuf_get_height (image)){
+	if ((y2 - y1) < gdk_pixbuf_get_height (image)) {
 		y = y1;
 		height = y2 - y1;
 	} else {
@@ -194,7 +194,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_co
 		return FALSE;
 #endif
 
-	switch (event->type){
+	switch (event->type) {
 	case GDK_KEY_PRESS:
 		if (event->key.keyval != GDK_space)
 			return FALSE;
@@ -237,7 +237,7 @@ etog_print (ECellView *ecell_view, GtkPrintContext *context,
 			e_table_model_value_at (ecell_view->e_table_model, model_col, row));
 
 	cairo_t *cr;
-	if (value >= toggle->n_states){
+	if (value >= toggle->n_states) {
 		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
 				value, toggle->n_states);
 		return;
@@ -360,7 +360,7 @@ e_cell_toggle_construct (ECellToggle *etog, gint border, gint n_states, GdkPixbu
 
 	etog->images = g_new (GdkPixbuf *, n_states);
 
-	for (i = 0; i < n_states; i++){
+	for (i = 0; i < n_states; i++) {
 		etog->images [i] = images [i];
 		if (images[i]) {
 		g_object_ref (images [i]);
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index b6397cf914..57769d1540 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -197,7 +197,7 @@ etcta_set_property (GObject *object, guint prop_id, const GValue *value, GParamS
 	item = GNOME_CANVAS_ITEM (object);
 	etcta = E_TABLE_CLICK_TO_ADD (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_HEADER:
 		etcta_drop_table_header (etcta);
 		etcta_add_table_header (etcta, E_TABLE_HEADER(g_value_get_object (value)));
@@ -267,7 +267,7 @@ etcta_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *p
 
 	etcta = E_TABLE_CLICK_TO_ADD (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_HEADER:
 		g_value_set_object (value, etcta->eth);
 		break;
@@ -378,7 +378,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 
-	switch (e->type){
+	switch (e->type) {
 	case GDK_FOCUS_CHANGE:
 		if (!e->focus_change.in)
 			return TRUE;
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
index 0969a79410..699fe95e69 100644
--- a/widgets/table/e-table-column.c
+++ b/widgets/table/e-table-column.c
@@ -141,7 +141,7 @@ e_table_column_index (ETableColumn *etc, const gchar *identifier)
 	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
 	g_return_val_if_fail (identifier != NULL, 0);
 
-	for (i = 0; i < etc->col_count; i++){
+	for (i = 0; i < etc->col_count; i++) {
 		ETableCol *tc = etc->columns [i];
 
 		if (strcmp (i->id, identifier) == 0)
@@ -161,7 +161,7 @@ e_table_column_get_index_at (ETableColumn *etc, gint x_offset)
 	g_return_val_if_fail (identifier != NULL, 0);
 
 	total = 0;
-	for (i = 0; i < etc->col_count; i++){
+	for (i = 0; i < etc->col_count; i++) {
 		total += etc->columns [i]->width;
 
 		if (x_offset < total)
@@ -205,7 +205,7 @@ ve_table_column_get_selected (ETableColumn *etc)
 	g_return_val_if_fail (etc != NULL, 0);
 	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
 
-	for (i = 0; i < etc->col_count; i++){
+	for (i = 0; i < etc->col_count; i++) {
 		if (etc->columns [i]->selected)
 			selected++;
 	}
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 9fd2f7ea20..375e2cf99f 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -237,7 +237,7 @@ find_column_in_spec (ETableSpecification *spec, gint model_col)
 {
 	ETableColumnSpecification **column;
 
-	for (column = spec->columns; *column; column++){
+	for (column = spec->columns; *column; column++) {
 		if ((*column)->disabled)
 			continue;
 		if ((*column)->model_col != model_col)
@@ -254,7 +254,7 @@ find_model_column_by_name (ETableSpecification *spec, const gchar *s)
 {
 	ETableColumnSpecification **column;
 
-	for (column = spec->columns; *column; column++){
+	for (column = spec->columns; *column; column++) {
 
 		if ((*column)->disabled)
 			continue;
@@ -270,7 +270,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 	ETableConfigSortWidgets *widgets;
 	gint count, i;
 
-	if (is_sort){
+	if (is_sort) {
 		count = e_table_sort_info_sorting_get_count (
 			config->temp_state->sort_info);
 		widgets = &config->sort [0];
@@ -280,7 +280,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 		widgets = &config->group [0];
 	}
 
-	for (i = 0; i < 4; i++){
+	for (i = 0; i < 4; i++) {
 		gboolean sensitive = (i <= count);
 		const gchar *text = "";
 
@@ -296,7 +296,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 			widgets [i].combo,
 			widgets [i].changed_id);
 
-		if (i < count){
+		if (i < count) {
 			GtkToggleButton *a, *d;
 			ETableSortColumn col =
 				is_sort
@@ -310,7 +310,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 			ETableColumnSpecification *column =
 				find_column_in_spec (config->source_spec, col.column);
 
-			if (!column){
+			if (!column) {
 				/*
 				 * This is a bug in the programmer
 				 * stuff, but by the time we arrive
@@ -372,7 +372,7 @@ config_sort_info_update (ETableConfig *config)
 		ETableColumnSpecification *column;
 
 		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
+		if (!column) {
 			g_warning ("Could not find column model in specification");
 			continue;
 		}
@@ -414,7 +414,7 @@ config_group_info_update (ETableConfig *config)
 		ETableColumnSpecification *column;
 
 		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
+		if (!column) {
 			g_warning ("Could not find model column in specification");
 			continue;
 		}
@@ -468,8 +468,8 @@ config_fields_info_update (ETableConfig *config)
 	GString *res = g_string_new ("");
 	gint i, j;
 
-	for (i = 0; i < config->state->col_count; i++){
-		for (j = 0, column = config->source_spec->columns; *column; column++, j++){
+	for (i = 0; i < config->state->col_count; i++) {
+		for (j = 0, column = config->source_spec->columns; *column; column++, j++) {
 
 			if ((*column)->disabled)
 				continue;
@@ -513,9 +513,9 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 
 	do {
 		response = gtk_dialog_run (dialog);
-		switch (response){
+		switch (response) {
 		case 0: /* clear fields */
-			if (is_sort){
+			if (is_sort) {
 				e_table_sort_info_sorting_truncate (
 					config->temp_state->sort_info, 0);
 			} else {
@@ -568,7 +568,7 @@ do_fields_config_dialog (ETableConfig *config)
 
 	do {
 		response = gtk_dialog_run (GTK_DIALOG(config->dialog_show_fields));
-		switch (response){
+		switch (response) {
 		case GTK_RESPONSE_OK:
 			g_object_unref (config->state);
 			config->state = config->temp_state;
@@ -787,7 +787,7 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort)
 		gint col;
 
 		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
+		if (col == -1) {
 			g_warning ("sort: This should not happen (%s)", s);
 			g_free (s);
 			return;
@@ -827,7 +827,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui)
 	GSList *l;
 	gint i;
 
-	for (i = 0; i < 4; i++){
+	for (i = 0; i < 4; i++) {
 		gchar buffer [80];
 
 		snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1);
@@ -855,10 +855,10 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui)
 		config->sort [i].e_table_config = config;
 	}
 
-	for (l = config->column_names; l; l = l->next){
+	for (l = config->column_names; l; l = l->next) {
 		gchar *label = l->data;
 
-		for (i = 0; i < 4; i++){
+		for (i = 0; i < 4; i++) {
 			configure_combo_box_add (
 				GTK_COMBO_BOX (config->sort[i].combo),
 				dgettext (config->domain, label), label);
@@ -868,7 +868,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui)
 	/*
 	 * After we have runtime modified things, signal connect
 	 */
-	for (i = 0; i < 4; i++){
+	for (i = 0; i < 4; i++) {
 		config->sort [i].changed_id = g_signal_connect (
 			config->sort [i].combo,
 			"changed", G_CALLBACK (sort_combo_changed),
@@ -897,7 +897,7 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group)
 		gint col;
 
 		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
+		if (col == -1) {
 			g_warning ("grouping: this should not happen, %s", s);
 			g_free (s);
 			return;
@@ -937,7 +937,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
 	GSList *l;
 	gint i;
 
-	for (i = 0; i < 4; i++){
+	for (i = 0; i < 4; i++) {
 		gchar buffer [80];
 
 		snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1);
@@ -972,10 +972,10 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
 		config->group [i].e_table_config = config;
 	}
 
-	for (l = config->column_names; l; l = l->next){
+	for (l = config->column_names; l; l = l->next) {
 		gchar *label = l->data;
 
-		for (i = 0; i < 4; i++){
+		for (i = 0; i < 4; i++) {
 			configure_combo_box_add (
 				GTK_COMBO_BOX (config->group[i].combo),
 				dgettext (config->domain, label), label);
@@ -985,7 +985,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
 	/*
 	 * After we have runtime modified things, signal connect
 	 */
-	for (i = 0; i < 4; i++){
+	for (i = 0; i < 4; i++) {
 		config->group [i].changed_id = g_signal_connect (
 			config->group [i].combo,
 			"changed", G_CALLBACK (group_combo_changed),
@@ -1293,7 +1293,7 @@ e_table_config_construct (ETableConfig        *config,
 
 	config->domain = g_strdup (spec->domain);
 
-	for (column = config->source_spec->columns; *column; column++){
+	for (column = config->source_spec->columns; *column; column++) {
 		gchar *label = (*column)->title;
 
 		if ((*column)->disabled)
@@ -1333,7 +1333,7 @@ e_table_config_new (const gchar          *header,
 {
 	ETableConfig *config = g_object_new (E_TABLE_CONFIG_TYPE, NULL);
 
-	if (e_table_config_construct (config, header, spec, state, parent_window) == NULL){
+	if (e_table_config_construct (config, header, spec, state, parent_window) == NULL) {
 		g_object_unref (config);
 		return NULL;
 	}
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index f5dc15d74d..2c2cbe0ffe 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -148,13 +148,13 @@ my_row_count (ETableModel *etc, gpointer data)
 static gpointer
 my_value_at (ETableModel *etc, gint col, gint row, gpointer data)
 {
-	if (col == COLOR_COLUMN){
-		if (importance_data[row]){
+	if (col == COLOR_COLUMN) {
+		if (importance_data[row]) {
 			return color1;
 		} else {
 			return color2;
 		}
-	} else if (col == IMPORTANCE_COLUMN){
+	} else if (col == IMPORTANCE_COLUMN) {
 		return (gpointer) importance_data[row];
 	} else {
 		return (gpointer) table_data [row][col];
@@ -164,8 +164,8 @@ my_value_at (ETableModel *etc, gint col, gint row, gpointer data)
 static void
 my_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer val, gpointer data)
 {
-	if (col == COLOR_COLUMN){
-	} else if (col == IMPORTANCE_COLUMN){
+	if (col == COLOR_COLUMN) {
+	} else if (col == IMPORTANCE_COLUMN) {
 		importance_data[row] = (gboolean) val;
 	} else {
 		g_free (table_data [row][col]);
@@ -185,9 +185,9 @@ my_is_cell_editable (ETableModel *etc, gint col, gint row, gpointer data)
 static gpointer
 my_duplicate_value (ETableModel *etc, gint col, gconstpointer value, gpointer data)
 {
-	if (col == COLOR_COLUMN){
+	if (col == COLOR_COLUMN) {
 		return (gpointer) value;
-	} else if (col == IMPORTANCE_COLUMN){
+	} else if (col == IMPORTANCE_COLUMN) {
 		return (gpointer) value;
 	} else {
 		return g_strdup (value);
@@ -197,8 +197,8 @@ my_duplicate_value (ETableModel *etc, gint col, gconstpointer value, gpointer da
 static void
 my_free_value (ETableModel *etc, gint col, gpointer value, gpointer data)
 {
-	if (col == COLOR_COLUMN){
-	} else if (col == IMPORTANCE_COLUMN){
+	if (col == COLOR_COLUMN) {
+	} else if (col == IMPORTANCE_COLUMN) {
 	} else {
 		g_free (value);
 	}
@@ -207,9 +207,9 @@ my_free_value (ETableModel *etc, gint col, gpointer value, gpointer data)
 static gpointer
 my_initialize_value (ETableModel *etc, gint col, gpointer data)
 {
-	if (col == COLOR_COLUMN){
+	if (col == COLOR_COLUMN) {
 		return NULL;
-	} else if (col == IMPORTANCE_COLUMN){
+	} else if (col == IMPORTANCE_COLUMN) {
 		return NULL;
 	} else {
 		return g_strdup ("");
@@ -219,9 +219,9 @@ my_initialize_value (ETableModel *etc, gint col, gpointer data)
 static gboolean
 my_value_is_empty (ETableModel *etc, gint col, gconstpointer value, gpointer data)
 {
-	if (col == COLOR_COLUMN){
+	if (col == COLOR_COLUMN) {
 		return value == NULL;
-	} else if (col == IMPORTANCE_COLUMN){
+	} else if (col == IMPORTANCE_COLUMN) {
 		return value == NULL;
 	} else {
 		return !(value && *(gchar *)value);
@@ -231,9 +231,9 @@ my_value_is_empty (ETableModel *etc, gint col, gconstpointer value, gpointer dat
 static gchar *
 my_value_to_string (ETableModel *etc, gint col, gconstpointer value, gpointer data)
 {
-	if (col == COLOR_COLUMN){
+	if (col == COLOR_COLUMN) {
 		return g_strdup_printf("%d", (gint) value);
-	} else if (col == IMPORTANCE_COLUMN){
+	} else if (col == IMPORTANCE_COLUMN) {
 		return g_strdup_printf("%d", (gint) value);
 	} else {
 		return g_strdup(value);
@@ -254,8 +254,8 @@ create_table ()
 	GdkPixbuf *pixbuf;
 
 	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < VIEW_COLS; j++){
+	for (i = 0; i < ROWS; i++) {
+		for (j = 0; j < VIEW_COLS; j++) {
 			table_data[i][j] = g_strdup ("");
 		}
 		importance_data[i] = FALSE;
@@ -290,7 +290,7 @@ create_table ()
 	/* Next we create a column object for each view column and add
 	   them to the header.  We don't create a column object for
 	   the importance column since it will not be shown. */
-	for (i = 0; i < VIEW_COLS; i++){
+	for (i = 0; i < VIEW_COLS; i++) {
 		/* Create the column. */
 		ETableCol *ecol = e_table_col_new (
 						   i, headers [i],
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index e3c059d748..b1bd18d499 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -145,7 +145,7 @@ static void
 e_table_field_chooser_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
 	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG(object);
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_DND_CODE:
 		g_free(etfcd->dnd_code);
 		etfcd->dnd_code = g_strdup(g_value_get_string (value));
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index d897d16f85..7f0f39a9f9 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -334,7 +334,7 @@ etfci_set_property (GObject *object, guint prop_id, const GValue *value, GParamS
 	item = GNOME_CANVAS_ITEM (object);
 	etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FULL_HEADER:
 		etfci_drop_full_header (etfci);
 		if (g_value_get_object (value))
@@ -366,7 +366,7 @@ etfci_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *p
 
 	etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 
 	case PROP_DND_CODE:
 		g_value_set_string (value, etfci->dnd_code);
@@ -468,7 +468,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
 	state = GTK_WIDGET_STATE (canvas);
 
 	y1 = y2 = 0;
-	for (row = 0; row < rows; row++, y1 = y2){
+	for (row = 0; row < rows; row++, y1 = y2) {
 		ETableCol *ecol;
 
 		ecol = e_table_header_get_column (etfci->combined_header, row);
@@ -582,7 +582,7 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e)
 	GnomeCanvas *canvas = item->canvas;
 	gint x, y;
 
-	switch (e->type){
+	switch (e->type) {
 	case GDK_MOTION_NOTIFY:
 		gnome_canvas_w2c (canvas, e->motion.x, e->motion.y, &x, &y);
 
@@ -593,7 +593,7 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e)
 	case GDK_BUTTON_PRESS:
 		gnome_canvas_w2c (canvas, e->button.x, e->button.y, &x, &y);
 
-		if (e->button.button == 1){
+		if (e->button.button == 1) {
 			etfci->click_x = x;
 			etfci->click_y = y;
 			etfci->maybe_drag = TRUE;
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index fb66d9618a..231ad0801f 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -228,7 +228,7 @@ e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue
 {
 	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_DND_CODE:
 		g_free(etfc->dnd_code);
 		etfc->dnd_code = g_strdup(g_value_get_string(value));
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 2a62f70d95..43513ddc89 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -244,7 +244,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 			use_col      = FALSE;
 			direction    = E_FOCUS_START;
 		}
-		if (change_focus){
+		if (change_focus) {
 			GList *list;
 			for (list = etgc->children; list; list = list->next) {
 				ETableGroupContainerChildNode *child_node;
@@ -471,7 +471,7 @@ etgc_add (ETableGroup *etg, gint row)
 	ETableGroupContainerChildNode *child_node;
 	gint i = 0;
 
-	for (; list; list = g_list_next (list), i++){
+	for (; list; list = g_list_next (list), i++) {
 		gint comp_val;
 
 		child_node = list->data;
@@ -1017,7 +1017,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 	if (frozen)
 		return;
 
-	if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){
+	if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED) {
 		gdouble running_height = 0;
 		gdouble running_width = 0;
 		gdouble old_height;
@@ -1025,7 +1025,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 
 		old_height = etgc->height;
 		old_width = etgc->width;
-		if (etgc->children == NULL){
+		if (etgc->children == NULL) {
 		} else {
 			GList *list;
 			gdouble extra_height = 0;
@@ -1049,7 +1049,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 
 			running_height = extra_height;
 
-			for ( list = etgc->children; list; list = g_list_next (list)){
+			for ( list = etgc->children; list; list = g_list_next (list)) {
 				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 				ETableGroup *child = child_node->child;
 
@@ -1060,7 +1060,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 				if (item_width > running_width)
 					running_width = item_width;
 			}
-			for ( list = etgc->children; list; list = g_list_next (list)){
+			for ( list = etgc->children; list; list = g_list_next (list)) {
 				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 				ETableGroup *child = child_node->child;
 				g_object_get (child,
@@ -1114,21 +1114,21 @@ etgc_init (ETableGroupContainer *container)
 void
 e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer closure)
 {
-	if (E_IS_TABLE_GROUP_CONTAINER (etg)){
+	if (E_IS_TABLE_GROUP_CONTAINER (etg)) {
 		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 		GList *list = etgc->children;
 
 		/* Protect from unrefs in the callback functions */
 		g_object_ref (etg);
 
-		for (list = etgc->children; list; list = list->next){
+		for (list = etgc->children; list; list = list->next) {
 			ETableGroupContainerChildNode *child_node = list->data;
 
 			e_table_group_apply_to_leafs (child_node->child, fn, closure);
 		}
 
 		g_object_unref (etg);
-	} else if (E_IS_TABLE_GROUP_LEAF (etg)){
+	} else if (E_IS_TABLE_GROUP_LEAF (etg)) {
 		(*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure);
 	} else {
 		g_error ("Unknown ETableGroup found: %s",
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 7d3499f8f0..ebf861657c 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -605,7 +605,7 @@ etg_event (GnomeCanvasItem *item, GdkEvent *event)
 	default:
 		return_val = FALSE;
 	}
-	if (return_val == FALSE){
+	if (return_val == FALSE) {
 		if (GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event)
 			return GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event (item, event);
 	}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 0bcbc2b694..d5a02f491a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -115,7 +115,7 @@ static void scroll_off (ETableHeaderItem *ethi);
 static void scroll_on (ETableHeaderItem *ethi, guint scroll_direction);
 
 static void
-ethi_dispose (GObject *object){
+ethi_dispose (GObject *object) {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
 
 	ethi_drop_table_header (ethi);
@@ -301,7 +301,7 @@ ethi_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	ethi = E_TABLE_HEADER_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_TABLE_HEADER:
 		ethi_drop_table_header (ethi);
 		ethi_add_table_header (ethi, E_TABLE_HEADER(g_value_get_object (value)));
@@ -325,7 +325,7 @@ ethi_set_property (GObject *object,
 		break;
 
 	case PROP_SORT_INFO:
-		if (ethi->sort_info){
+		if (ethi->sort_info) {
 			if (ethi->sort_info_changed_id)
 				g_signal_handler_disconnect (
 					ethi->sort_info,
@@ -374,7 +374,7 @@ ethi_get_property (GObject *object,
 
 	ethi = E_TABLE_HEADER_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FULL_HEADER:
 		g_value_set_object (value, ethi->full_header);
 		break;
@@ -403,7 +403,7 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, gint x)
 		return 0;
 	}
 
-	for (col = 0; col < cols; col++){
+	for (col = 0; col < cols; col++) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
 
 		if ((x >= x1) && (x <= x1 + ecol->width)) {
@@ -429,7 +429,7 @@ ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, gint x)
 	if (x < x1)
 		return 0;
 
-	for (col = 0; col < cols; col++){
+	for (col = 0; col < cols; col++) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
 
 		x1 += (ecol->width / 2);
@@ -497,7 +497,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
 	if (col > 0)
 		x += ethi->group_indent_width;
 
-	if (!arrow_up){
+	if (!arrow_up) {
 		arrow_up   = make_shaped_window_from_xpm (arrow_up_xpm);
 		arrow_down = make_shaped_window_from_xpm (arrow_down_xpm);
 	}
@@ -591,7 +591,7 @@ do_drag_motion(ETableHeaderItem *ethi,
 	d(g_print("x = %d, y = %d, ethi->width = %d, ethi->height = %d\n", x, y, ethi->width, ethi->height));
 
 	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
+	    (y >= 0) && (y <= (ethi->height))) {
 		gint col;
 		d(g_print("In header\n"));
 
@@ -604,7 +604,7 @@ do_drag_motion(ETableHeaderItem *ethi,
 			ethi_remove_drop_marker (ethi);
 			gdk_drag_status (context, context->suggested_action, time);
 		}
-		else if (col != -1){
+		else if (col != -1) {
 			if (ethi->drag_col != -1)
 				ethi_remove_destroy_marker (ethi);
 
@@ -837,7 +837,7 @@ ethi_drag_drop (GtkWidget *canvas,
 	gboolean successful = FALSE;
 
 	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
+	    (y >= 0) && (y <= (ethi->height))) {
 		gint col;
 
 		col = ethi_find_col_by_x_nearest (ethi, x);
@@ -927,7 +927,7 @@ ethi_unrealize (GnomeCanvasItem *item)
 
 	gtk_drag_dest_unset (GTK_WIDGET (item->canvas));
 
-	if (ethi->stipple){
+	if (ethi->stipple) {
 		g_object_unref (ethi->stipple);
 		ethi->stipple = NULL;
 	}
@@ -971,7 +971,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi
 	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
 	x1 = x2 = 0;
 	x2 += ethi->group_indent_width;
-	for (col = 0; col < cols; col++, x1 = x2){
+	for (col = 0; col < cols; col++, x1 = x2) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
 		gint col_width;
 
@@ -1024,7 +1024,7 @@ is_pointer_on_division (ETableHeaderItem *ethi, gint pos, gint *the_total, gint
 	gint col, total;
 
 	total = 0;
-	for (col = 0; col < cols; col++){
+	for (col = 0; col < cols; col++) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
 
 		if (col == 0)
@@ -1032,7 +1032,7 @@ is_pointer_on_division (ETableHeaderItem *ethi, gint pos, gint *the_total, gint
 
 		total += ecol->width;
 
-		if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){
+		if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)) {
 			if (return_col)
 				*return_col = col;
 			if (the_total)
@@ -1073,7 +1073,7 @@ set_cursor (ETableHeaderItem *ethi, gint pos)
 
 			/* Column is not resizable if all columns after it
 			   are also not resizable */
-			for (; c <= last_col; c++){
+			for (; c <= last_col; c++) {
 				ETableCol *ecol2;
 
 				ecol2 = e_table_header_get_column (ethi->eth, c);
@@ -1228,7 +1228,7 @@ ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth (
 			ethi->sort_info, i);
 
-		if (model_col == column.column){
+		if (model_col == column.column) {
 			column.ascending = 1;
 			e_table_sort_info_grouping_set_nth (
 				ethi->sort_info, i, column);
@@ -1243,7 +1243,7 @@ ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
 			ETableSortColumn column =
 				e_table_sort_info_sorting_get_nth(
 					ethi->sort_info, i);
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column || model_col == -1) {
 				column.ascending = 1;
 				e_table_sort_info_sorting_set_nth (
 					ethi->sort_info, i, column);
@@ -1282,7 +1282,7 @@ ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
 	for (i = 0; i < length; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth(
 			ethi->sort_info, i);
-		if (model_col == column.column){
+		if (model_col == column.column) {
 			column.ascending = 0;
 			e_table_sort_info_grouping_set_nth(
 				ethi->sort_info, i, column);
@@ -1297,7 +1297,7 @@ ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
 				e_table_sort_info_sorting_get_nth(
 					ethi->sort_info, i);
 
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column || model_col == -1) {
 				column.ascending = 0;
 				e_table_sort_info_sorting_set_nth (
 					ethi->sort_info, i, column);
@@ -1625,7 +1625,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
 	for (i = 0; i < length; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-		if (model_col == column.column || model_col == -1){
+		if (model_col == column.column || model_col == -1) {
 			gint ascending = column.ascending;
 			ascending = ! ascending;
 			column.ascending = ascending;
@@ -1641,10 +1641,10 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 		for (i = 0; i < length; i++) {
 			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
 
-			if (model_col == column.column || model_col == -1){
+			if (model_col == column.column || model_col == -1) {
 				gint ascending = column.ascending;
 
-				if (ascending == 0 && model_col != -1){
+				if (ascending == 0 && model_col != -1) {
 					/*
 					 * This means the user has clicked twice
 					 * already, lets kill sorting of this column now.
@@ -1692,7 +1692,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 	gint x, y, start, col;
 	gint was_maybe_drag = 0;
 
-	switch (e->type){
+	switch (e->type) {
 	case GDK_ENTER_NOTIFY:
 		convert (canvas, e->crossing.x, e->crossing.y, &x, &y);
 		set_cursor (ethi, x);
@@ -1706,10 +1706,10 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 	case GDK_MOTION_NOTIFY:
 
 		convert (canvas, e->motion.x, e->motion.y, &x, &y);
-		if (resizing){
+		if (resizing) {
 			gint new_width;
 
-			if (ethi->resize_guide == NULL){
+			if (ethi->resize_guide == NULL) {
 				/* Quick hack until I actually bind the views */
 				ethi->resize_guide = GINT_TO_POINTER (1);
 
@@ -1725,7 +1725,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			e_table_header_set_size (ethi->eth, ethi->resize_col, new_width);
 
 			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-		} else if (ethi_maybe_start_drag (ethi, &e->motion)){
+		} else if (ethi_maybe_start_drag (ethi, &e->motion)) {
 			ethi_start_drag (ethi, e);
 		} else
 			set_cursor (ethi, x);
@@ -1737,7 +1737,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 
 		convert (canvas, e->button.x, e->button.y, &x, &y);
 
-		if (is_pointer_on_division (ethi, x, &start, &col) && e->button.button == 1){
+		if (is_pointer_on_division (ethi, x, &start, &col) && e->button.button == 1) {
 			ETableCol *ecol;
 
 				/*
@@ -1755,7 +1755,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			ethi->resize_start_pos = start - ecol->width;
 			ethi->resize_min_width = ecol->min_width;
 		} else {
-			if (e->button.button == 1){
+			if (e->button.button == 1) {
 				ethi->click_x = e->button.x;
 				ethi->click_y = e->button.y;
 				ethi->maybe_drag = TRUE;
@@ -1763,7 +1763,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 				ethi->selected_col = col;
 				if (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)))
 					e_canvas_item_grab_focus (item, TRUE);
-			} else if (e->button.button == 3){
+			} else if (e->button.button == 3) {
 				ethi_header_context_menu (ethi, &e->button);
 			} else
 				ethi_button_pressed (ethi, &e->button);
@@ -1796,7 +1796,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 
 		ethi->maybe_drag = FALSE;
 
-		if (ethi->resize_col != -1){
+		if (ethi->resize_col != -1) {
 			needs_ungrab = (ethi->resize_guide != NULL);
 			ethi_end_resize (ethi);
 		} else if (was_maybe_drag && ethi->sort_info) {
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 37a1e3c332..1016acf5c0 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -172,7 +172,7 @@ eth_finalize (GObject *object)
 	/*
 	 * Destroy columns
 	 */
-	for (i = cols - 1; i >= 0; i--){
+	for (i = cols - 1; i >= 0; i--) {
 		eth_do_remove (eth, i, TRUE);
 	}
 	g_free (eth->columns);
@@ -348,7 +348,7 @@ eth_update_offsets (ETableHeader *eth)
 	gint i;
 	gint x = 0;
 
-	for (i = 0; i < eth->col_count; i++){
+	for (i = 0; i < eth->col_count; i++) {
 		ETableCol *etc = eth->columns [i];
 
 		etc->x = x;
@@ -505,7 +505,7 @@ e_table_header_get_index_at (ETableHeader *eth, gint x_offset)
 	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
 
 	total = 0;
-	for (i = 0; i < eth->col_count; i++){
+	for (i = 0; i < eth->col_count; i++) {
 		total += eth->columns [i]->width;
 
 		if (x_offset < total)
@@ -560,7 +560,7 @@ e_table_header_get_selected (ETableHeader *eth)
 	g_return_val_if_fail (eth != NULL, 0);
 	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
 
-	for (i = 0; i < eth->col_count; i++){
+	for (i = 0; i < eth->col_count; i++) {
 		if (eth->columns [i]->selected)
 			selected++;
 	}
@@ -728,7 +728,7 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
 	/* (1) If none of the columns to the right are expandable, use
 	 * all the expansion space in this column.
 	 */
-	if(expandable_count == 0) {
+	if (expandable_count == 0) {
 		eth->columns[idx]->expansion = expansion;
 		for (i = idx + 1; i < eth->col_count; i++) {
 			eth->columns[i]->expansion = 0;
@@ -827,7 +827,7 @@ e_table_header_col_diff (ETableHeader *eth, gint start_col, gint end_col)
 		end_col = eth->col_count;
 
 	total = 0;
-	for (col = start_col; col < end_col; col++){
+	for (col = start_col; col < end_col; col++) {
 
 		total += eth->columns [col]->width;
 	}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 729e7982c6..c8809b6087 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -250,7 +250,7 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 	gchar *color_spec = NULL;
 	gboolean allocated = FALSE;
 
-	if (selected){
+	if (selected) {
 		if (GTK_WIDGET_HAS_FOCUS(canvas))
 			background = &canvas->style->bg [GTK_STATE_SELECTED];
 		else
@@ -298,7 +298,7 @@ eti_get_cell_foreground_color (ETableItem *eti, gint row, gint col, gboolean sel
 	if (allocated)
 		*allocated = FALSE;
 
-	if (selected){
+	if (selected) {
 		if (GTK_WIDGET_HAS_FOCUS (canvas))
 			foreground = &canvas->style->fg [GTK_STATE_SELECTED];
 		else
@@ -370,7 +370,7 @@ eti_attach_cell_views (ETableItem *eti)
 	eti->n_cells = eti->cols;
 	eti->cell_views = g_new (ECellView *, eti->n_cells);
 
-	for (i = 0; i < eti->n_cells; i++){
+	for (i = 0; i < eti->n_cells; i++) {
 		ETableCol *ecol = e_table_header_get_column (eti->header, i);
 
 		eti->cell_views [i] = e_cell_new_view (ecol->ecell, eti->table_model, eti);
@@ -408,7 +408,7 @@ eti_detach_cell_views (ETableItem *eti)
 
 	eti_free_save_state (eti);
 
-	for (i = 0; i < eti->n_cells; i++){
+	for (i = 0; i < eti->n_cells; i++) {
 		e_cell_kill_view (eti->cell_views [i]);
 		eti->cell_views [i] = NULL;
 	}
@@ -589,7 +589,7 @@ eti_remove_header_model (ETableItem *eti)
 	g_signal_handler_disconnect (G_OBJECT (eti->header),
 				     eti->header_request_width_id);
 
-	if (eti->cell_views){
+	if (eti->cell_views) {
 		eti_unrealize_cell_views (eti);
 		eti_detach_cell_views (eti);
 	}
@@ -618,7 +618,7 @@ eti_row_height_real (ETableItem *eti, gint row)
 
 	max_h = 0;
 
-	for (col = 0; col < cols; col++){
+	for (col = 0; col < cols; col++) {
 		h = e_cell_height (eti->cell_views [col], view_to_model_col(eti, col), col, row);
 
 		if (h > max_h)
@@ -746,8 +746,8 @@ eti_get_height (ETableItem *eti)
 	} else {
 		gint height;
 		gint row;
-		if (eti->length_threshold != -1){
-			if (rows > eti->length_threshold){
+		if (eti->length_threshold != -1) {
+			if (rows > eti->length_threshold) {
 				gint row_height = eti_row_height(eti, 0);
 				if (eti->height_cache) {
 					height = 0;
@@ -1352,7 +1352,7 @@ eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
 	 *  BUT: then you can't remove all columns from a header and add new ones.
 	 */
 
-	if (eti->cell_views){
+	if (eti->cell_views) {
 		eti_unrealize_cell_views (eti);
 		eti_detach_cell_views (eti);
 		eti_attach_cell_views (eti);
@@ -1463,7 +1463,7 @@ eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 
 	eti = E_TABLE_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_TABLE_HEADER:
 		eti_remove_header_model (eti);
 		eti_add_header_model (eti, E_TABLE_HEADER(g_value_get_object (value)));
@@ -1547,7 +1547,7 @@ eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 
 	eti = E_TABLE_ITEM (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_WIDTH:
 		g_value_set_double (value, eti->width);
 		break;
@@ -1846,7 +1846,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	first_col = -1;
 	last_col = x_offset = 0;
 	x1 = x2 = floor (eti_base.x);
-	for (col = 0; col < cols; col++, x1 = x2){
+	for (col = 0; col < cols; col++, x1 = x2) {
 		ETableCol *ecol = e_table_header_get_column (eti->header, col);
 
 		x2 = x1 + ecol->width;
@@ -1855,7 +1855,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 			break;
 		if (x2 < x)
 			continue;
-		if (first_col == -1){
+		if (first_col == -1) {
 			x_offset = x1 - x;
 			first_col = col;
 		}
@@ -1888,7 +1888,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		first_row = -1;
 
 		y1 = y2 = floor (eti_base.y) + height_extra;
-		for (row = 0; row < rows; row++, y1 = y2){
+		for (row = 0; row < rows; row++, y1 = y2) {
 
 			y2 += ETI_ROW_HEIGHT (eti, row) + height_extra;
 
@@ -1898,7 +1898,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 			if (y2 < y)
 				continue;
 
-			if (first_row == -1){
+			if (first_row == -1) {
 				y_offset = y1 - y;
 				first_row = row;
 			}
@@ -1919,7 +1919,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	f_x1 = f_x2 = f_y1 = f_y2 = -1;
 	f_found = FALSE;
 
-	if (eti->horizontal_draw_grid && first_row == 0){
+	if (eti->horizontal_draw_grid && first_row == 0) {
 		gdk_draw_line (
 			drawable, eti->grid_gc,
 				eti_base.x - x, yd, eti_base.x + eti->width - x, yd);
@@ -1927,7 +1927,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 
 	yd += height_extra;
 
-	for (row = first_row; row < last_row; row++){
+	for (row = first_row; row < last_row; row++) {
 		gint xd;
 		gboolean selected;
 		gint cursor_col, cursor_row;
@@ -1943,7 +1943,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 			     "cursor_row", &cursor_row,
 			     NULL);
 
-		for (col = first_col; col < last_col; col++){
+		for (col = first_col; col < last_col; col++) {
 			ETableCol *ecol = e_table_header_get_column (eti->header, col);
 			ECellView *ecell_view = eti->cell_views [col];
 			gboolean col_selected = selected;
@@ -2075,10 +2075,10 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		}
 	}
 
-	if (eti->vertical_draw_grid){
+	if (eti->vertical_draw_grid) {
 		gint xd = x_offset;
 
-		for (col = first_col; col <= last_col; col++){
+		for (col = first_col; col <= last_col; col++) {
 			ETableCol *ecol = e_table_header_get_column (eti->header, col);
 
 			gdk_draw_line (
@@ -2142,7 +2142,7 @@ find_cell (ETableItem *eti, double x, double y, gint *view_col_res, gint *view_r
 	y -= eti->y1;
 
 	x1 = 0;
-	for (col = 0; col < cols - 1; col++, x1 = x2){
+	for (col = 0; col < cols - 1; col++, x1 = x2) {
 		ETableCol *ecol = e_table_header_get_column (eti->header, col);
 
 		if (x < x1)
@@ -2319,7 +2319,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 	if (!eti->header)
 		return FALSE;
 
-	switch (e->type){
+	switch (e->type) {
 	case GDK_BUTTON_PRESS: {
 		double x1, y1;
 		double realx, realy;
@@ -2502,7 +2502,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 				  "eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__,
 				  eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col)));
 
-			if (eti_editing (eti) && cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
+			if (eti_editing (eti) && cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)) {
 
 				d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n", __FUNCTION__, e->button.button, __LINE__))
 ;
@@ -2645,7 +2645,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 #endif
 
 		flags = 0;
-		if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
+		if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)) {
 			flags = E_CELL_EDITING | E_CELL_CURSOR;
 		}
 
@@ -2684,7 +2684,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 
 		eti->in_key_press = TRUE;
 
-		switch (e->key.keyval){
+		switch (e->key.keyval) {
 		case GDK_Left:
 		case GDK_KP_Left:
 			if (eti_editing (eti)) {
@@ -2765,7 +2765,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 				break;
 			}
 			if (eti->cursor_mode == E_CURSOR_SPREADSHEET) {
-				if ((e->key.state & GDK_SHIFT_MASK) != 0){
+				if ((e->key.state & GDK_SHIFT_MASK) != 0) {
 				/* shift tab */
 					if (cursor_col != view_to_model_col(eti, 0))
 						eti_cursor_move_left (eti);
@@ -2801,7 +2801,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 		case GDK_KP_Enter:
 		case GDK_ISO_Enter:
 		case GDK_3270_Enter:
-			if (eti_editing (eti)){
+			if (eti_editing (eti)) {
 				ecell_view = eti->cell_views [eti->editing_col];
 				return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
 							       view_to_model_col (eti, eti->editing_col),
@@ -2842,7 +2842,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 				break;
 
 			default:
-				if (!eti_editing (eti)){
+				if (!eti_editing (eti)) {
 					gint col, row;
 					row = model_to_view_row(eti, cursor_row);
 					col = model_to_view_col(eti, cursor_col);
@@ -2850,7 +2850,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 						e_table_item_enter_edit (eti, col, row);
 					}
 				}
-				if (!eti_editing (eti)){
+				if (!eti_editing (eti)) {
 					g_signal_emit (eti, eti_signals [KEY_PRESS], 0,
 						       model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
 					if (!return_val)
@@ -2883,7 +2883,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 		if (cursor_col == -1)
 			return FALSE;
 
-		if (eti_editing (eti)){
+		if (eti_editing (eti)) {
 			ecell_view = eti->cell_views [eti->editing_col];
 			return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
 						       view_to_model_col(eti, eti->editing_col),
@@ -3576,12 +3576,12 @@ e_table_item_print_page  (EPrintable *ep,
 	 * Draw cells
 	 */
 
-	if (eti->horizontal_draw_grid){
+	if (eti->horizontal_draw_grid) {
 		gp_draw_rect(context, 0, yd, width, 1);
 	}
 	yd++;
 
-	for (row = rows_printed; row < rows; row++){
+	for (row = rows_printed; row < rows; row++) {
 		gdouble xd = 1, row_height;
 		row_height = eti_printed_row_height(eti, widths, context, row);
 
@@ -3597,7 +3597,7 @@ e_table_item_print_page  (EPrintable *ep,
 			}
 		}
 
-		for (col = 0; col < cols; col++){
+		for (col = 0; col < cols; col++) {
 			ECellView *ecell_view = eti->cell_views [col];
 
 			cairo_save(cr);
@@ -3617,16 +3617,16 @@ e_table_item_print_page  (EPrintable *ep,
 		}
 
 	yd += row_height;
-		if (eti->horizontal_draw_grid){
+		if (eti->horizontal_draw_grid) {
 			gp_draw_rect(context, 0, yd, width, 1);
 		}
 		yd ++;
 	}
 
 	itemcontext->rows_printed = row;
-	if (eti->vertical_draw_grid){
+	if (eti->vertical_draw_grid) {
 		gdouble xd = 0;
-		for (col = 0; col < cols; col++){
+		for (col = 0; col < cols; col++) {
 			gp_draw_rect(context, xd, height, 1, yd - height);
 			xd += widths[col];
 		}
@@ -3681,7 +3681,7 @@ e_table_item_height      (EPrintable *ep,
 	 */
 	yd++;
 
-	for (row = rows_printed; row < rows; row++){
+	for (row = rows_printed; row < rows; row++) {
 		gdouble row_height;
 
 		row_height = eti_printed_row_height(item, widths, context, row);
@@ -3732,7 +3732,7 @@ e_table_item_will_fit     (EPrintable *ep,
 	 */
 	yd++;
 
-	for (row = rows_printed; row < rows; row++){
+	for (row = rows_printed; row < rows; row++) {
 		gdouble row_height;
 
 		row_height = eti_printed_row_height(item, widths, context, row);
diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index 778041d73c..3d937dd9cd 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -163,7 +163,7 @@ ets_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 {
 	ETableScrolled *ets = E_TABLE_SCROLLED (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_TABLE:
 		g_value_set_object (value, ets->table);
 		break;
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 22ec5af7d5..67a27cde01 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -246,7 +246,7 @@ etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 {
 	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_MODEL:
 		g_value_set_object (value, etsm->model);
 		break;
@@ -261,7 +261,7 @@ etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 {
 	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_MODEL:
 		drop_model(etsm);
 		add_model(etsm, g_value_get_object (value) ? E_TABLE_MODEL(g_value_get_object (value)) : NULL);
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index a65046234a..f4e35d1fd8 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -170,7 +170,7 @@ etsv_add_all   (ETableSubsetVariable *etssv)
 
 	rows = e_table_model_row_count(etss->source);
 
-	if (etss->n_map + rows > etssv->n_vals_allocated){
+	if (etss->n_map + rows > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
 		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
@@ -190,7 +190,7 @@ e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETa
 	ETableSortedVariable *etsv = g_object_new (E_TABLE_SORTED_VARIABLE_TYPE, NULL);
 	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
 
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
+	if (e_table_subset_variable_construct (etssv, source) == NULL) {
 		g_object_unref (etsv);
 		return NULL;
 	}
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 16bb3cf888..75a8e768d3 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -131,7 +131,7 @@ e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortIn
 	if (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_pre_change)
 		(E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_pre_change) (etss, source);
 
-	if (e_table_subset_construct (etss, source, 0) == NULL){
+	if (e_table_subset_construct (etss, source, 0) == NULL) {
 		g_object_unref (ets);
 		return NULL;
 	}
@@ -267,7 +267,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row,
 	shift = row == etss->n_map - count;
 
 	for (j = 0; j < count; j++) {
-		for (i = 0; i < etss->n_map; i++){
+		for (i = 0; i < etss->n_map; i++) {
 			if (etss->map_table[i] == row + j) {
 				if (shift)
 					e_table_model_pre_change (etm);
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index e7acd90f34..d837b7344e 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -369,7 +369,7 @@ e_table_specification_save_to_node (ETableSpecification *specification,
 	e_xml_set_bool_prop_by_name (node, (const guchar *)"horizontal-resize", specification->horizontal_resize);
 	e_xml_set_bool_prop_by_name (node, (const guchar *)"allow-grouping", specification->allow_grouping);
 
-	switch (specification->selection_mode){
+	switch (specification->selection_mode) {
 	case GTK_SELECTION_SINGLE:
 		s = "single";
 		break;
@@ -390,7 +390,7 @@ e_table_specification_save_to_node (ETableSpecification *specification,
 	xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *)specification->click_to_add_message);
 	xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *)specification->domain);
 
-	if (specification->columns){
+	if (specification->columns) {
 		gint i;
 
 		for (i = 0; specification->columns [i]; i++)
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index de1d7ccacf..b63ecd01ec 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -46,7 +46,7 @@ etssv_add       (ETableSubsetVariable *etssv,
 
 	e_table_model_pre_change(etm);
 
-	if (etss->n_map + 1 > etssv->n_vals_allocated){
+	if (etss->n_map + 1 > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += INCREMENT_AMOUNT;
 		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
@@ -67,7 +67,7 @@ etssv_add_array (ETableSubsetVariable *etssv,
 
 	e_table_model_pre_change(etm);
 
-	if (etss->n_map + count > etssv->n_vals_allocated){
+	if (etss->n_map + count > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count);
 		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
@@ -88,7 +88,7 @@ etssv_add_all   (ETableSubsetVariable *etssv)
 	e_table_model_pre_change(etm);
 
 	rows = e_table_model_row_count(etss->source);
-	if (etss->n_map + rows > etssv->n_vals_allocated){
+	if (etss->n_map + rows > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
 		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint));
 	}
@@ -106,7 +106,7 @@ etssv_remove    (ETableSubsetVariable *etssv,
 	ETableSubset *etss = E_TABLE_SUBSET(etssv);
 	gint i;
 
-	for (i = 0; i < etss->n_map; i++){
+	for (i = 0; i < etss->n_map; i++) {
 		if (etss->map_table[i] == row) {
 			e_table_model_pre_change (etm);
 			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint));
@@ -150,7 +150,7 @@ e_table_subset_variable_new (ETableModel *source)
 {
 	ETableSubsetVariable *etssv = g_object_new (E_TABLE_SUBSET_VARIABLE_TYPE, NULL);
 
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
+	if (e_table_subset_variable_construct (etssv, source) == NULL) {
 		g_object_unref (etssv);
 		return NULL;
 	}
@@ -252,7 +252,7 @@ e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv,
 	ETableSubset *etss = E_TABLE_SUBSET(etssv);
 	if (total <= 0)
 		total = 1;
-	if (total > etss->n_map){
+	if (total > etss->n_map) {
 		etss->map_table = g_realloc (etss->map_table, total * sizeof(gint));
 	}
 }
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index a860aba24f..6253c74327 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -61,7 +61,7 @@ etss_get_view_row (ETableSubset *etss, gint row)
 	gint initial = MAX (MIN (etss->last_access, end), start);
 
 	for (i = initial; i < end; i++) {
-		if (map_table [i] == row){
+		if (map_table [i] == row) {
 			d(g_print("a) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
@@ -69,15 +69,15 @@ etss_get_view_row (ETableSubset *etss, gint row)
 	}
 
 	for (i = initial - 1; i >= start; i--) {
-		if (map_table [i] == row){
+		if (map_table [i] == row) {
 			d(g_print("b) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
 		}
 	}
 
-	for (i = 0; i < n; i++){
-		if (map_table [i] == row){
+	for (i = 0; i < n; i++) {
+		if (map_table [i] == row) {
 			d(g_print("c) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
@@ -431,7 +431,7 @@ e_table_subset_new (ETableModel *source, const gint nvals)
 {
 	ETableSubset *etss = g_object_new (E_TABLE_SUBSET_TYPE, NULL);
 
-	if (e_table_subset_construct (etss, source, nvals) == NULL){
+	if (e_table_subset_construct (etss, source, nvals) == NULL) {
 		g_object_unref (etss);
 		return NULL;
 	}
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 86ba47434d..eacbfbbc74 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1817,7 +1817,7 @@ et_build_column_spec (ETable *e_table)
 	columns_shown = xmlNewNode (NULL, "columns-shown");
 
 	col_count = e_table_header_count (e_table->header);
-	for (i = 0; i < col_count; i++){
+	for (i = 0; i < col_count; i++) {
 		gchar *text = g_strdup_printf ("%d", e_table_header_index(e_table->header, i));
 		xmlNewChild (columns_shown, NULL, "column", text);
 		g_free (text);
@@ -2121,7 +2121,7 @@ et_get_property (GObject *object,
 {
 	ETable *etable = E_TABLE (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_MODEL:
 		g_value_set_object (value, etable->model);
 		break;
@@ -2152,7 +2152,7 @@ et_set_property (GObject *object,
 {
 	ETable *etable = E_TABLE (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_LENGTH_THRESHOLD:
 		etable->length_threshold = g_value_get_int (value);
 		if (etable->group) {
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index fc729ab411..eac80443d0 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -173,7 +173,7 @@ ets_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 {
 	ETreeScrolled *ets = E_TREE_SCROLLED (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_TREE:
 		g_value_set_object (value, ets->tree);
 		break;
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index eedb201fae..6f89816fbe 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -301,7 +301,7 @@ etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		g_value_set_int (value, get_cursor_row(etsm));
 		break;
@@ -326,7 +326,7 @@ etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		e_selection_model_do_something(esm, g_value_get_int (value), etsm->priv->cursor_col, 0);
 		break;
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index 7c7718d0cf..a919f900b4 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -154,7 +154,7 @@ e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETabl
 	ETreeSortedVariable *etsv = g_object_new (E_TREE_SORTED_VARIABLE_TYPE, NULL);
 	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE (etsv);
 
-	if (e_table_subset_variable_construct (etsv, source) == NULL){
+	if (e_table_subset_variable_construct (etsv, source) == NULL) {
 		g_object_unref (etsv);
 		return NULL;
 	}
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 0e4db07034..38c7a5111b 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1807,7 +1807,7 @@ et_get_property (GObject *object,
 {
 	ETree *etree = E_TREE (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_ETTA:
 		g_value_set_object (value, etree->priv->etta);
 		break;
@@ -1836,7 +1836,7 @@ et_set_property (GObject *object,
 {
 	ETree *etree = E_TREE (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_LENGTH_THRESHOLD:
 		etree->priv->length_threshold = g_value_get_int (value);
 		if (etree->priv->item) {
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 6d921c719d..705678bbf8 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -710,7 +710,7 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar
 	item = GNOME_CANVAS_ITEM (object);
 	reflow = E_REFLOW (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_HEIGHT:
 		reflow->height = g_value_get_double (value);
 		reflow->need_reflow_columns = TRUE;
@@ -839,7 +839,7 @@ e_reflow_realize (GnomeCanvasItem *item)
 	reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
 
 	count = reflow->count;
-	for(i = 0; i < count; i++) {
+	for (i = 0; i < count; i++) {
 		if (reflow->items[i])
 			gnome_canvas_item_set(reflow->items[i],
 					      "width", reflow->column_width,
@@ -899,7 +899,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	reflow = E_REFLOW (item);
 
-	switch( event->type )
+	switch ( event->type )
 		{
 		case GDK_KEY_PRESS:
 			return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event);
@@ -946,7 +946,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 			}
 #endif
 		case GDK_BUTTON_PRESS:
-			switch(event->button.button)
+			switch (event->button.button)
 				{
 				case 1:
 					{
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index bc8bbb75a7..b9c5e0cbe3 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1402,7 +1402,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 			     "height", &thisheight,
 			     NULL);
 
-		if (text->draw_borders){
+		if (text->draw_borders) {
 
 			gtk_paint_shadow (widget->style, drawable,
 					  GTK_STATE_NORMAL, GTK_SHADOW_IN,
@@ -1521,7 +1521,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 
 	/* Need to reset the layout to cleanly clear the preedit buffer when
 	 * typing in CJK & using backspace on the preedit */
-	if(!text->preedit_len)
+	if (!text->preedit_len)
 		reset_layout (text);
 
 	if (!pango_layout_get_text (text->layout))
@@ -2048,7 +2048,7 @@ _do_tooltip (gpointer data)
 	tooltip_height = E_TEXT(tooltip_text)->height;
 	tooltip_x = 0;
 	tooltip_y = 0;
-	switch(E_TEXT(tooltip_text)->justification) {
+	switch (E_TEXT(tooltip_text)->justification) {
 	case GTK_JUSTIFY_CENTER:
 		tooltip_x = - tooltip_width / 2;
 		break;
@@ -2060,7 +2060,7 @@ _do_tooltip (gpointer data)
 		tooltip_x = 0;
 		break;
 	}
-	switch(text->anchor) {
+	switch (text->anchor) {
 	case GTK_ANCHOR_NW:
 	case GTK_ANCHOR_N:
 	case GTK_ANCHOR_NE:
@@ -2078,7 +2078,7 @@ _do_tooltip (gpointer data)
 		tooltip_y -= tooltip_height;
 		break;
 	}
-	switch(E_TEXT(tooltip_text)->anchor) {
+	switch (E_TEXT(tooltip_text)->anchor) {
 	case GTK_ANCHOR_NW:
 	case GTK_ANCHOR_W:
 	case GTK_ANCHOR_SW:
@@ -2288,7 +2288,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 
 		if (event->key.keyval == GDK_F10
 		    && (event->key.state & GDK_SHIFT_MASK)
-		    && text->handle_popup ){
+		    && text->handle_popup ) {
 
 			/* Simulate a GdkEventButton here, so that we can call e_text_do_popup directly */
 
@@ -2665,7 +2665,7 @@ popup_menu_placement_cb (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpo
 	GnomeCanvasItem *item = &text->item;
 	GnomeCanvas *parent = item->canvas;
 
-	if (parent){
+	if (parent) {
 		gdk_window_get_origin (((GtkWidget*) parent)->window, x, y);
 		*x += item->x1 + text->width / 2;
 		*y += item->y1 + text->height / 2;
@@ -2746,7 +2746,7 @@ popup_targets_received (GtkClipboard     *clipboard,
 		     popup_menu);
 
       /* If invoked by S-F10 key binding, button will be 0. */
-      if (button->button == 0){
+      if (button->button == 0) {
 	      gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
 			      popup_menu_placement_cb, (gpointer)text,
 			      button->button, GDK_CURRENT_TIME);
@@ -2868,14 +2868,14 @@ _get_updated_position (EText *text, gboolean direction)
 	length = g_utf8_strlen (text->text, -1);
 
 	/* length checks to make sure we are not wandering off into nonexistant memory... */
-	if((text->selection_end >= length) && (TRUE == direction))	/* forward */
+	if ((text->selection_end >= length) && (TRUE == direction))	/* forward */
 		return length;
 	/* checking for -ve value wont hurt! */
-	if((text->selection_end <= 0) && (FALSE == direction))		/* backward */
+	if ((text->selection_end <= 0) && (FALSE == direction))		/* backward */
 		return 0;
 
 	/* check for validness of full text->text */
-	if(!g_utf8_validate(text->text, -1, NULL))
+	if (!g_utf8_validate(text->text, -1, NULL))
 		return text->selection_end;
 
 	/* get layout's PangoLogAttr to facilitate moving when moving across grapheme cluster as in indic langs */
@@ -2886,32 +2886,32 @@ _get_updated_position (EText *text, gboolean direction)
 	p = g_utf8_offset_to_pointer (text->text, text->selection_end);
 
 	new_pos = text->selection_end;
-	while(1)
+	while (1)
 	{
 		/* check before moving forward/backwards if we have more chars to move or not */
-		if(TRUE == direction)
+		if (TRUE == direction)
 			p = g_utf8_next_char (p);
 		else
 			p = g_utf8_prev_char (p);
 
 		/* validate the new string & return with original position if check fails */
-		if(!g_utf8_validate (p, -1, NULL))
+		if (!g_utf8_validate (p, -1, NULL))
 			break;	/* will return old value of new_pos */
 
 		new_pos = g_utf8_pointer_to_offset (text->text, p);
 
 		/* if is_cursor_position is set, cursor can appear in front of character.
 		   i.e. this is a grapheme boundary AND make some sanity checks */
-		if((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position))
+		if ((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position))
 			break;
-		else if((new_pos < 0) || (new_pos >= n_attrs))
+		else if ((new_pos < 0) || (new_pos >= n_attrs))
 		{
 			new_pos = text->selection_end;
 			break;
 		}
 	}
 
-	if(log_attrs)
+	if (log_attrs)
 		g_free(log_attrs);
 
 	return new_pos;