[evolution-data-server] Coding style and whitespace cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit 385ac7dcd386a3860e494cf7e894201a9a973001
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Feb 6 20:54:21 2010 -0500

    Coding style and whitespace cleanup.

 camel/camel-folder.h                         |    2 +-
 camel/providers/imapx/camel-imapx-folder.c   |    5 ++---
 camel/providers/imapx/camel-imapx-server.c   |   12 ++++++------
 camel/providers/imapx/camel-imapx-store.c    |    4 +---
 camel/providers/imapx/camel-imapx-tokenise.h |   14 +++++++-------
 camel/providers/imapx/camel-imapx-utils.c    |    7 +++----
 6 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index e847d92..5d753c4 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -233,7 +233,7 @@ void               camel_folder_refresh_info           (CamelFolder *folder,
 void               camel_folder_sync                   (CamelFolder *folder,
 							gboolean expunge,
 							CamelException *ex);
-void		   camel_folder_set_lock_async 	       (CamelFolder *folder,
+void		   camel_folder_set_lock_async         (CamelFolder *folder,
 							gboolean async);
 
 CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index b47c6dd..4a2df75 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -145,7 +145,7 @@ static void
 imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 {
 	CamelIMAPXStore *is = (CamelIMAPXStore *)folder->parent_store;
-	
+
 	if (CAMEL_OFFLINE_STORE (is)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return;
 
@@ -210,7 +210,6 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	return msg;
 }
 
-
 static void
 imapx_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 		      CamelFolder *dest, GPtrArray **transferred_uids,
@@ -220,7 +219,7 @@ imapx_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 
 	if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return;
-		
+
 	if (istore->server && camel_imapx_server_connect (istore->server, 1))
 		camel_imapx_server_copy_message (istore->server, source, dest, uids, delete_originals, ex);
 
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 5613240..3728270 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -2294,7 +2294,7 @@ imapx_command_copy_messages_step_start (CamelIMAPXServer *is, CamelIMAPXJob *job
 	CamelIMAPXCommand *ic;
 	GPtrArray *uids = job->u.copy_messages.uids;
 	gint i = index;
-	
+
 	ic = camel_imapx_command_new ("COPY", job->folder->full_name, "UID COPY ");
 	ic->complete = imapx_command_copy_messages_step_done;
 	ic->job = job;
@@ -2327,7 +2327,7 @@ imapx_command_copy_messages_step_done (CamelIMAPXServer *is, CamelIMAPXCommand *
 	CamelIMAPXJob *job = ic->job;
 	gint i = job->u.copy_messages.index;
 	GPtrArray *uids = job->u.copy_messages.uids;
-	
+
 	if (camel_exception_is_set (ic->ex) || ic->status->result != IMAP_OK) {
 		if (!camel_exception_is_set (ic->ex))
 			camel_exception_set (job->ex, 1, "Error copying messages");
@@ -2346,7 +2346,7 @@ imapx_command_copy_messages_step_done (CamelIMAPXServer *is, CamelIMAPXCommand *
 
 	/* TODO copy the summary and cached messages to the new folder. We might need a sorted insert to avoid refreshing the dest folder */
 	if (ic->status->condition == IMAP_COPYUID) {
-		
+
 	}
 
 	if (i < uids->len) {
@@ -3207,7 +3207,7 @@ imapx_parser_thread (gpointer d)
 				CAMEL_SERVICE_REC_UNLOCK (is->store, connect_lock);
 
 				cancel_all_jobs (is, &ex);
-				
+
 				if (imapx_idle_supported (is))
 					imapx_exit_idle (is);
 			}
@@ -3523,12 +3523,12 @@ camel_imapx_server_copy_message (CamelIMAPXServer *is, CamelFolder *source, Came
 	job->u.copy_messages.dest = dest;
 	job->u.copy_messages.uids = uids;
 	job->u.copy_messages.delete_originals = delete_originals;
-	
+
 	camel_object_ref(source);
 	camel_object_ref (dest);
 
 	imapx_run_job (is, job);
-} 
+}
 
 void
 camel_imapx_server_append_message(CamelIMAPXServer *is, CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *mi, CamelException *ex)
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 6dc2784..9267351 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -213,7 +213,6 @@ imap_disconnect (CamelService *service, gboolean clean, CamelException *ex)
 	return TRUE;
 }
 
-
 static CamelFolder *
 imapx_get_junk(CamelStore *store, CamelException *ex)
 {
@@ -233,7 +232,7 @@ imapx_get_junk(CamelStore *store, CamelException *ex)
 
 static CamelFolder *
 imapx_get_trash (CamelStore *store, CamelException *ex)
-{	
+{
 	CamelFolder *folder = CAMEL_STORE_CLASS(parent_class)->get_trash(store, ex);
 
 	if (folder) {
@@ -248,7 +247,6 @@ imapx_get_trash (CamelStore *store, CamelException *ex)
 	return folder;
 }
 
-
 static guint
 imapx_hash_folder_name (gconstpointer key)
 {
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 954e4d4..770a740 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -45,10 +45,10 @@ __inline
 inline
 #endif
 #endif
-static unsigned int
-imap_hash (register const char *str, register unsigned int len)
+static guint
+imap_hash (register const gchar *str, register guint len)
 {
-  static unsigned char asso_values[] =
+  static guchar asso_values[] =
     {
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
@@ -77,14 +77,14 @@ imap_hash (register const char *str, register unsigned int len)
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
       57, 57, 57, 57, 57, 57
     };
-  return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
+  return len + asso_values[(guchar)str[len - 1]] + asso_values[(guchar)str[0]];
 }
 
 #ifdef __GNUC__
 __inline
 #endif
 struct _imap_keyword *
-imap_tokenise_struct (register const char *str, register unsigned int len)
+imap_tokenise_struct (register const gchar *str, register guint len)
 {
   static struct _imap_keyword wordlist[] =
     {
@@ -174,11 +174,11 @@ imap_tokenise_struct (register const char *str, register unsigned int len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = imap_hash (str, len);
+      register gint key = imap_hash (str, len);
 
       if (key <= MAX_HASH_VALUE && key >= 0)
         {
-          register const char *s = wordlist[key].name;
+          register const gchar *s = wordlist[key].name;
 
           if (*str == *s && !strcmp (str + 1, s + 1))
             return &wordlist[key];
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 7cb7064..8a52841 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -1502,12 +1502,11 @@ imap_parse_status_info (struct _CamelIMAPXStream *is, CamelException *ex)
 	return sinfo;
 }
 
-
 static void
 generate_uids_from_sequence (GPtrArray *uids, guint32 end_uid)
 {
 	guint32 uid = GPOINTER_TO_UINT (g_ptr_array_index (uids, uids->len - 1));
-	
+
 	uid++;
 	while (uid <= end_uid) {
 		g_ptr_array_add (uids, GUINT_TO_POINTER (uid));
@@ -1533,11 +1532,11 @@ imap_parse_uids (CamelIMAPXStream *is, CamelException *ex)
 			sequence = TRUE;
 			is_prev_number = FALSE;
 		} else {
-			guint32 uid = strtoul ((char *) token, NULL, 10);
+			guint32 uid = strtoul ((gchar *) token, NULL, 10);
 
 			is_prev_number = TRUE;
 			sequence = FALSE;
-			
+
 			if (sequence)
 				generate_uids_from_sequence (uids, uid);
 			else