[evolution-data-server] More whitespace cleanup.



commit 36956ae1d2f0fec972c48d1f80c7e25fe2117d02
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 18 13:10:54 2009 -0400

    More whitespace cleanup.

 addressbook/backends/file/e-book-backend-file.c    |    6 +-
 .../backends/groupwise/e-book-backend-groupwise.c  |   40 ++++----
 addressbook/backends/ldap/e-book-backend-ldap.c    |   18 ++--
 addressbook/backends/ldap/openldap-extract.h       |   98 ++++++++++----------
 .../backends/webdav/e-book-backend-webdav.c        |    6 +-
 addressbook/libebook/e-book-query.c                |    2 +-
 addressbook/libebook/e-destination.c               |    2 +-
 addressbook/libebook/e-vcard.c                     |    8 +-
 .../libedata-book/e-book-backend-db-cache.c        |    6 +-
 addressbook/libedata-book/e-book-backend-sexp.c    |    2 +-
 addressbook/libedata-book/e-book-backend-summary.c |    4 +-
 calendar/backends/google/e-cal-backend-google.c    |    2 +-
 .../groupwise/e-cal-backend-groupwise-utils.c      |    4 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |    2 +-
 calendar/libecal/e-cal.c                           |   10 +-
 calendar/libedata-cal/e-cal-backend-sexp.c         |   20 ++--
 calendar/libedata-cal/e-data-cal-factory.c         |    2 +-
 camel/camel-arg.c                                  |    4 +-
 camel/camel-db.c                                   |    8 +-
 camel/camel-folder-summary.c                       |    4 +-
 camel/camel-lock-client.c                          |    6 +-
 camel/camel-lock-helper.c                          |    2 +-
 camel/camel-mime-filter-basic.c                    |    6 +-
 camel/camel-mime-filter-bestenc.c                  |    2 +-
 camel/camel-mime-filter-html.c                     |    2 +-
 camel/camel-object.c                               |    4 +-
 camel/camel-sasl-ntlm.c                            |    2 +-
 camel/camel-search-private.c                       |    2 +-
 camel/camel-search-sql-sexp.c                      |    4 +-
 camel/camel-smime-context.c                        |    4 +-
 camel/camel-store-summary.c                        |    2 +-
 camel/camel-tcp-stream-ssl.c                       |    2 +-
 camel/camel-text-index.c                           |    4 +-
 camel/camel-utf8.c                                 |    2 +-
 camel/db-scrap-tools/db.c                          |    8 +-
 camel/providers/groupwise/camel-groupwise-folder.c |   20 ++--
 .../groupwise/camel-groupwise-store-summary.c      |    4 +-
 camel/providers/groupwise/camel-groupwise-store.c  |   18 ++--
 camel/providers/groupwise/camel-groupwise-utils.c  |    4 +-
 camel/providers/imap/camel-imap-folder.c           |    4 +-
 camel/providers/imap/camel-imap-store-summary.c    |    4 +-
 camel/providers/imap/camel-imap-store.c            |    4 +-
 camel/providers/imap/camel-imap-summary.c          |    2 +-
 camel/providers/imapp/camel-imapp-driver.c         |    2 +-
 camel/providers/imapp/camel-imapp-engine.c         |   12 +-
 camel/providers/imapp/camel-imapp-store-summary.c  |    4 +-
 camel/providers/imapp/camel-imapp-store.c          |    2 +-
 camel/providers/imapp/camel-imapp-stream.c         |    8 +-
 camel/providers/imapp/camel-imapp-utils.c          |    2 +-
 camel/providers/nntp/camel-nntp-newsrc.c           |    2 +-
 camel/providers/nntp/camel-nntp-stream.c           |    4 +-
 camel/providers/nntp/camel-nntp-summary.c          |    4 +-
 camel/providers/nntp/camel-nntp-utils.c            |   10 +-
 camel/providers/pop3/camel-pop3-folder.c           |    2 +-
 camel/providers/pop3/camel-pop3-stream.c           |    4 +-
 camel/tests/lib/streams.c                          |    2 +-
 camel/tests/stream/test1.c                         |    8 +-
 camel/tests/stream/test2.c                         |    2 +-
 libedataserver/e-account-list.c                    |    2 +-
 libedataserver/e-data-server-util.c                |    2 +-
 libedataserver/e-msgport.c                         |    6 +-
 libedataserver/e-sexp.c                            |   14 ++--
 libedataserverui/e-contact-store.c                 |    2 +-
 libedataserverui/e-destination-store.c             |    2 +-
 libedataserverui/e-name-selector-dialog.c          |    2 +-
 libedataserverui/e-name-selector-entry.c           |    4 +-
 libedataserverui/e-name-selector-list.c            |    6 +-
 servers/exchange/storage/exchange-esource.c        |    4 +-
 .../exchange/storage/exchange-hierarchy-webdav.c   |    2 +-
 servers/exchange/xntlm/xntlm-des.c                 |    2 +-
 servers/groupwise/e-gw-container.c                 |   12 +-
 servers/groupwise/e-gw-item.c                      |   64 +++++++-------
 servers/groupwise/e-gw-proxy.c                     |   30 +++---
 servers/groupwise/e-gw-sendoptions.c               |    2 +-
 74 files changed, 292 insertions(+), 292 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 20e9054..3feac0e 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -821,7 +821,7 @@ e_book_backend_file_get_changes (EBookBackendSync *backend,
 	}
 	else {
 		/* Update the hash and build our changes list */
-		for (i = ctx.add_ids, v = ctx.add_cards; i != NULL; i = i->next, v = v->next){
+		for (i = ctx.add_ids, v = ctx.add_cards; i != NULL; i = i->next, v = v->next) {
 			gchar *id = i->data;
 			gchar *vcard = v->data;
 
@@ -832,7 +832,7 @@ e_book_backend_file_get_changes (EBookBackendSync *backend,
 			g_free (i->data);
 			g_free (v->data);
 		}
-		for (i = ctx.mod_ids, v = ctx.mod_cards; i != NULL; i = i->next, v = v->next){
+		for (i = ctx.mod_ids, v = ctx.mod_cards; i != NULL; i = i->next, v = v->next) {
 			gchar *id = i->data;
 			gchar *vcard = v->data;
 
@@ -843,7 +843,7 @@ e_book_backend_file_get_changes (EBookBackendSync *backend,
 			g_free (i->data);
 			g_free (v->data);
 		}
-		for (i = ctx.del_ids, v = ctx.del_cards; i != NULL; i = i->next, v = v->next){
+		for (i = ctx.del_ids, v = ctx.del_cards; i != NULL; i = i->next, v = v->next) {
 			gchar *id = i->data;
 			gchar *vcard = v->data;
 
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 87df614..f9dbc5f 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -317,7 +317,7 @@ set_im_changes (EGwItem *new_item, EGwItem *old_item)
 			im1 = new_ims->data;
 			temp = old_ims;
 			ims_matched = FALSE;
-			for(; temp != NULL; temp = g_list_next (temp)) {
+			for (; temp != NULL; temp = g_list_next (temp)) {
 				im2 = temp->data;
 				if (g_str_equal (im1->service, im2->service) && g_str_equal (im1->address, im2->address)) {
 					ims_matched = TRUE;
@@ -596,7 +596,7 @@ set_emails_in_gw_item (EGwItem *item, gpointer data)
 	email_list = NULL;
 	for (i =0; i < 3; i++) {
 		email = e_contact_get (contact, email_fields[i]);
-		if(email)
+		if (email)
 			email_list = g_list_append (email_list, g_strdup (email));
 	}
 	e_gw_item_set_email_list (item, email_list);
@@ -616,7 +616,7 @@ compare_string_lists ( GList *old_list, GList *new_list, GList **additions, GLis
 			string1 = new_list->data;
 			temp = old_list;
 			strings_matched = FALSE;
-			for(; temp != NULL; temp = g_list_next (temp)) {
+			for (; temp != NULL; temp = g_list_next (temp)) {
 				string2 = temp->data;
 				if ( g_str_equal (string1, string2)) {
 					strings_matched = TRUE;
@@ -684,7 +684,7 @@ set_full_name_in_gw_item (EGwItem *item, gpointer data)
 
 	name = e_contact_get (contact, E_CONTACT_FULL_NAME);
 
-	if(name) {
+	if (name) {
 		contact_name = e_contact_name_from_string (name);
 		full_name = g_new0 (FullName, 1);
 		if (contact_name && full_name) {
@@ -727,32 +727,32 @@ set_full_name_changes (EGwItem *new_item, EGwItem *old_item)
 	if (old_full_name && new_full_name) {
 		s1 = new_full_name->name_prefix;
 		s2 = old_full_name->name_prefix;
-		if(!s1 && s2)
+		if (!s1 && s2)
 			delete_full_name->name_prefix = g_strdup(s2);
 		else if (s1)
 			update_full_name->name_prefix = g_strdup(s1);
 		s1 = new_full_name->first_name;
 		s2  = old_full_name->first_name;
-		if(!s1 && s2)
+		if (!s1 && s2)
 			delete_full_name->first_name = g_strdup(s2);
 		else if (s1)
 			update_full_name->first_name = g_strdup(s1);
 		s1 = new_full_name->middle_name;
 		s2  = old_full_name->middle_name;
-		if(!s1 && s2)
+		if (!s1 && s2)
 			delete_full_name->middle_name = g_strdup(s2);
 		else if (s1)
 			update_full_name->middle_name = g_strdup(s1);
 
 		s1 = new_full_name->last_name;
 		s2 = old_full_name->last_name;
-		if(!s1 && s2)
+		if (!s1 && s2)
 			delete_full_name->last_name = g_strdup(s2);
 		else if (s1)
 			update_full_name->last_name = g_strdup(s1);
 		s1 = new_full_name->name_suffix;
 		s2  = old_full_name->name_suffix;
-		if(!s1 && s2)
+		if (!s1 && s2)
 			delete_full_name->name_suffix = g_strdup(s2);
 		else if (s1)
 			update_full_name->name_suffix = g_strdup(s1);
@@ -1109,7 +1109,7 @@ set_categories_changes (EGwItem *new_item, EGwItem *old_item)
 			temp = old_category_list;
 			categories_matched  = FALSE;
 
-			for(; temp != NULL; temp = g_list_next (temp)) {
+			for (; temp != NULL; temp = g_list_next (temp)) {
 				category2 = temp->data;
 				if ( g_str_equal (category1, category2)) {
 					categories_matched = TRUE;
@@ -1149,11 +1149,11 @@ fill_contact_from_gw_item (EContact *contact, EGwItem *item, GHashTable *categor
 	for ( i = 0; i < G_N_ELEMENTS (mappings); i++) {
 		element_type = mappings[i].element_type;
 
-		if(element_type == ELEMENT_TYPE_SIMPLE) {
+		if (element_type == ELEMENT_TYPE_SIMPLE) {
 			if (mappings[i].field_id != E_CONTACT_BOOK_URI) {
 				if (!is_organization) {
 					value = e_gw_item_get_field_value (item, mappings[i].element_name);
-					if(value != NULL)
+					if (value != NULL)
 						e_contact_set (contact, mappings[i].field_id, value);
 				}
 			}
@@ -1855,7 +1855,7 @@ e_book_backend_groupwise_build_gw_filter (EBookBackendGroupwise *ebgw, const gch
 	sexp_data->auto_completion = 0;
 	sexp_data->search_string = NULL;
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
 					     (ESExpIFunc *)symbols[i].func, sexp_data);
@@ -2635,7 +2635,7 @@ build_cache (EBookBackendGroupwise *ebgw)
 	GTimeVal tstart, tend;
 	gulong diff;
 
-	if(!ebgw)
+	if (!ebgw)
 		return NULL;
 
 	if (enable_debug) {
@@ -3050,7 +3050,7 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 				But it doesnt send me the members, so i have to explicitly request the server for the members				     of the distribution list */
 
 				if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
-					if(enable_debug)
+					if (enable_debug)
 						printf ("Contact List modified fetching the members of the contact list\n");
 
 					status = e_gw_connection_get_item (ebgw->priv->cnc, ebgw->priv->container_id, e_contact_get (contact, E_CONTACT_UID), "name email default members", &item);
@@ -3214,7 +3214,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 
 	if (enable_debug) {
 		printf ("authenticate user ............\n");
-		if(priv->book_name)
+		if (priv->book_name)
 			printf("book_name:%s\n", priv->book_name);
 	}
 
@@ -3308,7 +3308,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 			ebgw->priv->is_cache_ready = TRUE;
 			ebgw->priv->is_summary_ready = TRUE;
 
-			if (priv->is_writable){
+			if (priv->is_writable) {
 				if (enable_debug) {
 					printf("is writable\n");
 					printf("creating update_cache thread\n");
@@ -3351,7 +3351,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 			}
 			g_thread_create ((GThreadFunc) build_cache, ebgw, FALSE, NULL);
 		}
-		else if(priv->marked_for_offline) {
+		else if (priv->marked_for_offline) {
 			GThread *t;
 			if (enable_debug)
 				printf("else if marked_for_offline\n");
@@ -3471,7 +3471,7 @@ e_book_backend_groupwise_load_source (EBookBackend           *backend,
 
 	uri =  e_source_get_uri (source);
 	priv->original_uri = g_strdup (uri);
-	if(uri == NULL)
+	if (uri == NULL)
 		return  GNOME_Evolution_Addressbook_OtherError;
 
 	tokens = g_strsplit (uri, ";", 2);
@@ -3479,7 +3479,7 @@ e_book_backend_groupwise_load_source (EBookBackend           *backend,
 	if (tokens[0])
 		uri = g_strdup(tokens[0]);
 	book_name = g_strdup (tokens[1]);
-	if(book_name == NULL)
+	if (book_name == NULL)
 		return  GNOME_Evolution_Addressbook_OtherError;
 	g_strfreev (tokens);
 	parsed_uri = e_uri_new (uri);
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 1a8090f..afae3ad 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -983,7 +983,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 		}
 
 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-		if(ldap_error == LDAP_INSUFFICIENT_ACCESS)
+		if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
 			ldap_error = LDAP_SUCCESS;
 		else
 			ldap_error = query_ldap_root_dse (bl);
@@ -1201,7 +1201,7 @@ ldap_error_to_response (gint ldap_error)
 		return GNOME_Evolution_Addressbook_RepositoryOffline;
 	else if (ldap_error == LDAP_ALREADY_EXISTS)
 		return GNOME_Evolution_Addressbook_ContactIdAlreadyExists;
-	else if(ldap_error == LDAP_TYPE_OR_VALUE_EXISTS )
+	else if (ldap_error == LDAP_TYPE_OR_VALUE_EXISTS )
 		return GNOME_Evolution_Addressbook_ContactIdAlreadyExists;
 	else
 		return GNOME_Evolution_Addressbook_OtherError;
@@ -3614,14 +3614,14 @@ rfc2254_escape(gchar *str)
 static gchar *
 extend_query_value (gchar *str)
 {
-	if(str && g_utf8_strlen (str, -1) > 0){
+	if (str && g_utf8_strlen (str, -1) > 0) {
 		gchar *next;
 		gchar *last_star = NULL;
 		gboolean have_nonspace = FALSE;
 
-		for (next = str; next && *next; next = g_utf8_next_char (next) ){
-			if (*next == ' '){
-				if (have_nonspace && !last_star){
+		for (next = str; next && *next; next = g_utf8_next_char (next) ) {
+			if (*next == ' ') {
+				if (have_nonspace && !last_star) {
 					/* exchange only first space after nonspace character */
 					*next = '*';
 					last_star = next;
@@ -3632,7 +3632,7 @@ extend_query_value (gchar *str)
 			}
 		}
 
-		if (last_star){
+		if (last_star) {
 			/* we placed a star at the end of str, so make it back a space */
 			*last_star = ' ';
 		}
@@ -4006,7 +4006,7 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl, const gchar *query)
 
 	sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
 					     (ESExpIFunc *)symbols[i].func, &data);
@@ -4032,7 +4032,7 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl, const gchar *query)
 		}
 		else {
 			if (bl->priv->ldap_search_filter && *bl->priv->ldap_search_filter
-				&& g_ascii_strncasecmp(bl->priv->ldap_search_filter,"(objectClass=*)",sizeof(bl->priv->ldap_search_filter))){
+				&& g_ascii_strncasecmp(bl->priv->ldap_search_filter,"(objectClass=*)",sizeof(bl->priv->ldap_search_filter))) {
 				strings = g_new0(gchar *, 5);
 				strings[0] = g_strdup ("(&");
 				strings[1] = g_strdup_printf ("%s", bl->priv->ldap_search_filter);
diff --git a/addressbook/backends/ldap/openldap-extract.h b/addressbook/backends/ldap/openldap-extract.h
index 92a0e4c..c416b0d 100644
--- a/addressbook/backends/ldap/openldap-extract.h
+++ b/addressbook/backends/ldap/openldap-extract.h
@@ -758,8 +758,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;
 		}
 	}
@@ -772,9 +772,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;
 			}
 		}
@@ -788,13 +788,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;
 			}
 		}
@@ -808,20 +808,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;
@@ -1039,7 +1039,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;
 	}
 
@@ -1052,7 +1052,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;
 	}
@@ -1065,8 +1065,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 );
@@ -1097,7 +1097,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;
 	}
 
@@ -1120,7 +1120,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;
 		}
@@ -1157,7 +1157,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';
 	}
@@ -1182,7 +1182,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;
@@ -1201,7 +1201,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;
@@ -1216,12 +1216,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 );
@@ -1229,7 +1229,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;
@@ -1237,7 +1237,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;
@@ -1246,12 +1246,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 );
@@ -1259,13 +1259,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;
@@ -1276,17 +1276,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;
@@ -1304,17 +1304,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;
@@ -1332,16 +1332,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 );
@@ -1351,7 +1351,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;
@@ -1369,7 +1369,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 );
@@ -1379,22 +1379,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 );
@@ -1412,7 +1412,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;
 	}
 
@@ -1426,13 +1426,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/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index c87ff74..6ec6f4a 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -289,7 +289,7 @@ e_book_backend_webdav_create_contact(EBookBackend *backend,
 		return;
 	}
 	/* PUT request didn't return an etag? try downloading to get one */
-	if(e_contact_get_const(contact, E_CONTACT_REV) == NULL) {
+	if (e_contact_get_const(contact, E_CONTACT_REV) == NULL) {
 		EContact *new_contact;
 
 		g_warning("Server didn't return etag for new address resource");
@@ -418,12 +418,12 @@ e_book_backend_webdav_modify_contact(EBookBackend *backend,
 	etag = e_contact_get_const(contact, E_CONTACT_REV);
 
 	/* PUT request didn't return an etag? try downloading to get one */
-	if(etag == NULL || (etag[0] == 'W' && etag[1] == '/')) {
+	if (etag == NULL || (etag[0] == 'W' && etag[1] == '/')) {
 		EContact *new_contact;
 
 		g_warning("Server didn't return etag for modified address resource");
 		new_contact = download_contact(webdav, uid);
-		if(new_contact != NULL) {
+		if (new_contact != NULL) {
 			contact = new_contact;
 		}
 	}
diff --git a/addressbook/libebook/e-book-query.c b/addressbook/libebook/e-book-query.c
index f250e86..d86133a 100644
--- a/addressbook/libebook/e-book-query.c
+++ b/addressbook/libebook/e-book-query.c
@@ -609,7 +609,7 @@ e_book_query_from_string  (const gchar *query_string)
 
 	sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
 					     (ESExpIFunc *)symbols[i].func, &list);
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 50587dd..83b21d7 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -449,7 +449,7 @@ e_destination_set_contact (EDestination *dest, EContact *contact, gint email_num
 		}
 
 		g_signal_emit (dest, signals [CHANGED], 0);
-	} else if (dest->priv->email_num != email_num){
+	} else if (dest->priv->email_num != email_num) {
 		/* Splitting here would help the contact lists not rebuiding, so that it remembers ignored values */
 		g_object_ref (contact);
 
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index 0cb85e1..2398a2b 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -185,7 +185,7 @@ skip_to_next_line (gchar **p)
 		lp = g_utf8_next_char (lp);
 
 	/* -- skip over the endline */
-	while( *lp == '\r' || *lp == '\n' ) {
+	while ( *lp == '\r' || *lp == '\n' ) {
 		lp = g_utf8_next_char (lp);
 	}
 
@@ -227,7 +227,7 @@ read_attribute_value (EVCardAttribute *attr, gchar **p, gboolean quoted_printabl
 
 	/* read in the value */
 	str = g_string_new ("");
-	for( lp =  skip_newline( *p, quoted_printable );
+	for ( lp =  skip_newline( *p, quoted_printable );
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline( lp, quoted_printable ) ) {
 
@@ -334,7 +334,7 @@ read_attribute_params (EVCardAttribute *attr, gchar **p, gboolean *quoted_printa
 	gboolean in_quote = FALSE;
 
 	str = g_string_new ("");
-	for( lp =  skip_newline( *p, *quoted_printable );
+	for ( lp =  skip_newline( *p, *quoted_printable );
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline( lp, *quoted_printable ) ) {
 
@@ -496,7 +496,7 @@ read_attribute (gchar **p)
 
 	/* first read in the group/name */
 	str = g_string_new ("");
-	for( lp =  skip_newline( *p, is_qp );
+	for ( lp =  skip_newline( *p, is_qp );
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline( lp, is_qp ) ) {
 
diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c b/addressbook/libedata-book/e-book-backend-db-cache.c
index 3314ae0..fc1f632 100644
--- a/addressbook/libedata-book/e-book-backend-db-cache.c
+++ b/addressbook/libedata-book/e-book-backend-db-cache.c
@@ -296,7 +296,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
 	memset(&uid_dbt, 0, sizeof(uid_dbt));
 	db_error = dbc->c_get(dbc, &uid_dbt, &vcard_dbt, DB_FIRST);
 
-	while(db_error == 0) {
+	while (db_error == 0) {
 		if (vcard_dbt.data && !strncmp (vcard_dbt.data, "BEGIN:VCARD", 11)) {
 			contact = e_contact_new_from_vcard (vcard_dbt.data);
 
@@ -309,7 +309,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
 	}
 
 	db_error = dbc->c_close (dbc);
-	if(db_error != 0)
+	if (db_error != 0)
 		g_warning ("db->c_close failed with %d", db_error);
 
 	if (sexp)
@@ -412,7 +412,7 @@ e_book_backend_db_cache_is_populated (DB *db)
 	vcard_dbt.flags = DB_DBT_MALLOC;
 
 	db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
-	if (db_error != 0){
+	if (db_error != 0) {
 		return FALSE;
 	}
 	else {
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index eb13ddf..b517aa3 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -870,7 +870,7 @@ e_book_backend_sexp_new (const gchar *text)
 
 	sexp->priv->search_sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp->priv->search_sexp, 0, symbols[i].name,
 					     (ESExpIFunc *)symbols[i].func, sexp->priv->search_context);
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index df1cc14..fd6fd10 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -990,7 +990,7 @@ e_book_backend_summary_is_summary_query (EBookBackendSummary *summary, const gch
 
 	sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(check_symbols)/sizeof(check_symbols[0]);i++) {
+	for (i=0;i<sizeof(check_symbols)/sizeof(check_symbols[0]);i++) {
 		if (check_symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp, 0, check_symbols[i].name,
 					     (ESExpIFunc *)check_symbols[i].func, summary);
@@ -1215,7 +1215,7 @@ e_book_backend_summary_search (EBookBackendSummary *summary, const gchar *query)
 
 	sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
 					     (ESExpIFunc *)symbols[i].func, summary);
diff --git a/calendar/backends/google/e-cal-backend-google.c b/calendar/backends/google/e-cal-backend-google.c
index 4082147..7c02681 100644
--- a/calendar/backends/google/e-cal-backend-google.c
+++ b/calendar/backends/google/e-cal-backend-google.c
@@ -1176,7 +1176,7 @@ e_cal_backend_google_open (ECalBackendSync *backend, EDataCal *cal, gboolean onl
 		esource = e_cal_backend_get_source (E_CAL_BACKEND(cbgo));
 		display_contents = e_source_get_property (esource, "offline_sync");
 
-		if(!display_contents || !g_str_equal (display_contents, "1")) {
+		if (!display_contents || !g_str_equal (display_contents, "1")) {
 			g_mutex_unlock(priv->mutex);
 			return GNOME_Evolution_Calendar_RepositoryOffline;
 		}
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 11f6509..405129d 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -1238,7 +1238,7 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 				if (recipient->status == E_GW_ITEM_STAT_ACCEPTED) {
 					const gchar *accept_level = e_gw_item_get_accept_level (item);
 
-					if(accept_level && !strcmp (e_gw_item_get_accept_level (item),"Tentative"))
+					if (accept_level && !strcmp (e_gw_item_get_accept_level (item),"Tentative"))
 						attendee->status = ICAL_PARTSTAT_TENTATIVE;
 					else
 						attendee->status = ICAL_PARTSTAT_ACCEPTED;
@@ -1974,7 +1974,7 @@ set_categories_changes (EGwItem *new_item, EGwItem *old_item)
 			category1  = new_category_list->data;
 			temp = old_category_list;
 			categories_matched  = FALSE;
-			for(; temp != NULL; temp = g_list_next (temp)) {
+			for (; temp != NULL; temp = g_list_next (temp)) {
 				category2 = temp->data;
 				if ( g_str_equal (category1, category2)) {
 					categories_matched = TRUE;
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index f3836c7..d7f45ba 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -1476,7 +1476,7 @@ e_cal_backend_groupwise_set_mode (ECalBackend *backend, CalMode mode)
 		e_cal_backend_notify_mode (backend, GNOME_Evolution_Calendar_CalListener_MODE_SET,
 						    GNOME_Evolution_Calendar_MODE_REMOTE);
 		e_cal_backend_notify_readonly (backend, priv->read_only);
-		if(e_cal_backend_groupwise_is_loaded (backend))
+		if (e_cal_backend_groupwise_is_loaded (backend))
 			      e_cal_backend_notify_auth_required(backend);
 		break;
 
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 9a4ef12..a75f6ab 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -281,7 +281,7 @@ cal_mode_enum_get_type (void)
 static GNOME_Evolution_Calendar_CalObjType
 convert_type (ECalSourceType type)
 {
-	switch (type){
+	switch (type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
 		return GNOME_Evolution_Calendar_TYPE_EVENT;
 	case E_CAL_SOURCE_TYPE_TODO:
@@ -2762,7 +2762,7 @@ e_cal_get_attachments_for_comp (ECal *ecal, const gchar *uid, const gchar *rid,
 	e_flag_wait (our_op->done);
 
 	status = our_op->status;
-        if (status != E_CALENDAR_STATUS_OK){
+        if (status != E_CALENDAR_STATUS_OK) {
                 *list = NULL;
         } else {
 		*list = our_op->slist;
@@ -2834,7 +2834,7 @@ e_cal_get_object (ECal *ecal, const gchar *uid, const gchar *rid, icalcomponent
 	e_flag_wait (our_op->done);
 
 	status = our_op->status;
-        if (status != E_CALENDAR_STATUS_OK){
+        if (status != E_CALENDAR_STATUS_OK) {
                 *icalcomp = NULL;
         } else {
 		icalcomponent *tmp_icalcomp;
@@ -2945,7 +2945,7 @@ e_cal_get_objects_for_uid (ECal *ecal, const gchar *uid, GList **objects, GError
 	e_flag_wait (our_op->done);
 
 	status = our_op->status;
-        if (status != E_CALENDAR_STATUS_OK){
+        if (status != E_CALENDAR_STATUS_OK) {
                 *objects = NULL;
         } else {
 		icalcomponent *icalcomp;
@@ -4759,7 +4759,7 @@ e_cal_get_timezone (ECal *ecal, const gchar *tzid, icaltimezone **zone, GError *
 		e_flag_wait (our_op->done);
 
 		status = our_op->status;
-		if (status != E_CALENDAR_STATUS_OK){
+		if (status != E_CALENDAR_STATUS_OK) {
 			icalcomp = NULL;
 		} else {
 			icalcomp = icalparser_parse_string (our_op->string);
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index 3e7d475..f94248b 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -434,7 +434,7 @@ func_due_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer da
 	end = argv[1]->value.time;
 	e_cal_component_get_due (ctx->comp, &dt);
 
-	if(dt.value != NULL) {
+	if (dt.value != NULL) {
 		zone = resolve_tzid (dt.tzid, ctx);
 		result = e_sexp_result_new (esexp, ESEXP_RES_INT);
 		if (zone)
@@ -443,7 +443,7 @@ func_due_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer da
 			due_t = icaltime_as_timet(*dt.value);
 	}
 
-	if(dt.value != NULL && (due_t <= end && due_t >= start))
+	if (dt.value != NULL && (due_t <= end && due_t >= start))
 		retval = TRUE;
 	else
 		retval = FALSE;
@@ -558,11 +558,11 @@ matches_classification (ECalComponent *comp, const gchar *str)
 	if (!*str)
 		return FALSE;
 
-	if(g_str_equal (str, "Public"))
+	if (g_str_equal (str, "Public"))
 		classification1 = E_CAL_COMPONENT_CLASS_PUBLIC;
-	else if(g_str_equal (str, "Private"))
+	else if (g_str_equal (str, "Private"))
 		classification1 = E_CAL_COMPONENT_CLASS_PRIVATE;
-	else if(g_str_equal (str, "Confidential"))
+	else if (g_str_equal (str, "Confidential"))
 		classification1 = E_CAL_COMPONENT_CLASS_CONFIDENTIAL;
 	else
 		classification1 = E_CAL_COMPONENT_CLASS_UNKNOWN;
@@ -656,9 +656,9 @@ matches_status (ECalComponent *comp ,const gchar *str)
 			return TRUE;
 	else if (g_str_equal (str, "COMPLETED") && status == ICAL_STATUS_COMPLETED)
 			return TRUE;
-	else if(g_str_equal (str, "CANCELLED") && status == ICAL_STATUS_CANCELLED)
+	else if (g_str_equal (str, "CANCELLED") && status == ICAL_STATUS_CANCELLED)
 			return TRUE;
-	else if(g_str_equal (str, "IN PROGRESS")  && status == ICAL_STATUS_INPROCESS)
+	else if (g_str_equal (str, "IN PROGRESS")  && status == ICAL_STATUS_INPROCESS)
 			return TRUE;
 
 	return FALSE;
@@ -763,11 +763,11 @@ func_contains (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 		matches = matches_attendee (ctx->comp, str);
 	else if (strcmp (field, "organizer") == 0)
 		matches = matches_organizer (ctx->comp, str);
-	else if(strcmp (field, "classification") == 0)
+	else if (strcmp (field, "classification") == 0)
 		matches = matches_classification (ctx->comp, str);
-	else if(strcmp (field, "status") == 0)
+	else if (strcmp (field, "status") == 0)
 		matches = matches_status (ctx->comp, str);
-	else if(strcmp (field, "priority") == 0)
+	else if (strcmp (field, "priority") == 0)
 		matches = matches_priority (ctx->comp, str);
 	else {
 		e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index cbed786..5ca2f29 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -75,7 +75,7 @@ static guint signals[LAST_SIGNAL];
 static icalcomponent_kind
 calobjtype_to_icalkind (const GNOME_Evolution_Calendar_CalObjType type)
 {
-	switch (type){
+	switch (type) {
 	case GNOME_Evolution_Calendar_TYPE_EVENT:
 		return ICAL_VEVENT_COMPONENT;
 	case GNOME_Evolution_Calendar_TYPE_TODO:
diff --git a/camel/camel-arg.c b/camel/camel-arg.c
index 5e98d78..705a040 100644
--- a/camel/camel-arg.c
+++ b/camel/camel-arg.c
@@ -45,7 +45,7 @@ gint camel_argv_build(CamelArgV *tv)
 
 		a->tag = tag;
 
-		switch((tag & CAMEL_ARG_TYPE)) {
+		switch ((tag & CAMEL_ARG_TYPE)) {
 		case CAMEL_ARG_OBJ:
 			a->ca_object = va_arg(tv->ap, gpointer );
 			break;
@@ -94,7 +94,7 @@ gint camel_arggetv_build(CamelArgGetV *tv)
 
 		a->tag = tag;
 
-		switch((tag & CAMEL_ARG_TYPE)) {
+		switch ((tag & CAMEL_ARG_TYPE)) {
 		case CAMEL_ARG_OBJ:
 			a->ca_object = va_arg(tv->ap, gpointer *);
 			*a->ca_object = NULL;
diff --git a/camel/camel-db.c b/camel/camel-db.c
index d72e44a..696b6e9 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -429,7 +429,7 @@ camel_db_open (const gchar *path, CamelException *ex)
 	d(g_print ("\nDatabase succesfully opened  \n"));
 
 	/* Which is big / costlier ? A Stack frame or a pointer */
-	if(g_getenv("CAMEL_SQLITE_DEFAULT_CACHE_SIZE")!=NULL)
+	if (g_getenv("CAMEL_SQLITE_DEFAULT_CACHE_SIZE")!=NULL)
 		cache = g_strdup_printf ("PRAGMA cache_size=%s", g_getenv("CAMEL_SQLITE_DEFAULT_CACHE_SIZE"));
 	else
 		cache = g_strdup ("PRAGMA cache_size=100");
@@ -592,7 +592,7 @@ count_cb (gpointer data, gint argc, gchar **argv, gchar **azColName)
 {
 	gint i;
 
-	for(i=0; i<argc; i++) {
+	for (i=0; i<argc; i++) {
 		if (strstr(azColName[i], "COUNT")) {
 			*(guint32 *)data = argv [i] ? strtoul (argv [i], NULL, 10) : 0;
 		}
@@ -1073,7 +1073,7 @@ camel_db_get_vuids_from_vfolder (CamelDB *db, gchar *folder_name, gchar *filter,
 	 gchar *cond = NULL;
 	 GPtrArray *array;
 	 gchar *tmp = g_strdup_printf("%s%%", filter ? filter:"");
-	 if(filter)
+	 if (filter)
 		  cond = sqlite3_mprintf(" WHERE vuid LIKE %Q", tmp);
 	 g_free(tmp);
 	 sel_query = sqlite3_mprintf("SELECT vuid FROM %Q%s", folder_name, filter ? cond : "");
@@ -1627,7 +1627,7 @@ cdb_delete_ids (CamelDB *cdb, const gchar * folder_name, GSList *uids, const gch
 gint
 camel_db_delete_uids (CamelDB *cdb, const gchar * folder_name, GSList *uids, CamelException *ex)
 {
-	if(!uids || !uids->data)
+	if (!uids || !uids->data)
 		return 0;
 
 	return cdb_delete_ids (cdb, folder_name, uids, "", "uid", ex);
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 5672b69..778b143 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -450,7 +450,7 @@ camel_folder_summary_check_uid (CamelFolderSummary *s, const gchar *uid)
 	CAMEL_SUMMARY_LOCK(s, summary_lock);
 
 	for (i=0; i<s->uids->len; i++) {
-		if(strcmp(s->uids->pdata[i], uid) == 0) {
+		if (strcmp(s->uids->pdata[i], uid) == 0) {
 			CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 			return TRUE;
 		}
@@ -3788,7 +3788,7 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam
 	if (s->build_content)
 		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_parser(s, mp);
 
-	switch(state) {
+	switch (state) {
 	case CAMEL_MIME_PARSER_STATE_HEADER:
 		/* check content type for indexing, then read body */
 		ct = camel_mime_parser_content_type(mp);
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 8b480d8..5c9bf8a 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -116,7 +116,7 @@ static gint camel_lock_helper_init(CamelException *ex)
 	}
 
 	lock_helper_pid = fork();
-	switch(lock_helper_pid) {
+	switch (lock_helper_pid) {
 	case -1:
 		close(lock_stdin_pipe[0]);
 		close(lock_stdin_pipe[1]);
@@ -206,7 +206,7 @@ again:
 	} while (msg->seq < lock_sequence);
 
 	if (msg->seq == lock_sequence) {
-		switch(msg->id) {
+		switch (msg->id) {
 		case CAMEL_LOCK_HELPER_STATUS_OK:
 			d(printf("lock child locked ok, id is %d\n", msg->data));
 			res = msg->data;
@@ -283,7 +283,7 @@ again:
 	} while (msg->seq < lock_sequence);
 
 	if (msg->seq == lock_sequence) {
-		switch(msg->id) {
+		switch (msg->id) {
 		case CAMEL_LOCK_HELPER_STATUS_OK:
 			d(printf("lock child unlocked ok\n"));
 			res = 0;
diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
index 0807bff..a250bb2 100644
--- a/camel/camel-lock-helper.c
+++ b/camel/camel-lock-helper.c
@@ -350,7 +350,7 @@ gint main(gint argc, gchar **argv)
 
 		res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
 		if (len == sizeof(msg) && msg.magic == CAMEL_LOCK_HELPER_MAGIC) {
-			switch(msg.id) {
+			switch (msg.id) {
 			case CAMEL_LOCK_HELPER_LOCK:
 				res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
 				if (msg.data > 0xffff) {
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
index 502e2ad..97bd9e9 100644
--- a/camel/camel-mime-filter-basic.c
+++ b/camel/camel-mime-filter-basic.c
@@ -80,7 +80,7 @@ reset(CamelMimeFilter *mf)
 {
 	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
 
-	switch(f->type) {
+	switch (f->type) {
 	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
 		f->state = -1;
 		break;
@@ -96,7 +96,7 @@ complete(CamelMimeFilter *mf, const gchar *in, gsize len, gsize prespace, gchar
 	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
 	gsize newlen = 0;
 
-	switch(f->type) {
+	switch (f->type) {
 	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
 		/* wont go to more than 2x size (overly conservative) */
 		camel_mime_filter_set_size(mf, len*2+6, FALSE);
@@ -161,7 +161,7 @@ filter(CamelMimeFilter *mf, const gchar *in, gsize len, gsize prespace, gchar **
 	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
 	gsize newlen;
 
-	switch(f->type) {
+	switch (f->type) {
 	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
 		/* wont go to more than 2x size (overly conservative) */
 		camel_mime_filter_set_size(mf, len*2+6, FALSE);
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
index 8db22ab..08930d5 100644
--- a/camel/camel-mime-filter-bestenc.c
+++ b/camel/camel-mime-filter-bestenc.c
@@ -256,7 +256,7 @@ camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *filter, Came
 		return CAMEL_TRANSFER_ENCODING_7BIT;
 
 	/* otherwise, we see if we can use 8 bit, or not */
-	switch(required) {
+	switch (required) {
 	case CAMEL_BESTENC_7BIT:
 		return bestenc;
 	case CAMEL_BESTENC_8BIT:
diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c
index 0d65710..6832dbc 100644
--- a/camel/camel-mime-filter-html.c
+++ b/camel/camel-mime-filter-html.c
@@ -126,7 +126,7 @@ run(CamelMimeFilter *mf, const gchar *in, gsize inlen, gsize prespace, gchar **o
 
 		state = camel_html_parser_step(f->priv->ctxt, &data, &len);
 
-		switch(state) {
+		switch (state) {
 		case CAMEL_HTML_PARSER_DATA:
 		case CAMEL_HTML_PARSER_ENT:
 			memcpy(outp, data, len);
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 829c634..548c63e 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -294,7 +294,7 @@ cobject_setv(CamelObject *o, CamelException *ex, CamelArgV *args)
 static void
 cobject_free(CamelObject *o, guint32 tag, gpointer value)
 {
-	switch(tag & CAMEL_ARG_TAG) {
+	switch (tag & CAMEL_ARG_TAG) {
 	case CAMEL_OBJECT_ARG_METADATA:
 		co_metadata_free(o, value);
 		break;
@@ -452,7 +452,7 @@ cobject_state_read(CamelObject *obj, FILE *fp)
 			/* so far,only do strings and ints, doubles could be added,
 			   object's would require a serialisation interface */
 
-			switch(argv->argv[argv->argc].tag & CAMEL_ARG_TYPE) {
+			switch (argv->argv[argv->argc].tag & CAMEL_ARG_TYPE) {
 			case CAMEL_ARG_INT:
 			case CAMEL_ARG_BOO:
 				if (camel_file_util_decode_uint32(fp, (guint32 *) &argv->argv[argv->argc].ca_int) == -1)
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index e992b06..88a8b9d 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -721,7 +721,7 @@ deskey (DES_KS k, guchar *key, gint decrypt)
 			/* rotate left and right halves independently */
 		for (j=0; j<48; j++){	/* select bits individually */
 			/* check bit that goes to ks[j] */
-			if (pcr[pc2[j]-1]){
+			if (pcr[pc2[j]-1]) {
 				/* mask it in if it's there */
 				l= j % 6;
 				ks[j/6] |= bytebit[l] >> 2;
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index d007d36..37719fb 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -432,7 +432,7 @@ camel_search_header_match (const gchar *value, const gchar *match, camel_search_
 	while ((c = camel_utf8_getc(&ptr)) && g_unichar_isspace(c))
 		value = (const gchar *)ptr;
 
-	switch(type) {
+	switch (type) {
 	case CAMEL_SEARCH_TYPE_ENCODED:
 		v = camel_header_decode_string(value, default_charset); /* FIXME: Find header charset */
 		truth = header_match(v, match, how);
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 15e2339..3490085 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -125,7 +125,7 @@ func_or(ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 	for (i = 0; i < argc; i ++) {
 		r1 = e_sexp_term_eval(f, argv[i]);
 
-		if (r1->type != ESEXP_RES_STRING){
+		if (r1->type != ESEXP_RES_STRING) {
 			e_sexp_result_free (f, r1);
 			continue;
 		}
@@ -598,7 +598,7 @@ camel_sexp_to_sql_sexp (const gchar *sql)
 
 	sexp = e_sexp_new();
 
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].immediate)
 			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
 					     (ESExpIFunc *) symbols[i].func, NULL);
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 4e55dfd..9b23279 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -194,7 +194,7 @@ camel_smime_context_describe_part(CamelSMIMEContext *context, CamelMimePart *par
 static const gchar *
 sm_hash_to_id(CamelCipherContext *context, CamelCipherHash hash)
 {
-	switch(hash) {
+	switch (hash) {
 	case CAMEL_CIPHER_HASH_MD5:
 		return "md5";
 	case CAMEL_CIPHER_HASH_SHA1:
@@ -691,7 +691,7 @@ sm_status_description(NSSCMSVerificationStatus status)
 	/* could use this but then we can't control i18n? */
 	/*NSS_CMSUtil_VerificationStatusToString(status));*/
 
-	switch(status) {
+	switch (status) {
 	case NSSCMSVS_Unverified:
 	default:
 		return _("Unverified");
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 4ad4ccd..4515af0 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -961,7 +961,7 @@ store_info_set_string (CamelStoreSummary *s, CamelStoreInfo *info, gint type, co
 
 	g_assert (info != NULL);
 
-	switch(type) {
+	switch (type) {
 	case CAMEL_STORE_INFO_PATH:
 		CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
 		g_hash_table_remove(s->folders_path, (gchar *)camel_store_info_path(s, info));
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index de3e3cb..339812f 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -917,7 +917,7 @@ ssl_bad_cert (gpointer data, PRFileDesc *sockfd)
 
 		printf("looping, error '%d'\n", error);
 
-		switch(error) {
+		switch (error) {
 		case SEC_ERROR_UNKNOWN_ISSUER:
 		case SEC_ERROR_CA_CERT_INVALID:
 		case SEC_ERROR_UNTRUSTED_ISSUER:
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 496780c..f696fd7 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -183,7 +183,7 @@ text_index_add_name_to_word(CamelIndex *idx, const gchar *word, camel_key_t name
 		if (wordid == 0) {
 			data = 0;
 			wordid = camel_key_table_add(p->word_index, word, 0, 0);
-			if (wordid == 0){
+			if (wordid == 0) {
 				g_warning ("Could not create key entry for word '%s': %s\n",
 					   word, g_strerror (errno));
 				return;
@@ -1122,7 +1122,7 @@ dump_raw(GHashTable *map, gchar *path)
 		id = total;
 
 		type = g_hash_table_lookup(map, id);
-		switch(type) {
+		switch (type) {
 		case 0:
 			printf(" - unknown -\n");
 			break;
diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c
index ba44512..44c5426 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -226,7 +226,7 @@ camel_utf7_utf8(const gchar *ptr)
 	out = g_string_new("");
 	do {
 		c = *p++;
-		switch(state) {
+		switch (state) {
 		case 0:
 			if (c == '&')
 				state = 1;
diff --git a/camel/db-scrap-tools/db.c b/camel/db-scrap-tools/db.c
index e571168..bf97c05 100644
--- a/camel/db-scrap-tools/db.c
+++ b/camel/db-scrap-tools/db.c
@@ -9,7 +9,7 @@ static gint
 callback (gpointer data, gint argc, gchar **argv, gchar **azColName)
 {
 	gint i;
-	for(i=0; i<argc; i++) {
+	for (i=0; i<argc; i++) {
 		printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
 	}
 	printf("--DONE \n");
@@ -25,7 +25,7 @@ select_stmt (const gchar * stmt) {
 
 	ret = sqlite3_exec(db, stmt, callback, &nrecs, &errmsg);
 
-	if(ret!=SQLITE_OK) {
+	if (ret!=SQLITE_OK) {
 		printf("Error in select statement %s [%s].\n", stmt, errmsg);
 	} else {
 		printf("\n   %d records returned.\n", nrecs);
@@ -41,7 +41,7 @@ sql_stmt(const gchar * stmt) {
 
 	ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
 
-	if(ret != SQLITE_OK) {
+	if (ret != SQLITE_OK) {
 		printf("Error in statement: %s [%s].\n", stmt, errmsg);
 		exit (1);
 	}
@@ -82,7 +82,7 @@ gint main(gint argc, gchar **argv) {
 //	rc = sqlite3_open_v2("test.db", &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE , NULL);
 	rc = sqlite3_open("test.db", &db);
 
-	if( rc ) {
+	if ( rc ) {
 		fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
 		sqlite3_close(db);
 		exit(1);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 6667956..6491c92 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -237,7 +237,7 @@ groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item)
 	gchar *temp_str = NULL;
 
 	temp_str = (gchar *)e_gw_item_get_subject(item);
-	if(temp_str)
+	if (temp_str)
 		camel_mime_message_set_subject (msg, temp_str);
 	type = e_gw_item_get_item_type (item);
 
@@ -251,7 +251,7 @@ groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item)
 	}
 
 	dtstring = e_gw_item_get_delivered_date (item);
-	if(dtstring) {
+	if (dtstring) {
 		gint offset = 0;
 		time_t actual_time = e_gw_connection_get_date_from_string (dtstring);
 		camel_mime_message_set_date (msg, actual_time, offset);
@@ -280,7 +280,7 @@ groupwise_populate_msg_body_from_item (EGwConnection *cnc, CamelMultipart *multi
 
 	if (!body) {
 		temp_body = e_gw_item_get_message (item);
-		if(!temp_body){
+		if (!temp_body) {
 			gint len = 0;
 			EGwConnectionStatus status;
 			status = e_gw_connection_get_attachment (cnc,
@@ -403,21 +403,21 @@ groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
 		}
 	}
 
-	if(to_list) {
+	if (to_list) {
 		subs_email=camel_header_address_list_encode(to_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "To", subs_email);
 		g_free(subs_email);
 		camel_header_address_list_clear(&to_list);
 	}
 
-	if(cc_list) {
+	if (cc_list) {
 		subs_email=camel_header_address_list_encode(cc_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "Cc", subs_email);
 		g_free(subs_email);
 		camel_header_address_list_clear(&cc_list);
 	}
 
-	if(bcc_list) {
+	if (bcc_list) {
 		subs_email=camel_header_address_list_encode(bcc_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "Bcc", subs_email);
 		g_free(subs_email);
@@ -591,7 +591,7 @@ update_junk_list (CamelStore *store, CamelMessageInfo *info, gint flag)
 		if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 			status = e_gw_connection_get_junk_entries (cnc, &list);
 
-		if (status == E_GW_CONNECTION_STATUS_OK){
+		if (status == E_GW_CONNECTION_STATUS_OK) {
 			while (list) {
 				entry = list->data;
 				if (!g_ascii_strcasecmp (entry->match, email[index])) {
@@ -736,7 +736,7 @@ groupwise_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 		gw_info = (CamelGroupwiseMessageInfo *) info;
 
 		/**Junk Mail handling**/
-		if(!info)
+		if (!info)
 			continue;
 		flags = camel_message_info_flags (info);
 
@@ -1186,7 +1186,7 @@ get_merge_lists_new_count (CamelGroupwiseSummary *summary, GSList *new, GSList *
 	GSList *l, *element;
 	gint count = 0;
 
-	if (new == NULL && modified == NULL){
+	if (new == NULL && modified == NULL) {
 		*merged = NULL;
 		return 0;
 	} if (new == NULL) {
@@ -2310,7 +2310,7 @@ groupwise_append_message (CamelFolder *folder, CamelMimeMessage *message,
 
 	if (!strcmp (folder->name, RECEIVED))
 		is_ok = TRUE;
-	if(!strcmp (folder->name, SENT))
+	if (!strcmp (folder->name, SENT))
 		is_ok = TRUE;
 
 	if (!is_ok) {
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index aa37475..8b833bf 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -259,7 +259,7 @@ camel_groupwise_store_summary_path_to_full(CamelGroupwiseStoreSummary *s, const
 		p = path;
 
 	while ( (c = camel_utf8_getc((const guchar **)&p)) ) {
-		switch(state) {
+		switch (state) {
 			case 0:
 				if (c == '%')
 					state = 1;
@@ -557,7 +557,7 @@ store_info_set_string(CamelStoreSummary *s, CamelStoreInfo *mi, gint type, const
 
 	g_assert(mi != NULL);
 
-	switch(type) {
+	switch (type) {
 		case CAMEL_STORE_INFO_LAST:
 			d(printf("Set full name %s -> %s\n", isi->full_name, str));
 			CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index e5854dd..90aa3ee 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -135,7 +135,7 @@ groupwise_store_construct (CamelService *service, CamelSession *session,
 	property_value =  camel_url_get_param (url, "soap_port");
 	if (property_value == NULL)
 		priv->port = g_strdup ("7191");
-	else if(strlen(property_value) == 0)
+	else if (strlen(property_value) == 0)
 		priv->port = g_strdup ("7191");
 	else
 		priv->port = g_strdup (property_value);
@@ -377,7 +377,7 @@ groupwise_disconnect_cleanup (CamelService *service, gboolean clean, CamelExcept
 		if (priv->storage_path)
 			g_free(priv->storage_path);
 
-		if(groupwise_store->root_container)
+		if (groupwise_store->root_container)
 			g_free (groupwise_store->root_container);
 
 		if (priv->id_hash)
@@ -469,7 +469,7 @@ groupwise_build_folder_info(CamelGroupwiseStore *gw_store, const gchar *parent_n
 	camel_url_free(url);
 
 	name = strrchr(fi->full_name,'/');
-	if(name == NULL)
+	if (name == NULL)
 		name = fi->full_name;
 	else
 		name++;
@@ -611,7 +611,7 @@ groupwise_get_folder (CamelStore *store, const gchar *folder_name, guint32 flags
 	summary = (CamelGroupwiseSummary *) folder->summary;
 
 	summary_count = camel_folder_summary_count (folder->summary);
-	if(!summary_count || !summary->time_string) {
+	if (!summary_count || !summary->time_string) {
 		d(g_print ("\n\n** %s **: No summary as yet : using get cursor request\n\n", folder->name);)
 
 		status = e_gw_connection_create_cursor (priv->cnc, container_id,
@@ -742,7 +742,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store, CamelFolder *folder, guin
 	camel_folder_summary_save_to_db (folder->summary, ex);
 
 	summary_count = camel_folder_summary_count (folder->summary);
-	if(!summary_count || !summary->time_string) {
+	if (!summary_count || !summary->time_string) {
 			d(g_print ("\n\n** %s **: Summary missing???? Reloading summary....\n\n", folder->name);)
 
 					status = e_gw_connection_create_cursor (priv->cnc, container_id,
@@ -944,7 +944,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store, CamelException *ex)
 	gint count, i;
 
 	if (!priv->cnc && ((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL) {
-		if (((CamelService *)store)->status == CAMEL_SERVICE_DISCONNECTED){
+		if (((CamelService *)store)->status == CAMEL_SERVICE_DISCONNECTED) {
 			((CamelService *)store)->status = CAMEL_SERVICE_CONNECTING;
 			groupwise_connect ((CamelService *)store, ex);
 		}
@@ -1267,7 +1267,7 @@ groupwise_create_folder(CamelStore *store,
 		return NULL;
 	}
 
-	if(parent_name == NULL) {
+	if (parent_name == NULL) {
 		parent_name = "";
 		if (groupwise_is_system_folder (folder_name)) {
 			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, NULL);
@@ -1410,7 +1410,7 @@ groupwise_rename_folder(CamelStore *store,
 gchar *
 groupwise_get_name(CamelService *service, gboolean brief)
 {
-	if(brief)
+	if (brief)
 		return g_strdup_printf(_("GroupWise server %s"), service->url->host);
 	else
 		return g_strdup_printf(_("GroupWise service for %s on %s"),
@@ -1592,7 +1592,7 @@ camel_groupwise_store_finalize (CamelObject *object)
 		if (priv->storage_path)
 			g_free(priv->storage_path);
 
-		if(groupwise_store->root_container)
+		if (groupwise_store->root_container)
 			g_free (groupwise_store->root_container);
 
 		if (priv->id_hash)
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index 0cda07d..2dc6acd 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -270,7 +270,7 @@ add_recipients(GSList *recipient_list, CamelAddress *recipients, gint recipient_
 	total_add = camel_address_length (recipients);
 	for (i=0; i<total_add; i++) {
 		const gchar *name = NULL, *addr = NULL;
-		if(camel_internet_address_get ((CamelInternetAddress *)recipients, i , &name, &addr )) {
+		if (camel_internet_address_get ((CamelInternetAddress *)recipients, i , &name, &addr )) {
 
 			recipient = g_new0 (EGwItemRecipient, 1);
 
@@ -410,7 +410,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 
 	/** Get the mime parts from CamelMimemessge **/
 	mp = (CamelMultipart *)camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	if(!mp) {
+	if (!mp) {
 		g_warning ("ERROR: Could not get content object");
 		camel_operation_end (NULL);
 		return NULL;
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6cc8cca..f34d313 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -770,7 +770,7 @@ imap_refresh_info (CamelFolder *folder, CamelException *ex)
 
 		camel_object_get(folder, NULL, CAMEL_FOLDER_TOTAL, &total, CAMEL_FOLDER_UNREAD, &unread, NULL);
 		if (si->total != total
-		    || si->unread != unread){
+		    || si->unread != unread) {
 			si->total = total;
 			si->unread = unread;
 			camel_store_summary_touch((CamelStoreSummary *)((CamelImapStore *)folder->parent_store)->summary);
@@ -3634,7 +3634,7 @@ imap_update_summary (CamelFolder *folder, gint exists,
 			break;
 		}
 
-		/* FIXME: If it enters if(info) it will always match the exception. So stupid */
+		/* FIXME: If it enters if (info) it will always match the exception. So stupid */
 		/* FIXME[disk-summary] Use a db query to see if the DB exists */
 /*		info = (CamelImapMessageInfo *)camel_folder_summary_uid(folder->summary, uid); */
 /*		if (info) { */
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index f8618f1..cdd3bf0 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -245,7 +245,7 @@ camel_imap_store_summary_path_to_full(CamelImapStoreSummary *s, const gchar *pat
 		p = path;
 
 	while ((c = camel_utf8_getc((const guchar **)&p))) {
-		switch(state) {
+		switch (state) {
 		case 0:
 			if (c == '%')
 				state = 1;
@@ -609,7 +609,7 @@ store_info_set_string(CamelStoreSummary *s, CamelStoreInfo *mi, gint type, const
 
 	g_assert(mi != NULL);
 
-	switch(type) {
+	switch (type) {
 	case CAMEL_IMAP_STORE_INFO_FULL_NAME:
 		d(printf("Set full name %s -> %s\n", isi->full_name, str));
 		CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index f186e91..7d846de 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -807,7 +807,7 @@ connect_to_server_process (CamelService *service, const gchar *cmd, CamelExcepti
 
 	full_cmd = g_strdup("");
 
-	for(;;) {
+	for (;;) {
 		gchar *pc;
 		gchar *tmp;
 		gchar *var;
@@ -826,7 +826,7 @@ connect_to_server_process (CamelService *service, const gchar *cmd, CamelExcepti
 
 		var = NULL;
 
-		switch(pc[1]) {
+		switch (pc[1]) {
 		case 'h':
 			var = service->url->host;
 			break;
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index fc100b0..3a30530 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -396,7 +396,7 @@ content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 	if (part) {
 		if (*part == ' ')
 			part++;
-		if (part){
+		if (part) {
 			EXTRACT_FIRST_DIGIT (type);
 		}
 	}
diff --git a/camel/providers/imapp/camel-imapp-driver.c b/camel/providers/imapp/camel-imapp-driver.c
index 792a4a0..18ff4b8 100644
--- a/camel/providers/imapp/camel-imapp-driver.c
+++ b/camel/providers/imapp/camel-imapp-driver.c
@@ -600,7 +600,7 @@ static void
 driver_status(CamelIMAPPEngine *ie, struct _status_info *sinfo, CamelIMAPPDriver *sdata)
 {
 	printf("got status response ...\n");
-	switch(sinfo->condition) {
+	switch (sinfo->condition) {
 	case IMAP_READ_WRITE:
 		printf("folder is read-write\n");
 		break;
diff --git a/camel/providers/imapp/camel-imapp-engine.c b/camel/providers/imapp/camel-imapp-engine.c
index 0087245..5382de2 100644
--- a/camel/providers/imapp/camel-imapp-engine.c
+++ b/camel/providers/imapp/camel-imapp-engine.c
@@ -123,7 +123,7 @@ static gint resp_capability(CamelIMAPPEngine *ie, guint32 id, gpointer data)
 	printf("got capability response:\n");
 	while (1) {
 		tok = camel_imapp_stream_token(ie->stream, &token, &len);
-		switch(tok) {
+		switch (tok) {
 		case IMAP_TOK_TOKEN:
 			p = token;
 			while ((c = *p))
@@ -391,7 +391,7 @@ iterate_untagged(CamelIMAPPEngine *imap)
 		camel_object_trigger_event(imap, "status", sinfo);
 		imap_free_status(sinfo);
 #if 0
-		switch(sinfo->condition) {
+		switch (sinfo->condition) {
 		case IMAP_READ_WRITE:
 			printf("folder is read-write\n");
 			break;
@@ -456,7 +456,7 @@ iterate_continuation(CamelIMAPPEngine *imap)
 
 	printf("got continuation response for data\n");
 	cp = ic->current;
-	switch(cp->type & CAMEL_IMAPP_COMMAND_MASK) {
+	switch (cp->type & CAMEL_IMAPP_COMMAND_MASK) {
 	case CAMEL_IMAPP_COMMAND_DATAWRAPPER:
 		printf("writing data wrapper to literal\n");
 		camel_data_wrapper_write_to_stream((CamelDataWrapper *)cp->ob, (CamelStream *)imap->stream);
@@ -784,7 +784,7 @@ imap_engine_command_add_part(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, came
 	CamelStreamNull *null;
 	guint ob_size = 0;
 
-	switch(type & CAMEL_IMAPP_COMMAND_MASK) {
+	switch (type & CAMEL_IMAPP_COMMAND_MASK) {
 	case CAMEL_IMAPP_COMMAND_DATAWRAPPER:
 	case CAMEL_IMAPP_COMMAND_STREAM:
 		null = (CamelStreamNull *)camel_stream_null_new();
@@ -881,7 +881,7 @@ imap_engine_command_addv(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, const gc
 	p = fmt;
 	ps = fmt;
 	while ( ( c = *p++ ) ) {
-		switch(c) {
+		switch (c) {
 		case '%':
 			if (*p == '%') {
 				camel_stream_write((CamelStream *)ic->mem, ps, p-ps);
@@ -918,7 +918,7 @@ imap_engine_command_addv(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, const gc
 					c = *p++;
 				}
 
-				switch(c) {
+				switch (c) {
 				case 'A': /* auth object - sasl auth, treat as special kind of continuation */
 					A = va_arg(ap, CamelSasl *);
 					imap_engine_command_add_part(imap, ic, CAMEL_IMAPP_COMMAND_AUTH, (CamelObject *)A);
diff --git a/camel/providers/imapp/camel-imapp-store-summary.c b/camel/providers/imapp/camel-imapp-store-summary.c
index 6deab29..f5f4b85 100644
--- a/camel/providers/imapp/camel-imapp-store-summary.c
+++ b/camel/providers/imapp/camel-imapp-store-summary.c
@@ -242,7 +242,7 @@ camel_imapp_store_summary_path_to_full(CamelIMAPPStoreSummary *s, const gchar *p
 		p = path;
 
 	while ( (c = camel_utf8_getc((const guchar **)&p)) ) {
-		switch(state) {
+		switch (state) {
 		case 0:
 			if (c == '%')
 				state = 1;
@@ -597,7 +597,7 @@ store_info_set_string(CamelStoreSummary *s, CamelStoreInfo *mi, gint type, const
 
 	g_assert(mi != NULL);
 
-	switch(type) {
+	switch (type) {
 	case CAMEL_IMAPP_STORE_INFO_FULL_NAME:
 		d(printf("Set full name %s -> %s\n", isi->full_name, str));
 		CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c
index fd51551..665ac27 100644
--- a/camel/providers/imapp/camel-imapp-store.c
+++ b/camel/providers/imapp/camel-imapp-store.c
@@ -607,7 +607,7 @@ folders_build_rec(CamelURL *base, GPtrArray *folders, gint *ip, CamelFolderInfo
 	if (pfi)
 		plen = strlen(pname);
 
-	for(;(*ip)<(gint)folders->len;) {
+	for (;(*ip)<(gint)folders->len;) {
 		CamelFolderInfo *fi;
 		struct _list_info *li;
 
diff --git a/camel/providers/imapp/camel-imapp-stream.c b/camel/providers/imapp/camel-imapp-stream.c
index ac89aa4..ae0bbaa 100644
--- a/camel/providers/imapp/camel-imapp-stream.c
+++ b/camel/providers/imapp/camel-imapp-stream.c
@@ -314,7 +314,7 @@ camel_imapp_stream_atom(CamelIMAPPStream *is, guchar **data, guint *lenp)
 	guchar *p, c;
 
 	/* this is only 'approximate' atom */
-	switch(camel_imapp_stream_token(is, data, lenp)) {
+	switch (camel_imapp_stream_token(is, data, lenp)) {
 	case IMAP_TOK_TOKEN:
 		p = *data;
 		while ((c = *p))
@@ -337,7 +337,7 @@ camel_imapp_stream_astring(CamelIMAPPStream *is, guchar **data)
 	guchar *p, *start;
 	guint len, inlen;
 
-	switch(camel_imapp_stream_token(is, data, &len)) {
+	switch (camel_imapp_stream_token(is, data, &len)) {
 	case IMAP_TOK_TOKEN:
 	case IMAP_TOK_INT:
 	case IMAP_TOK_STRING:
@@ -377,7 +377,7 @@ camel_imapp_stream_nstring(CamelIMAPPStream *is, guchar **data)
 	guchar *p, *start;
 	guint len, inlen;
 
-	switch(camel_imapp_stream_token(is, data, &len)) {
+	switch (camel_imapp_stream_token(is, data, &len)) {
 	case IMAP_TOK_STRING:
 		return 0;
 	case IMAP_TOK_LITERAL:
@@ -426,7 +426,7 @@ camel_imapp_stream_nstring_stream(CamelIMAPPStream *is, CamelStream **stream)
 	*stream = NULL;
 
 	CAMEL_TRY {
-		switch(camel_imapp_stream_token(is, &token, &len)) {
+		switch (camel_imapp_stream_token(is, &token, &len)) {
 		case IMAP_TOK_STRING:
 			mem = camel_stream_mem_new_with_buffer(token, len);
 			*stream = mem;
diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c
index dca49c1..c57b469 100644
--- a/camel/providers/imapp/camel-imapp-utils.c
+++ b/camel/providers/imapp/camel-imapp-utils.c
@@ -988,7 +988,7 @@ imap_parse_fetch(CamelIMAPPStream *is)
 			while ((c=*p))
 				*p++ = toupper(c);
 
-			switch(imap_tokenise(token, len)) {
+			switch (imap_tokenise(token, len)) {
 			case IMAP_ENVELOPE:
 				finfo->minfo = imap_parse_envelope(is);
 				finfo->got |= FETCH_MINFO;
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index a4ffd73..05281a8 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -550,7 +550,7 @@ camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, gchar *line)
 			p = comma + 1;
 		}
 
-	} while(comma);
+	} while (comma);
 }
 
 static gchar *
diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c
index f6d2d22..fa2533e 100644
--- a/camel/providers/nntp/camel-nntp-stream.c
+++ b/camel/providers/nntp/camel-nntp-stream.c
@@ -93,7 +93,7 @@ stream_read(CamelStream *stream, gchar *buffer, gsize n)
 	p = is->ptr;
 	e = is->end;
 
-	switch(state) {
+	switch (state) {
 	state_0:
 	case 0:		/* start of line, always read at least 3 chars */
 		while (e - p < 3) {
@@ -411,7 +411,7 @@ gint camel_nntp_stream_getd(CamelNNTPStream *is, guchar **start, guint *len)
 	s = p;
 
 	do {
-		switch(state) {
+		switch (state) {
 		case 0:
 			/* check leading '.', ... */
 			if (p[0] == '.') {
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 4ec87af..0da4729 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -304,7 +304,7 @@ add_range_xover(CamelNNTPSummary *cns, CamelNNTPStore *store, guint high, guint
 				line += xover->skip;
 				if (line < tab) {
 					camel_header_raw_append(&headers, xover->name, line, -1);
-					switch(xover->type) {
+					switch (xover->type) {
 					case XOVER_STRING:
 						break;
 					case XOVER_MSGID:
@@ -390,7 +390,7 @@ add_range_head(CamelNNTPSummary *cns, CamelNNTPStore *store, guint high, guint l
 			g_warning("retrieved message '%u' when i expected '%u'?\n", n, i);
 
 		/* FIXME: use camel-mime-utils.c function for parsing msgid? */
-		if ((msgid = strchr(line, '<')) && (line = strchr(msgid+1, '>'))){
+		if ((msgid = strchr(line, '<')) && (line = strchr(msgid+1, '>'))) {
 			line[1] = 0;
 			cns->priv->uid = g_strdup_printf("%u,%s\n", n, msgid);
 			if (!GPOINTER_TO_INT(g_hash_table_lookup (summary_table, cns->priv->uid))) {
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 8943863..f524c6f 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -235,7 +235,7 @@ uid_num (CamelFolderSummary *summary, gint index)
 
 	tmp = camel_folder_summary_uid_from_index(summary, index);
 
-	if((brk = strchr(tmp, ',')) == NULL)
+	if ((brk = strchr(tmp, ',')) == NULL)
 		ret = 0;
 	else {
 		*brk = 0;
@@ -265,14 +265,14 @@ camel_nntp_get_headers (CamelStore *store,
 	g_free (ret);
 
 	i = camel_folder_summary_count(folder->summary);
-	if(i != 0) {
+	if (i != 0) {
 		GSList *del = NULL;
 		last_summary = uid_num(folder->summary, i-1);
 
-		if(last_summary < first_message)
+		if (last_summary < first_message)
 			camel_folder_summary_clear(folder->summary);
 		else {
-			while(uid_num(folder->summary, 0) < first_message) {
+			while (uid_num(folder->summary, 0) < first_message) {
 				gchar *uid = camel_folder_summary_uid_from_index (folder->summary, 0);
 				del = g_slist_prepend (del, uid);
 				camel_folder_summary_remove_index_fast (s, 0);
@@ -282,7 +282,7 @@ camel_nntp_get_headers (CamelStore *store,
 			g_slist_foreach (del, (GFunc) g_free, NULL);
 			g_slist_free (del);
 
-			if(last_summary >= last_message)
+			if (last_summary >= last_message)
 				return;
 
 			first_message = last_summary;
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 6b6b129..94d0722 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -430,7 +430,7 @@ camel_pop3_delete_old(CamelFolder *folder, gint days_to_delete,	CamelException *
 			d(printf("%s(%d): day_lag=[%d] \t days_to_delete=[%d]\n",
 				 __FILE__, __LINE__, day_lag, days_to_delete));
 
-			if( day_lag > days_to_delete)
+			if ( day_lag > days_to_delete)
 			{
 				if (fi->cmd) {
 					while (camel_pop3_engine_iterate(pop3_store->engine, fi->cmd) > 0) {
diff --git a/camel/providers/pop3/camel-pop3-stream.c b/camel/providers/pop3/camel-pop3-stream.c
index 1312ebc..7357fa5 100644
--- a/camel/providers/pop3/camel-pop3-stream.c
+++ b/camel/providers/pop3/camel-pop3-stream.c
@@ -89,7 +89,7 @@ stream_read(CamelStream *stream, gchar *buffer, gsize n)
 	p = is->ptr;
 	e = is->end;
 
-	switch(state) {
+	switch (state) {
 	state_0:
 	case 0:		/* start of line, always read at least 3 chars */
 		while (e - p < 3) {
@@ -412,7 +412,7 @@ gint camel_pop3_stream_getd(CamelPOP3Stream *is, guchar **start, guint *len)
 	s = p;
 
 	do {
-		switch(state) {
+		switch (state) {
 		case 0:
 			/* check leading '.', ... */
 			if (p[0] == '.') {
diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c
index 19a787d..cc1e5d1 100644
--- a/camel/tests/lib/streams.c
+++ b/camel/tests/lib/streams.c
@@ -74,7 +74,7 @@ test_stream_seekable_readpart(CamelSeekableStream *s)
 		new = i*3;
 
 		/* exercise all seek methods */
-		switch(i % 3) {
+		switch (i % 3) {
 		case 0:
 			check(camel_seekable_stream_seek(s, new, CAMEL_STREAM_SET) == new);
 			break;
diff --git a/camel/tests/stream/test1.c b/camel/tests/stream/test1.c
index f48d16f..eea05f8 100644
--- a/camel/tests/stream/test1.c
+++ b/camel/tests/stream/test1.c
@@ -27,7 +27,7 @@ gint main(gint argc, gchar **argv)
 		(void)unlink("stream.txt");
 
 		push("trying to open a nonexistant stream, method %d", i);
-		switch(i) {
+		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);
 			break;
@@ -41,7 +41,7 @@ gint main(gint argc, gchar **argv)
 		pull();
 
 		push("Creating stream using method %d", i);
-		switch(i) {
+		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);
 			fd = ((CamelStreamFs *)ss)->fd;
@@ -69,7 +69,7 @@ gint main(gint argc, gchar **argv)
 		pull();
 
 		push("re-opening stream");
-		switch(i) {
+		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);
 			fd = ((CamelStreamFs *)ss)->fd;
@@ -89,7 +89,7 @@ gint main(gint argc, gchar **argv)
 		pull();
 
 		push("re-opening stream with truncate");
-		switch(i) {
+		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_TRUNC, 0);
 			fd = ((CamelStreamFs *)ss)->fd;
diff --git a/camel/tests/stream/test2.c b/camel/tests/stream/test2.c
index 04961a9..5ef0fc0 100644
--- a/camel/tests/stream/test2.c
+++ b/camel/tests/stream/test2.c
@@ -26,7 +26,7 @@ gint main(gint argc, gchar **argv)
 	for (i=0;i<3;i++) {
 
 		push("Creating stream using method %d", i);
-		switch(i) {
+		switch (i) {
 		case 0:
 			ss = (CamelSeekableStream *)camel_stream_mem_new();
 			break;
diff --git a/libedataserver/e-account-list.c b/libedataserver/e-account-list.c
index 5e85f97..6e23bc1 100644
--- a/libedataserver/e-account-list.c
+++ b/libedataserver/e-account-list.c
@@ -480,7 +480,7 @@ e_account_list_find(EAccountList *accounts, e_account_find_t type, const gchar *
 		account = (const EAccount *)e_iterator_get (it);
 
 		val = NULL;
-		switch(type) {
+		switch (type) {
 		case E_ACCOUNT_FIND_NAME:
 			found = strcmp(account->name, key) == 0;
 			break;
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index b491d80..651b5a3 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -497,7 +497,7 @@ e_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);
diff --git a/libedataserver/e-msgport.c b/libedataserver/e-msgport.c
index 4ca5834..7a2c6ee 100644
--- a/libedataserver/e-msgport.c
+++ b/libedataserver/e-msgport.c
@@ -837,7 +837,7 @@ void e_thread_destroy(EThread *e)
 
 	pthread_mutex_lock(&e->mutex);
 
-	switch(e->type) {
+	switch (e->type) {
 	case E_THREAD_QUEUE:
 	case E_THREAD_DROP:
 		/* if we have a thread, 'kill' it */
@@ -1100,7 +1100,7 @@ void e_thread_put(EThread *e, EMsg *msg)
 
 	msg->reply_port = e->reply_port;
 
-	switch(e->type) {
+	switch (e->type) {
 	case E_THREAD_QUEUE:
 		/* if the queue is full, lose this new addition */
 		if (g_async_queue_length(e->server_port->queue) < e->queue_limit) {
@@ -1293,7 +1293,7 @@ gint e_mutex_cond_wait(gpointer vcond, EMutex *m)
 	gint ret;
 	pthread_cond_t *cond = vcond;
 
-	switch(m->type) {
+	switch (m->type) {
 	case E_MUTEX_SIMPLE:
 		return pthread_cond_wait(cond, &m->mutex);
 	case E_MUTEX_REC:
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index 9253d13..5a5e53f 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -182,7 +182,7 @@ e_sexp_result_free(struct _ESExp *f, struct _ESExpResult *t)
 	if (t == NULL)
 		return;
 
-	switch(t->type) {
+	switch (t->type) {
 	case ESEXP_RES_ARRAY_PTR:
 		g_ptr_array_free(t->value.ptrarray, TRUE);
 		break;
@@ -474,7 +474,7 @@ term_eval_plus(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 
 	if (argc>0) {
 		type = argv[0]->type;
-		switch(type) {
+		switch (type) {
 		case ESEXP_RES_INT: {
 			gint total = argv[0]->value.number;
 			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
@@ -535,7 +535,7 @@ term_eval_sub(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 
 	if (argc>0) {
 		type = argv[0]->type;
-		switch(type) {
+		switch (type) {
 		case ESEXP_RES_INT: {
 			gint total = argv[0]->value.number;
 			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
@@ -632,7 +632,7 @@ term_eval_caststring(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gp
 
 /* implements 'if' function */
 static ESExpResult *
-term_eval_if(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
+term_eval_if (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 {
 	struct _ESExpResult *r;
 	gint doit;
@@ -913,7 +913,7 @@ parse_value(ESExp *f)
 	p(printf("parsing value\n"));
 
 	token = g_scanner_get_next_token(gs);
-	switch(token) {
+	switch (token) {
 	case G_TOKEN_EOF:
 		break;
 	case G_TOKEN_LEFT_PAREN:
@@ -1008,7 +1008,7 @@ parse_list(ESExp *f, gint gotbrace)
 		token = g_scanner_get_next_token(gs);
 	if (token =='(') {
 		token = g_scanner_get_next_token(gs);
-		switch(token) {
+		switch (token) {
 		case G_TOKEN_SYMBOL: {
 			struct _ESExpSymbol *s;
 
@@ -1124,7 +1124,7 @@ e_sexp_init (ESExp *s)
 	s->result_chunks = e_memchunk_new(16, sizeof(struct _ESExpResult));
 
 	/* load in builtin symbols? */
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
+	for (i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(s, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, (gpointer)&symbols[i]);
 		} else {
diff --git a/libedataserverui/e-contact-store.c b/libedataserverui/e-contact-store.c
index b251451..2c1d873 100644
--- a/libedataserverui/e-contact-store.c
+++ b/libedataserverui/e-contact-store.c
@@ -274,7 +274,7 @@ find_contact_source_by_book_return_view(EContactStore *contact_store, EBook *boo
 
 	ContactSource *source = NULL;
 
-	for(i = 0; i < contact_store->contact_sources->len; i++) {
+	for (i = 0; i < contact_store->contact_sources->len; i++) {
 		source = &g_array_index (contact_store->contact_sources, ContactSource, i);
 		if (source->book == book)
 			break;
diff --git a/libedataserverui/e-destination-store.c b/libedataserverui/e-destination-store.c
index 8b93331..f58eceb 100644
--- a/libedataserverui/e-destination-store.c
+++ b/libedataserverui/e-destination-store.c
@@ -670,7 +670,7 @@ e_destination_store_get_value (GtkTreeModel *tree_model,
 		case E_DESTINATION_STORE_COLUMN_ADDRESS:
 			contact = e_destination_get_contact(destination);
 			if (contact && E_IS_CONTACT (contact)) {
-				if(e_contact_get (contact, E_CONTACT_IS_LIST)) {
+				if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
 					string = e_destination_get_name (destination);
 					string_new = g_string_new(string);
 					string_new = g_string_append(string_new, " mailing list");
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index ddeed10..d9ba49f 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -679,7 +679,7 @@ model_section_removed (ENameSelectorDialog *name_selector_dialog, const gchar *n
 static void
 status_message(EBookView *view, const gchar *message, ENameSelectorDialog *dialog)
 {
-	if(message == NULL)
+	if (message == NULL)
 		gtk_label_set_text(dialog->status_label, "");
 	else
 		gtk_label_set_text(dialog->status_label, message);
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 6ca1703..7603348 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -1386,7 +1386,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, gint start_pos, gint
 		p = text + end_pos;
 		for (p = text + (end_pos-1), j = end_pos - 1; *p && *p != '"' ; p = g_utf8_next_char (p), j++) {
 			gunichar c = g_utf8_get_char (p);
-			if(c == ',') {
+			if (c == ',') {
 				insert_destination_at_position (name_selector_entry, j+1);
 			}
 		}
@@ -1399,7 +1399,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, gint start_pos, gint
 		/* If the entry was completely cleared, remove the initial destination too */
 		remove_destination_by_index (name_selector_entry, 0);
 		generate_attribute_list (name_selector_entry);
-	} else  if (!del_space){
+	} else  if (!del_space) {
 		modify_destination_at_position (name_selector_entry, start_pos);
 	}
 
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index b85bf1c..6d0b959 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -242,7 +242,7 @@ delete_row (GtkTreePath *path, ENameSelectorList *list)
 	/* We deleted the last entry */
 	if (len == 1) {
 		enl_popup_ungrab (list);
-		if(list->menu)
+		if (list->menu)
 			gtk_menu_popdown(GTK_MENU (list->menu));
 		gtk_widget_hide ( GTK_WIDGET (list->popup));
 		return;
@@ -503,7 +503,7 @@ enl_tree_key_press_event (GtkWidget *w,
 		g_list_free (paths);
 	} else if (event->keyval != GDK_Up && event->keyval != GDK_Down
 		   && event->keyval != GDK_Shift_R && event->keyval != GDK_Shift_L
-		   && event->keyval != GDK_Control_R && event->keyval != GDK_Control_L){
+		   && event->keyval != GDK_Control_R && event->keyval != GDK_Control_L) {
 
 		enl_popup_ungrab (list);
 		gtk_widget_hide ( GTK_WIDGET (list->popup));
@@ -528,7 +528,7 @@ e_name_selector_list_expand_clicked(ENameSelectorList *list)
 	}
 	else {
 		enl_popup_ungrab (list);
-		if(list->menu)
+		if (list->menu)
 			gtk_menu_popdown(GTK_MENU (list->menu));
 		gtk_widget_hide (GTK_WIDGET (list->popup));
 	}
diff --git a/servers/exchange/storage/exchange-esource.c b/servers/exchange/storage/exchange-esource.c
index a8d3a65..009656d 100644
--- a/servers/exchange/storage/exchange-esource.c
+++ b/servers/exchange/storage/exchange-esource.c
@@ -181,7 +181,7 @@ add_folder_esource (ExchangeAccount *account,
 	}
 	else {
                 /* source group already exists*/
-		if((source = e_source_group_peek_source_by_name (source_group,
+		if ((source = e_source_group_peek_source_by_name (source_group,
 							folder_name)) == NULL) {
 			if (is_contacts_folder && g_str_has_prefix (physical_uri, "gal://")) {
 				gchar *browse = exchange_account_get_account_uri_param (account, "ad_browse");
@@ -332,7 +332,7 @@ remove_folder_esource (ExchangeAccount *account,
 
 			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);
 				read_uri = e_source_get_uri (source);
diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.c b/servers/exchange/storage/exchange-hierarchy-webdav.c
index 4d4c3eb..30315d5 100644
--- a/servers/exchange/storage/exchange-hierarchy-webdav.c
+++ b/servers/exchange/storage/exchange-hierarchy-webdav.c
@@ -460,7 +460,7 @@ xfer_folder (ExchangeHierarchy *hier, EFolder *source,
 					       physical_uri);
 		}
 		else if ((strcmp (folder_type, "tasks") == 0) ||
-			 (strcmp (folder_type, "tasks/public") == 0)){
+			 (strcmp (folder_type, "tasks/public") == 0)) {
 			remove_folder_esource (hier->account,
 					       EXCHANGE_TASKS_FOLDER,
 					       physical_uri);
diff --git a/servers/exchange/xntlm/xntlm-des.c b/servers/exchange/xntlm/xntlm-des.c
index aabf0e3..8d00169 100644
--- a/servers/exchange/xntlm/xntlm-des.c
+++ b/servers/exchange/xntlm/xntlm-des.c
@@ -327,7 +327,7 @@ xntlm_deskey(XNTLM_DES_KS k, const guchar *key, gint decrypt)
 			/* rotate left and right halves independently */
 		for (j=0; j<48; j++){	/* select bits individually */
 			/* check bit that goes to ks[j] */
-			if (pcr[pc2[j]-1]){
+			if (pcr[pc2[j]-1]) {
 				/* mask it in if it's there */
 				l= j % 6;
 				ks[j/6] |= bytebit[l] >> 2;
diff --git a/servers/groupwise/e-gw-container.c b/servers/groupwise/e-gw-container.c
index 6e1f44e..3dd5b61 100644
--- a/servers/groupwise/e-gw-container.c
+++ b/servers/groupwise/e-gw-container.c
@@ -58,7 +58,7 @@ static void e_gw_container_set_is_shared_to_me (EGwContainer *container, gboolea
 static void
 free_node(EShUsers *user)
 {
-	if(user){
+	if (user) {
 		g_free (user->email);
 		g_free (user);
 	}
@@ -111,7 +111,7 @@ e_gw_container_finalize (GObject *object)
 			priv->modified = NULL;
 		}
 
-		if(priv->user_list) {
+		if (priv->user_list) {
 			g_list_foreach (priv->user_list,(GFunc) free_node, NULL);
 			g_list_free (priv->user_list);
 			priv->user_list = NULL;
@@ -492,7 +492,7 @@ e_gw_container_get_rights (EGwContainer *container, gchar *email)
 
 	for (node = user_list; node != NULL; node = node->next) {
 		user = node->data;
-		if( !strcmp (user->email, email))
+		if ( !strcmp (user->email, email))
 			return user->rights;
 	}
 
@@ -745,11 +745,11 @@ e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, c
 			e_gw_message_write_string_parameter (msg, "displayName", NULL, "name");
 			email = g_strdup (user->email);
 
-			if(user->rights & 0x1)
+			if (user->rights & 0x1)
 				add = TRUE;
-			if(user->rights & 0x2)
+			if (user->rights & 0x2)
 				edit = TRUE;
-			if(user->rights & 0x4)
+			if (user->rights & 0x4)
 				del = TRUE;
 
 			e_gw_message_write_string_parameter (msg, "email", NULL, email);
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index a22d8e5..6e65f8a 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -441,7 +441,7 @@ e_gw_item_dispose (GObject *object)
 			priv->category_list = NULL;
 		}
 
-		if(priv->attach_list) {
+		if (priv->attach_list) {
 			g_slist_foreach (priv->attach_list, free_attach, NULL);
 			g_slist_free (priv->attach_list);
 			priv->attach_list = NULL;
@@ -1017,7 +1017,7 @@ set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapP
 	simple_fields = priv->simple_fields;
 
 	subparam = soup_soap_parameter_get_first_child_by_name(param, "id");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
 		g_hash_table_insert (simple_fields, (gpointer) "id", value);
 		item->priv->id = g_strdup (value);
@@ -1030,14 +1030,14 @@ set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapP
 	}
 	value = NULL;
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "comment");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
 		if (value)
 			g_hash_table_insert (simple_fields , (gpointer) "comment", value);
 	}
 	value = NULL;
 	subparam = soup_soap_parameter_get_first_child_by_name(param, "name");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
 		if (value)
 			g_hash_table_insert (simple_fields, (gpointer) "name", value);
@@ -1192,7 +1192,7 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 	}
 
 	subparam =  soup_soap_parameter_get_first_child_by_name(param, "imList");
-	if(subparam) {
+	if (subparam) {
 		for ( temp = soup_soap_parameter_get_first_child (subparam); temp != NULL; temp = soup_soap_parameter_get_next_child (temp))
 			{
 				IMAddress *im_address = g_new0(IMAddress, 1);
@@ -1218,7 +1218,7 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 	}
 
 	subparam =  soup_soap_parameter_get_first_child_by_name(param, "phoneList");
-	if(subparam) {
+	if (subparam) {
 		g_hash_table_insert (simple_fields, (gpointer) "default_phone", soup_soap_parameter_get_property(subparam, "default"));
 		for ( temp = soup_soap_parameter_get_first_child (subparam); temp != NULL; temp = soup_soap_parameter_get_next_child (temp))
 			{
@@ -1255,16 +1255,16 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 			}
 	}
 	subparam =  soup_soap_parameter_get_first_child_by_name(param, "personalInfo");
-	if(subparam) {
+	if (subparam) {
 		temp = soup_soap_parameter_get_first_child_by_name (subparam, "birthday");
-		if(temp) {
+		if (temp) {
 			value = soup_soap_parameter_get_string_value (temp);
 			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "birthday", value);
 
 		}
 		temp = soup_soap_parameter_get_first_child_by_name (subparam, "website");
-		if(temp) {
+		if (temp) {
 			value = soup_soap_parameter_get_string_value (temp);
 			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "website", value);
@@ -1274,24 +1274,24 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 	subparam =  soup_soap_parameter_get_first_child_by_name(param, "officeInfo");
 	if (subparam) {
 		temp = soup_soap_parameter_get_first_child_by_name (subparam, "organization");
-		if(temp) {
+		if (temp) {
 			value = soup_soap_parameter_get_string_value (temp);
-			if(value)
+			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "organization", value);
 			value = soup_soap_parameter_get_property(temp, "uid");
 			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "organization_id", value);
 		}
 		temp = soup_soap_parameter_get_first_child_by_name (subparam, "department");
-		if(temp) {
+		if (temp) {
 			value = soup_soap_parameter_get_string_value (temp);
-			if(value)
+			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "department", value);
 		}
 		temp = soup_soap_parameter_get_first_child_by_name (subparam, "title");
-		if(temp) {
+		if (temp) {
 			value = soup_soap_parameter_get_string_value (temp);
-			if(value)
+			if (value)
 				g_hash_table_insert (simple_fields, (gpointer) "title", value);
 		}
 
@@ -1393,15 +1393,15 @@ set_resource_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param
 		item->priv->full_name->first_name = g_strdup (value);
 
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "phone");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
-		if(value)
+		if (value)
 			g_hash_table_insert (simple_fields, (gpointer) "default_phone", value);
 	}
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "email");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
-		if(value)
+		if (value)
 			item->priv->email_list = g_list_append (item->priv->email_list, value);
 	}
 
@@ -1429,16 +1429,16 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
 		item->priv->full_name->first_name = g_strdup (value);
 
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "phone");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
-		if(value)
+		if (value)
 			g_hash_table_insert (simple_fields, (gpointer) "default_phone", value);
 	}
 
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "fax");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
-		if(value)
+		if (value)
 			g_hash_table_insert (simple_fields, (gpointer) "phone_Fax", value);
 	}
 
@@ -1451,9 +1451,9 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
 	}
 
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "website");
-	if(subparam) {
+	if (subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
-		if(value)
+		if (value)
 			g_hash_table_insert (simple_fields, (gpointer) "website", value);
 	}
 
@@ -1499,7 +1499,7 @@ append_common_addressbook_item_fields_to_soap_message (GHashTable *simple_fields
 	soup_soap_message_end_element (msg);
 
 	value = g_hash_table_lookup (simple_fields, "comment");
-	if(value)
+	if (value)
 		e_gw_message_write_string_parameter (msg, "comment", NULL, value);
 
 }
@@ -1533,7 +1533,7 @@ append_email_list_soap_message (GList *email_list, SoupSoapMessage *msg)
 	soup_soap_message_start_element (msg, "emailList", NULL, NULL);
 	soup_soap_message_add_attribute (msg, "primary", email_list->data, NULL, NULL);
 	for (; email_list != NULL; email_list = g_list_next (email_list))
-		if(email_list->data)
+		if (email_list->data)
 			e_gw_message_write_string_parameter (msg, "email", NULL, email_list->data);
 	soup_soap_message_end_element (msg);
 
@@ -1599,7 +1599,7 @@ append_office_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *
 	org_name = g_hash_table_lookup (simple_fields, "organization");
 	if (value && org_name)
 		e_gw_message_write_string_parameter_with_attribute (msg, "organization", NULL, org_name, "uid", value);
-	else if(org_name)
+	else if (org_name)
 		e_gw_message_write_string_parameter (msg, "organization", NULL, org_name);
 	value = g_hash_table_lookup (simple_fields, "department");
 	if (value)
@@ -1625,10 +1625,10 @@ append_personal_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage
 
 	soup_soap_message_start_element (msg, "personalInfo", NULL, NULL);
 	value =  g_hash_table_lookup (simple_fields, "birthday");
-	if(value)
+	if (value)
 		e_gw_message_write_string_parameter (msg, "birthday", NULL, value);
 	value =  g_hash_table_lookup (simple_fields, "website");
-	if(value)
+	if (value)
 		e_gw_message_write_string_parameter (msg, "website",NULL,  value);
 
 	soup_soap_message_end_element (msg);
@@ -2077,7 +2077,7 @@ e_gw_item_new_from_soap_parameter (const gchar *email, const gchar *container, S
 					is_group_item = FALSE;
 			}
 			g_free (value);
-		} else if (!g_ascii_strcasecmp (name, "link")){
+		} else if (!g_ascii_strcasecmp (name, "link")) {
 			SoupSoapParameter *subparam;
 			EGwItemLinkInfo *info = g_new0 (EGwItemLinkInfo, 1);
 
@@ -3522,7 +3522,7 @@ append_event_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint
 		soup_soap_message_start_element (msg, "delete", NULL, NULL);
 		break;
 	}
-	if (g_hash_table_lookup (changes, "categories")){
+	if (g_hash_table_lookup (changes, "categories")) {
 		GList *list;
 		list = g_hash_table_lookup (changes, "categories");
 
diff --git a/servers/groupwise/e-gw-proxy.c b/servers/groupwise/e-gw-proxy.c
index 0b3f511..0f6c02d 100644
--- a/servers/groupwise/e-gw-proxy.c
+++ b/servers/groupwise/e-gw-proxy.c
@@ -174,13 +174,13 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 	e_gw_message_write_string_parameter (msg, "email", NULL, new_proxy->proxy_email);
 	e_gw_message_write_string_parameter (msg, "displayName", NULL, new_proxy->proxy_name);
 
-	if (new_proxy->permissions & E_GW_PROXY_MAIL_READ){
+	if (new_proxy->permissions & E_GW_PROXY_MAIL_READ) {
 		added = TRUE;
 		soup_soap_message_start_element (msg, "mail", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_MAIL_WRITE){
-		if (added == FALSE){
+	if (new_proxy->permissions & E_GW_PROXY_MAIL_WRITE) {
+		if (added == FALSE) {
 			added=TRUE;
 			soup_soap_message_start_element (msg, "mail", NULL, NULL);
 		}
@@ -190,13 +190,13 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		soup_soap_message_end_element(msg);
 
 	added = FALSE;
-	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_READ){
+	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_READ) {
 		added=TRUE;
 		soup_soap_message_start_element (msg, "appointment", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_WRITE){
-		if(added == FALSE)
+	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_WRITE) {
+		if (added == FALSE)
 		{
 			added=TRUE;
 			soup_soap_message_start_element (msg, "appointment", NULL, NULL);
@@ -207,12 +207,12 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		soup_soap_message_end_element  (msg);
 
 	added = FALSE;
-	if (new_proxy->permissions & E_GW_PROXY_TASK_READ){
+	if (new_proxy->permissions & E_GW_PROXY_TASK_READ) {
 		added=TRUE;
 		soup_soap_message_start_element (msg, "task", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_TASK_WRITE){
+	if (new_proxy->permissions & E_GW_PROXY_TASK_WRITE) {
 		if (added == FALSE)
 		{
 			added=TRUE;
@@ -224,13 +224,13 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		soup_soap_message_end_element(msg);
 
 	added = FALSE;
-	if (new_proxy->permissions & E_GW_PROXY_NOTES_READ){
+	if (new_proxy->permissions & E_GW_PROXY_NOTES_READ) {
 		added=TRUE;
 		soup_soap_message_start_element (msg, "note", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_NOTES_WRITE){
-		if(added==FALSE)
+	if (new_proxy->permissions & E_GW_PROXY_NOTES_WRITE) {
+		if (added==FALSE)
 		{
 			added=TRUE;
 			soup_soap_message_start_element (msg, "note", NULL, NULL);
@@ -241,12 +241,12 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		soup_soap_message_end_element(msg);
 
 	added = FALSE;
-	if (new_proxy->permissions & E_GW_PROXY_GET_ALARMS){
+	if (new_proxy->permissions & E_GW_PROXY_GET_ALARMS) {
 		added=TRUE;
 		soup_soap_message_start_element(msg,"misc",NULL,NULL);
 		e_gw_message_write_int_parameter (msg, "alarms", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_GET_NOTIFICATIONS){
+	if (new_proxy->permissions & E_GW_PROXY_GET_NOTIFICATIONS) {
 		if (added!=TRUE)
 		{
 			added=TRUE;
@@ -255,7 +255,7 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		e_gw_message_write_int_parameter (msg, "notify", NULL, 1);
 	}
 
-	if (new_proxy->permissions & E_GW_PROXY_MODIFY_FOLDERS){
+	if (new_proxy->permissions & E_GW_PROXY_MODIFY_FOLDERS) {
 		if (added!=TRUE)
 		{
 			added=TRUE;
@@ -263,7 +263,7 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 		}
 		e_gw_message_write_int_parameter (msg, "setup", NULL, 1);
 	}
-	if (new_proxy->permissions & E_GW_PROXY_READ_PRIVATE){
+	if (new_proxy->permissions & E_GW_PROXY_READ_PRIVATE) {
 		if (added!=TRUE)
 		{
 			added=TRUE;
diff --git a/servers/groupwise/e-gw-sendoptions.c b/servers/groupwise/e-gw-sendoptions.c
index 8dcf915..292f715 100644
--- a/servers/groupwise/e-gw-sendoptions.c
+++ b/servers/groupwise/e-gw-sendoptions.c
@@ -649,7 +649,7 @@ e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param)
 
 	opts = g_object_new (E_TYPE_GW_SENDOPTIONS, NULL);
 
-	if (!e_gw_sendoptions_store_settings (param, opts)){
+	if (!e_gw_sendoptions_store_settings (param, opts)) {
 		g_object_unref (opts);
 		return NULL;
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]