[evolution-kolab: 5/8] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

[Christian Hilberg <chilberg src gnome org>]

commit 759d793f44c7c805c7ad782d8533a82091c93701
Merge: 80fc286 f3db069
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Mar 26 11:00:37 2012 +0200

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

 src/camel/providers/imapx/camel-imapx-command.c |   90 ++++++--
 src/camel/providers/imapx/camel-imapx-command.h |    9 +-
 src/camel/providers/imapx/camel-imapx-job.c     |   53 +++--
 src/camel/providers/imapx/camel-imapx-job.h     |    4 +
 src/camel/providers/imapx/camel-imapx-server.c  |  311 ++++++++++++++++-------
 5 files changed, 340 insertions(+), 127 deletions(-)
---
diff --cc src/camel/providers/imapx/camel-imapx-server.c
index 0757e05,35e4384..9de9e1b
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@@ -3646,10 -3716,10 +3716,10 @@@ imapx_command_step_fetch_done (CamelIMA
  		ic = camel_imapx_command_new (
  			is, "FETCH", job->folder, "UID FETCH ");
  		ic->complete = imapx_command_step_fetch_done;
- 		ic->job = job;
+ 		camel_imapx_command_set_job (ic, job);
  		ic->pri = job->pri - 1;
  
 -		//printf("Total: %d: %d, %d, %d\n", total, fetch_limit, i, data->last_index);	
 +		//printf("Total: %d: %d, %d, %d\n", total, fetch_limit, i, data->last_index);
  		data->last_index = i;
  
  		/* If its mobile client and  when total=0 (new account setup) fetch only one batch of mails,
@@@ -4147,10 -4228,9 +4228,9 @@@ imapx_job_fetch_messages_start (CamelIM
  		if (ftype == CAMEL_FETCH_NEW_MESSAGES) {
  			/* We need to issue Status command to get the total unread count */
  			ic = camel_imapx_command_new (
 -				is, "STATUS", NULL, 
 +				is, "STATUS", NULL,
  				"STATUS %f (MESSAGES UNSEEN UIDVALIDITY UIDNEXT)", folder);
- 
- 			ic->job = job;
+ 			camel_imapx_command_set_job (ic, job);
  			ic->pri = job->pri;
  
  			imapx_command_run_sync (is, ic, job->cancellable, &job->error);
@@@ -4341,10 -4427,9 +4427,9 @@@ imapx_job_refresh_info_start (CamelIMAP
  		CamelIMAPXCommand *ic;
  
  		ic = camel_imapx_command_new (
 -			is, "STATUS", NULL, 
 +			is, "STATUS", NULL,
  			"STATUS %f (MESSAGES UNSEEN UIDVALIDITY UIDNEXT)", folder);
- 
- 		ic->job = job;
+ 		camel_imapx_command_set_job (ic, job);
  		ic->pri = job->pri;
  
  		imapx_command_run_sync (is, ic, job->cancellable, &job->error);