[evolution-kolab/ek-wip-porting] CamelIMAPXServer: allow NULL uid param in friend API

[Christian Hilberg <chilberg src gnome org>]

commit 72ed0403f0b26e3706dea88e81bd83a116578ff3
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Mar 7 16:12:01 2012 +0100

    CamelIMAPXServer: allow NULL uid param in friend API
    
    * allow uid param in camel_imapx_server_match_active_job()
      function to be NULL (can happen while connecting)
    * whitespace cleanup

 src/camel/providers/imapx/camel-imapx-server.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 398d155..32c7537 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -3649,7 +3649,7 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 		ic->job = 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,
@@ -3908,7 +3908,7 @@ imapx_job_scan_changes_done (CamelIMAPXServer *is,
 	/* There's no sane way to get the server-side unseen count on the
 	 * select mailbox. So just work it out from the flags if its not in
 	 * mobile mode. In mobile mode we would have this filled up already
-	 * with a STATUS command. 
+	 * with a STATUS command.
 	 **/
 	if (!mobile_mode)
 		((CamelIMAPXFolder *) job->folder)->unread_on_server = camel_folder_summary_get_unread_count (job->folder->summary);
@@ -3938,7 +3938,7 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
 		_("Scanning for changed messages in %s"),
 		camel_folder_get_display_name (job->folder));
 
-	e('E', "Scanning from %s in %s\n", uid, camel_folder_get_full_name (job->folder));	
+	e('E', "Scanning from %s in %s\n", uid, camel_folder_get_full_name (job->folder));
 	ic = camel_imapx_command_new (
 		is, "FETCH", job->folder,
 		"UID FETCH %s:* (UID FLAGS)", uid ? uid : "1");
@@ -4138,16 +4138,16 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 			/* This means that we are fetching limited number of new mails */
 			uid = g_strdup_printf("%d", total);
 		} else {
-			/* For empty accounts, we always fetch the specified number of new mails independent of 
+			/* For empty accounts, we always fetch the specified number of new mails independent of
 			 * being asked to fetch old or new.
 			 */
-			uid = g_strdup ("1"); 
+			uid = g_strdup ("1");
 		}
 
 		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;
@@ -4171,7 +4171,7 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 			data->fetch_msg_limit, camel_folder_get_full_name (folder));
 		/* New account and fetching old messages, we would return just the limited number of newest messages */
 		ic = camel_imapx_command_new (
-			is, "FETCH", job->folder, 
+			is, "FETCH", job->folder,
 			"UID FETCH %s:* (UID FLAGS)", uid);
 
 		imapx_uidset_init (&data->uidset, uidset_size, 0);
@@ -4341,7 +4341,7 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
 		CamelIMAPXCommand *ic;
 
 		ic = camel_imapx_command_new (
-			is, "STATUS", NULL, 
+			is, "STATUS", NULL,
 			"STATUS %f (MESSAGES UNSEEN UIDVALIDITY UIDNEXT)", folder);
 
 		ic->job = job;
@@ -6351,7 +6351,7 @@ camel_imapx_server_match_active_job (CamelIMAPXServer *self,
                                      const gchar *uid)
 {
 	g_assert (CAMEL_IS_IMAPX_SERVER (self));
-	g_assert (uid != NULL);
+	/* uid may be NULL */
 
 	return imapx_match_active_job (self,
 	                               type,