evolution-data-server r8753 - trunk/camel/providers/imap4



Author: fejj
Date: Wed May  7 01:08:57 2008
New Revision: 8753
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8753&view=rev

Log:
fixed header ordering

Modified:
   trunk/camel/providers/imap4/camel-imap4-folder.c

Modified: trunk/camel/providers/imap4/camel-imap4-folder.c
==============================================================================
--- trunk/camel/providers/imap4/camel-imap4-folder.c	(original)
+++ trunk/camel/providers/imap4/camel-imap4-folder.c	Wed May  7 01:08:57 2008
@@ -24,16 +24,16 @@
 #include <config.h>
 #endif
 
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
@@ -94,7 +94,7 @@
 camel_imap4_folder_get_type (void)
 {
 	static CamelType type = 0;
-
+	
 	if (!type) {
 		type = camel_type_register (camel_offline_folder_get_type (),
 					    "CamelIMAP4Folder",
@@ -105,7 +105,7 @@
 					    (CamelObjectInitFunc) camel_imap4_folder_init,
 					    (CamelObjectFinalizeFunc) camel_imap4_folder_finalize);
 	}
-
+	
 	return type;
 }
 
@@ -115,19 +115,19 @@
 	CamelFolderClass *folder_class = (CamelFolderClass *) klass;
 	CamelObjectClass *object_class = (CamelObjectClass *) klass;
 	int i;
-
+	
 	parent_class = (CamelOfflineFolderClass *) camel_type_get_global_classfuncs (CAMEL_OFFLINE_FOLDER_TYPE);
-
+	
 	if (imap4_folder_props == NULL) {
 		for (i = 0; i < G_N_ELEMENTS (imap4_prop_list); i++) {
 			imap4_prop_list[i].description = _(imap4_prop_list[i].description);
 			imap4_folder_props = g_slist_prepend (imap4_folder_props, &imap4_prop_list[i]);
 		}
 	}
-
+	
 	object_class->getv = imap4_getv;
 	object_class->setv = imap4_setv;
-
+	
 	folder_class->sync = imap4_sync;
 	folder_class->refresh_info = imap4_refresh_info;
 	folder_class->expunge = imap4_expunge;
@@ -143,7 +143,7 @@
 camel_imap4_folder_init (CamelIMAP4Folder *folder, CamelIMAP4FolderClass *klass)
 {
 	((CamelFolder *) folder)->folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY | CAMEL_FOLDER_HAS_SEARCH_CAPABILITY;
-
+	
 	folder->utf7_name = NULL;
 	folder->cachedir = NULL;
 	folder->journal = NULL;
@@ -154,17 +154,17 @@
 camel_imap4_folder_finalize (CamelObject *object)
 {
 	CamelIMAP4Folder *folder = (CamelIMAP4Folder *) object;
-
+	
 	camel_object_unref (folder->search);
-
+	
 	if (folder->cache)
 		camel_object_unref (folder->cache);
-
+	
 	if (folder->journal) {
 		camel_offline_journal_write (folder->journal, NULL);
 		camel_object_unref (folder->journal);
 	}
-
+	
 	g_free (folder->utf7_name);
 	g_free (folder->cachedir);
 }
@@ -175,12 +175,12 @@
 	CamelArgGetV props;
 	int i, count = 0;
 	guint32 tag;
-
+	
 	for (i = 0; i < args->argc; i++) {
 		CamelArgGet *arg = &args->argv[i];
-
+		
 		tag = arg->tag;
-
+		
 		switch (tag & CAMEL_ARG_TAG) {
 		case CAMEL_OBJECT_ARG_PERSISTENT_PROPERTIES:
 		case CAMEL_FOLDER_ARG_PROPERTIES:
@@ -196,13 +196,13 @@
 			count++;
 			continue;
 		}
-
+		
 		arg->tag = (tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE;
 	}
-
+	
 	if (count)
 		return ((CamelObjectClass *) parent_class)->getv (object, ex, args);
-
+	
 	return 0;
 }
 
@@ -213,12 +213,12 @@
 	gboolean save = FALSE;
 	guint32 tag;
 	int i;
-
+	
 	for (i = 0; i < args->argc; i++) {
 		CamelArg *arg = &args->argv[i];
-
+		
 		tag = arg->tag;
-
+		
 		switch (tag & CAMEL_ARG_TAG) {
 		case CAMEL_IMAP4_FOLDER_ARG_ENABLE_MLIST:
 			if (folder->enable_mlist != arg->ca_int) {
@@ -229,13 +229,13 @@
 		default:
 			continue;
 		}
-
+		
 		arg->tag = (tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE;
 	}
-
+	
 	if (save)
 		camel_object_state_write (object);
-
+	
 	return ((CamelObjectClass *) parent_class)->setv (object, ex, args);
 }
 
@@ -260,39 +260,39 @@
 	const char *inptr = full_name;
 	int subdirs = 0;
 	char *path, *p;
-
+	
 	if (*full_name == '\0')
 		return g_strdup (toplevel_dir);
-
+	
 	while (*inptr != '\0') {
 		if (*inptr == '/')
 			subdirs++;
 		inptr++;
 	}
-
+	
 	path = g_malloc (strlen (toplevel_dir) + (inptr - full_name) + (12 * subdirs) + 2);
 	p = g_stpcpy (path, toplevel_dir);
-
+	
 	if (p[-1] != '/')
 		*p++ = '/';
-
+	
 	inptr = full_name;
 	while (*inptr != '\0') {
 		while (*inptr != '/' && *inptr != '\0')
 			*p++ = *inptr++;
-
+		
 		if (*inptr == '/') {
 			p = g_stpcpy (p, "/subfolders/");
 			inptr++;
-
+			
 			/* strip extranaeous '/'s */
 			while (*inptr == '/')
 				inptr++;
 		}
 	}
-
+	
 	*p = '\0';
-
+	
 	return path;
 }
 
@@ -302,11 +302,11 @@
 	CamelIMAP4Store *imap4_store = (CamelIMAP4Store *) store;
 	char *toplevel_dir;
 	char *path;
-
+	
 	toplevel_dir = g_strdup_printf ("%s/folders", imap4_store->storage_path);
 	path = imap4_build_filename (toplevel_dir, full_name);
 	g_free (toplevel_dir);
-
+	
 	return path;
 }
 
@@ -319,18 +319,18 @@
 	CamelFolder *folder;
 	char *path;
 	char sep;
-
+	
 	if (!(p = strrchr (full_name, '/')))
 		p = (char *) full_name;
 	else
 		p++;
-
+	
 	name = g_alloca (strlen (p) + 1);
 	strcpy (name, p);
-
+	
 	utf7_name = g_alloca (strlen (full_name) + 1);
 	strcpy (utf7_name, full_name);
-
+	
 	sep = camel_imap4_get_path_delim (((CamelIMAP4Store *) store)->summary, full_name);
 	if (sep != '/') {
 		p = utf7_name;
@@ -340,36 +340,36 @@
 			p++;
 		}
 	}
-
+	
 	utf7_name = camel_utf8_utf7 (utf7_name);
-
+	
 	folder = (CamelFolder *) (imap4_folder = (CamelIMAP4Folder *) camel_object_new (CAMEL_TYPE_IMAP4_FOLDER));
 	camel_folder_construct (folder, store, full_name, name);
 	imap4_folder->utf7_name = utf7_name;
-
+	
 	folder->summary = camel_imap4_summary_new (folder);
 	imap4_folder->cachedir = imap4_store_build_filename (store, folder->full_name);
 	g_mkdir_with_parents (imap4_folder->cachedir, 0777);
-
+	
 	imap4_folder->cache = camel_data_cache_new (imap4_folder->cachedir, 0, NULL);
-
+	
 	path = imap4_get_summary_filename (imap4_folder->cachedir);
 	camel_folder_summary_set_filename (folder->summary, path);
 	g_free (path);
-
+	
 	path = imap4_get_journal_filename (imap4_folder->cachedir);
 	imap4_folder->journal = camel_imap4_journal_new (imap4_folder, path);
 	g_free (path);
-
+	
 	path = g_build_filename (imap4_folder->cachedir, "cmeta", NULL);
 	camel_object_set (folder, NULL, CAMEL_OBJECT_STATE_FILE, path, NULL);
 	g_free (path);
-
+	
 	if (camel_object_state_read (folder) == -1) {
 		/* set our defaults */
 		imap4_folder->enable_mlist = TRUE;
 	}
-
+	
 	if (!g_ascii_strcasecmp (full_name, "INBOX")) {
 		if (camel_url_get_param (((CamelService *) store)->url, "filter"))
 			folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
@@ -379,18 +379,18 @@
 		if (camel_url_get_param (((CamelService *) store)->url, "filter_junk"))
 			folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK;
 	}
-
+	
 	imap4_folder->search = camel_imap4_search_new (((CamelIMAP4Store *) store)->engine, imap4_folder->cachedir);
-
+	
 	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL) {
 		/* we don't care if the summary loading fails here */
 		camel_folder_summary_load (folder->summary);
-
+		
 		if (camel_imap4_engine_select_folder (((CamelIMAP4Store *) store)->engine, folder, ex) == -1) {
 			camel_object_unref (folder);
 			folder = NULL;
 		}
-
+		
 		if (folder && camel_imap4_summary_flush_updates (folder->summary, ex) == -1) {
 			camel_object_unref (folder);
 			folder = NULL;
@@ -401,12 +401,12 @@
 			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
 					      _("Cannot access folder `%s': %s"),
 					      full_name, g_strerror (ENOENT));
-
+			
 			camel_object_unref (folder);
 			folder = NULL;
 		}
 	}
-
+	
 	return folder;
 }
 
@@ -437,23 +437,23 @@
 	CamelIMAP4Command *ic;
 	int i, id, retval = 0;
 	char *set = NULL;
-
+	
 	for (i = 0; i < infos->len; ) {
 		i += camel_imap4_get_uid_set (engine, folder->summary, infos, i, 30 + strlen (flag), &set);
-
+		
 		ic = camel_imap4_engine_queue (engine, folder, "UID STORE %s %cFLAGS.SILENT (%s)\r\n", set, onoff, flag);
 		while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 			;
-
+		
 		g_free (set);
-
+		
 		if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
 			camel_exception_xfer (ex, &ic->ex);
 			camel_imap4_command_unref (ic);
-
+			
 			return -1;
 		}
-
+		
 		switch (ic->result) {
 		case CAMEL_IMAP4_RESULT_NO:
 			/* FIXME: would be good to save the NO reason into the err message */
@@ -469,13 +469,13 @@
 			retval = -1;
 			break;
 		}
-
+		
 		camel_imap4_command_unref (ic);
-
+		
 		if (retval == -1)
 			return -1;
 	}
-
+	
 	return 0;
 }
 
@@ -488,15 +488,15 @@
 	flags_diff_t diff;
 	int retval = 0;
 	int i, j;
-
+	
 	on_set = g_ptr_array_new ();
 	off_set = g_ptr_array_new ();
-
+	
 	/* construct commands to sync system and user flags */
 	for (i = 0; i < G_N_ELEMENTS (imap4_flags); i++) {
 		if (!(imap4_flags[i].flag & folder->permanent_flags))
 			continue;
-
+		
 		for (j = 0; j < sync->len; j++) {
 			iinfo = (CamelIMAP4MessageInfo *) (info = sync->pdata[j]);
 			camel_imap4_flags_diff (&diff, iinfo->server_flags, iinfo->info.flags);
@@ -508,34 +508,34 @@
 				}
 			}
 		}
-
+		
 		if (on_set->len > 0) {
 			if ((retval = imap4_sync_flag (folder, on_set, '+', imap4_flags[i].name, ex)) == -1)
 				break;
-
+			
 			g_ptr_array_set_size (on_set, 0);
 		}
-
+		
 		if (off_set->len > 0) {
 			if ((retval = imap4_sync_flag (folder, off_set, '-', imap4_flags[i].name, ex)) == -1)
 				break;
-
+			
 			g_ptr_array_set_size (off_set, 0);
 		}
 	}
-
+	
 	g_ptr_array_free (on_set, TRUE);
 	g_ptr_array_free (off_set, TRUE);
-
+	
 	if (retval == -1)
 		return-1;
-
+	
 	for (i = 0; i < sync->len; i++) {
 		iinfo = (CamelIMAP4MessageInfo *) (info = sync->pdata[i]);
 		iinfo->info.flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
 		iinfo->server_flags = iinfo->info.flags & folder->permanent_flags;
 	}
-
+	
 	return 0;
 }
 
@@ -551,12 +551,12 @@
 	GPtrArray *sync;
 	int id, max, i;
 	int retval;
-
+	
 	if (offline->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return;
-
+	
 	CAMEL_SERVICE_REC_LOCK (folder->parent_store, connect_lock);
-
+	
 	/* gather a list of changes to sync to the server */
 	if (folder->permanent_flags) {
 		sync = g_ptr_array_new ();
@@ -566,7 +566,7 @@
 			if (iinfo->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) {
 				camel_imap4_flags_diff (&diff, iinfo->server_flags, iinfo->info.flags);
 				diff.changed &= folder->permanent_flags;
-
+				
 				/* weed out flag changes that we can't sync to the server */
 				if (!diff.changed)
 					camel_message_info_free(info);
@@ -576,27 +576,27 @@
 				camel_message_info_free(info);
 			}
 		}
-
+		
 		if (sync->len > 0) {
 			retval = imap4_sync_changes (folder, sync, ex);
-
+			
 			for (i = 0; i < sync->len; i++)
 				camel_message_info_free(sync->pdata[i]);
-
+			
 			g_ptr_array_free (sync, TRUE);
-
+			
 			if (retval == -1)
 				goto done;
 		} else {
 			g_ptr_array_free (sync, TRUE);
 		}
 	}
-
+	
 	if (expunge && !((CamelIMAP4Folder *) folder)->read_only) {
 		ic = camel_imap4_engine_queue (engine, folder, "EXPUNGE\r\n");
 		while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 			;
-
+		
 		switch (ic->result) {
 		case CAMEL_IMAP4_RESULT_OK:
 			camel_imap4_summary_flush_updates (folder->summary, ex);
@@ -613,16 +613,16 @@
 					      folder->full_name);
 			break;
 		}
-
+		
 		camel_imap4_command_unref (ic);
 	} else {
 		camel_imap4_summary_flush_updates (folder->summary, ex);
 	}
-
+	
 	camel_folder_summary_save (folder->summary);
-
+	
  done:
-
+	
 	CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 }
 
@@ -640,35 +640,35 @@
 	CamelFolder *selected = (CamelFolder *) engine->folder;
 	CamelIMAP4Command *ic;
 	int id;
-
+	
 	if (offline->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return;
-
+	
 	CAMEL_SERVICE_REC_LOCK (folder->parent_store, connect_lock);
-
+	
 	if (folder != selected) {
 		if (camel_imap4_engine_select_folder (engine, folder, ex) == -1)
 			goto done;
-
+		
 		((CamelIMAP4Summary *) folder->summary)->update_flags = TRUE;
 	} else {
 		ic = camel_imap4_engine_queue (engine, NULL, "NOOP\r\n");
 		while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 			;
-
+		
 		if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE)
 			camel_exception_xfer (ex, &ic->ex);
-
+		
 		camel_imap4_command_unref (ic);
-
+		
 		if (camel_exception_is_set (ex))
 			goto done;
 	}
-
+	
 	camel_imap4_summary_flush_updates (folder->summary, ex);
-
+	
  done:
-
+	
 	CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 }
 
@@ -682,51 +682,51 @@
 	CamelMessageInfo *info;
 	CamelMimeFilter *crlf;
 	guint32 flags;
-
+	
 	if (camel_imap4_engine_next_token (engine, token, ex) == -1)
 		return -1;
-
+	
 	/* parse the FETCH response list */
 	if (token->token != '(') {
 		camel_imap4_utils_set_unexpected_token_error (ex, engine, token);
 		return -1;
 	}
-
+	
 	do {
 		if (camel_imap4_engine_next_token (engine, token, ex) == -1)
 			goto exception;
 
 		if (token->token == ')' || token->token == '\n')
 			break;
-
+		
 		if (token->token != CAMEL_IMAP4_TOKEN_ATOM)
 			goto unexpected;
-
+		
 		if (!strcmp (token->v.atom, "BODY[")) {
 			if (camel_imap4_engine_next_token (engine, token, ex) == -1)
 				goto exception;
-
+			
 			if (token->token != ']')
 				goto unexpected;
-
+			
 			if (camel_imap4_engine_next_token (engine, token, ex) == -1)
 				goto exception;
-
+			
 			if (token->token != CAMEL_IMAP4_TOKEN_LITERAL)
 				goto unexpected;
-
+			
 			fstream = (CamelStream *) camel_stream_filter_new_with_stream (stream);
 			crlf = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
 			camel_stream_filter_add ((CamelStreamFilter *) fstream, crlf);
 			camel_object_unref (crlf);
-
+			
 			camel_stream_write_to_stream ((CamelStream *) engine->istream, fstream);
 			camel_stream_flush (fstream);
 			camel_object_unref (fstream);
 		} else if (!strcmp (token->v.atom, "UID")) {
 			if (camel_imap4_engine_next_token (engine, token, ex) == -1)
 				goto exception;
-
+			
 			if (token->token != CAMEL_IMAP4_TOKEN_NUMBER || token->v.number == 0)
 				goto unexpected;
 		} else if (!strcmp (token->v.atom, "FLAGS")) {
@@ -734,17 +734,17 @@
 			 * given to us if another client recently changed the flags... */
 			if (camel_imap4_parse_flags_list (engine, &flags, ex) == -1)
 				goto exception;
-
+			
 			if ((info = camel_folder_summary_index (summary, index - 1))) {
 				iinfo = (CamelIMAP4MessageInfo *) info;
 				iinfo->info.flags = camel_imap4_merge_flags (iinfo->server_flags, iinfo->info.flags, flags);
 				iinfo->server_flags = flags;
-
+				
 				changes = camel_folder_change_info_new ();
 				camel_folder_change_info_change_uid (changes, camel_message_info_uid (info));
 				camel_object_trigger_event (engine->folder, "folder_changed", changes);
 				camel_folder_change_info_free (changes);
-
+				
 				camel_message_info_free(info);
 			}
 		} else {
@@ -752,20 +752,20 @@
 			d(fprintf (stderr, "huh? %s?...\n", token->v.atom));
 		}
 	} while (1);
-
+	
 	if (token->token != ')') {
 		d(fprintf (stderr, "expected ')' to close untagged FETCH response\n"));
 		goto unexpected;
 	}
-
+	
 	return 0;
-
+	
  unexpected:
-
+	
 	camel_imap4_utils_set_unexpected_token_error (ex, engine, token);
-
+	
  exception:
-
+	
 	return -1;
 }
 
@@ -779,12 +779,12 @@
 	CamelStream *stream, *cache;
 	CamelIMAP4Command *ic;
 	int id;
-
+	
 	CAMEL_SERVICE_REC_LOCK (folder->parent_store, connect_lock);
-
+	
 	if (imap4_folder->cache && (stream = camel_data_cache_get (imap4_folder->cache, "cache", uid, ex))) {
 		message = camel_mime_message_new ();
-
+		
 		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
 			if (errno == EINTR) {
 				CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
@@ -799,22 +799,22 @@
 				message = NULL;
 			}
 		}
-
+		
 		camel_object_unref (stream);
 	}
-
+	
 	if (message != NULL) {
 		CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 		return message;
 	}
-
+	
 	if (offline->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
 		CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 				     _("This message is not available in offline mode."));
 		return NULL;
 	}
-
+	
 	/* Note: While some hard-core IMAP extremists are probably
 	 * going to flame me for fetching entire messages here, it's
 	 * the *only* sure-fire way of working with all IMAP
@@ -835,24 +835,24 @@
 	ic = camel_imap4_engine_queue (engine, folder, "UID FETCH %s BODY.PEEK[]\r\n", uid);
 	camel_imap4_command_register_untagged (ic, "FETCH", untagged_fetch);
 	ic->user_data = stream = camel_stream_mem_new ();
-
+	
 	while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 		;
-
+	
 	if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
 		camel_exception_xfer (ex, &ic->ex);
 		camel_imap4_command_unref (ic);
 		camel_object_unref (stream);
 		goto done;
 	}
-
+	
 	switch (ic->result) {
 	case CAMEL_IMAP4_RESULT_OK:
 		camel_stream_reset (stream);
 		message = camel_mime_message_new ();
 		camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream);
 		camel_stream_reset (stream);
-
+		
 		/* cache the message locally */
 		if (imap4_folder->cache && (cache = camel_data_cache_add (imap4_folder->cache, "cache", uid, NULL))) {
 			if (camel_stream_write_to_stream (stream, cache) == -1
@@ -860,7 +860,7 @@
 				camel_data_cache_remove (imap4_folder->cache, "cache", uid, NULL);
 			camel_object_unref (cache);
 		}
-
+		
 		break;
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
@@ -874,15 +874,15 @@
 				      uid, folder->full_name);
 		break;
 	}
-
+	
 	camel_imap4_command_unref (ic);
-
+	
 	camel_object_unref (stream);
-
+	
  done:
-
+	
 	CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
-
+	
 	return message;
 }
 
@@ -908,51 +908,51 @@
 	char date[50];
 	struct tm tm;
 	int id, i;
-
+	
 	if (appended_uid)
 		*appended_uid = NULL;
-
+	
 	if (((CamelIMAP4Folder *) folder)->read_only) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to folder `%s': Folder is read-only"),
 				      folder->full_name);
 		return;
 	}
-
+	
 	if (offline->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
 		camel_imap4_journal_append ((CamelIMAP4Journal *) imap4_folder->journal, message, info, appended_uid, ex);
 		return;
 	}
-
+	
 	CAMEL_SERVICE_REC_LOCK (folder->parent_store, connect_lock);
-
+	
 	/* construct the option flags list */
 	if (iinfo->info.flags & folder->permanent_flags) {
 		p = g_stpcpy (flags, " (");
-
+		
 		for (i = 0; i < G_N_ELEMENTS (imap4_flags); i++) {
 			if ((iinfo->info.flags & imap4_flags[i].flag) & folder->permanent_flags) {
 				p = g_stpcpy (p, imap4_flags[i].name);
 				*p++ = ' ';
 			}
 		}
-
+		
 		p[-1] = ')';
 		*p = '\0';
 	} else {
 		flags[0] = '\0';
 	}
-
+	
 	/* construct the optional date_time string */
 	if (iinfo->info.date_received > (time_t) 0) {
 		int tzone;
-
+		
 #ifdef HAVE_LOCALTIME_R
 		localtime_r (&iinfo->info.date_received, &tm);
 #else
 		memcpy (&tm, localtime (&iinfo->info.date_received), sizeof (tm));
 #endif
-
+		
 #if defined (HAVE_TM_GMTOFF)
 		tzone = -tm.tm_gmtoff;
 #elif defined (HAVE_TIMEZONE)
@@ -968,33 +968,33 @@
 #else
 #error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.
 #endif
-
+		
 		sprintf (date, " \"%02d-%s-%04d %02d:%02d:%02d %+05d\"",
 			 tm.tm_mday, tm_months[tm.tm_mon], tm.tm_year + 1900,
 			 tm.tm_hour, tm.tm_min, tm.tm_sec, tzone);
 	} else {
 		date[0] = '\0';
 	}
-
+	
  retry:
-
+	
 	ic = camel_imap4_engine_queue (engine, NULL, "APPEND %F%s%s %L\r\n", folder, flags, date, message);
-
+	
 	while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 		;
-
+	
 	if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
 		camel_exception_xfer (ex, &ic->ex);
 		camel_imap4_command_unref (ic);
 		CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 		return;
 	}
-
+	
 	switch (ic->result) {
 	case CAMEL_IMAP4_RESULT_OK:
 		if (!appended_uid || !(engine->capa & CAMEL_IMAP4_CAPABILITY_UIDPLUS))
 			break;
-
+		
 		for (i = 0; i < ic->resp_codes->len; i++) {
 			resp = ic->resp_codes->pdata[i];
 			if (resp->code == CAMEL_IMAP4_RESP_CODE_APPENDUID) {
@@ -1009,44 +1009,44 @@
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to folder `%s': Unknown error"),
 				      folder->full_name);
-
+		
 		for (i = 0; i < ic->resp_codes->len; i++) {
 			resp = ic->resp_codes->pdata[i];
 			if (resp->code == CAMEL_IMAP4_RESP_CODE_TRYCREATE) {
 				char *parent_name, *p;
-
+				
 				parent_name = g_alloca (strlen (folder->full_name) + 1);
 				strcpy (parent_name, folder->full_name);
 				if (!(p = strrchr (parent_name, '/')))
 					*parent_name = '\0';
 				else
 					*p = '\0';
-
+				
 				if (!(fi = camel_store_create_folder (folder->parent_store, parent_name, folder->name, &lex))) {
 					camel_exception_clear (&lex);
 					break;
 				}
-
+				
 				camel_store_free_folder_info (folder->parent_store, fi);
 				camel_imap4_command_unref (ic);
 				camel_exception_clear (ex);
 				goto retry;
 			}
 		}
-
+		
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to folder `%s': Bad command"),
 				      folder->full_name);
-
+		
 		break;
 	default:
 		g_assert_not_reached ();
 	}
-
+	
 	camel_imap4_command_unref (ic);
-
+	
 	CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 }
 
@@ -1055,13 +1055,13 @@
 info_uid_sort (const CamelMessageInfo **info0, const CamelMessageInfo **info1)
 {
 	guint32 uid0, uid1;
-
+	
 	uid0 = strtoul (camel_message_info_uid (*info0), NULL, 10);
 	uid1 = strtoul (camel_message_info_uid (*info1), NULL, 10);
-
+	
 	if (uid0 == uid1)
 		return 0;
-
+	
 	return uid0 < uid1 ? -1 : 1;
 }
 
@@ -1077,81 +1077,81 @@
 	CamelException lex;
 	GPtrArray *infos;
 	char *set;
-
+	
 	if (transferred_uids)
 		*transferred_uids = NULL;
-
+	
 	camel_exception_init (&lex);
 	imap4_sync (src, FALSE, &lex);
 	if (camel_exception_is_set (&lex)) {
 		camel_exception_xfer (ex, &lex);
 		return;
 	}
-
+	
 	infos = g_ptr_array_new ();
 	for (i = 0; i < uids->len; i++) {
 		if (!(info = camel_folder_summary_uid (src->summary, uids->pdata[i])))
 			continue;
-
+		
 		g_ptr_array_add (infos, info);
 	}
-
+	
 	if (infos->len == 0) {
 		g_ptr_array_free (infos, TRUE);
 		return;
 	}
-
+	
 	g_ptr_array_sort (infos, (GCompareFunc) info_uid_sort);
-
+	
 	CAMEL_SERVICE_REC_LOCK (src->parent_store, connect_lock);
-
+	
 	/* check for offline operation */
 	if (offline->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
 		CamelIMAP4Journal *journal = (CamelIMAP4Journal *) ((CamelIMAP4Folder *) dest)->journal;
 		CamelMimeMessage *message;
-
+		
 		for (i = 0; i < infos->len; i++) {
 			info = infos->pdata[i];
-
+			
 			if (!(message = imap4_get_message (src, camel_message_info_uid (info), ex)))
 				break;
-
+			
 			camel_imap4_journal_append (journal, message, info, NULL, ex);
 			camel_object_unref (message);
-
+			
 			if (camel_exception_is_set (ex))
 				break;
-
+			
 			if (move)
 				camel_folder_set_message_flags (src, camel_message_info_uid (info),
 								CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
 		}
-
+		
 		goto done;
 	}
-
+	
 	dest_namelen = strlen (camel_imap4_folder_utf7_name ((CamelIMAP4Folder *) dest));
-
+	
 	for (i = 0; i < infos->len; i += n) {
 		n = camel_imap4_get_uid_set (engine, src->summary, infos, i, 10 + dest_namelen, &set);
-
+		
 		if (move && (engine->capa & CAMEL_IMAP4_CAPABILITY_XGWMOVE))
 			ic = camel_imap4_engine_queue (engine, src, "UID XGWMOVE %s %F\r\n", set, dest);
 		else
 			ic = camel_imap4_engine_queue (engine, src, "UID COPY %s %F\r\n", set, dest);
-
+		
 		while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 			;
-
+		
 		g_free (set);
-
+		
 		if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
 			camel_exception_xfer (ex, &ic->ex);
 			camel_imap4_command_unref (ic);
 			g_free (set);
 			goto done;
 		}
-
+		
 		switch (ic->result) {
 		case CAMEL_IMAP4_RESULT_NO:
 			/* FIXME: would be good to save the NO reason into the err message */
@@ -1164,7 +1164,7 @@
 						      _("Cannot copy messages from folder `%s' to folder `%s': Unknown"),
 						      src->full_name, dest->full_name);
 			}
-
+			
 			goto done;
 		case CAMEL_IMAP4_RESULT_BAD:
 			if (move) {
@@ -1176,29 +1176,29 @@
 						      _("Cannot copy messages from folder `%s' to folder `%s': Bad command"),
 						      src->full_name, dest->full_name);
 			}
-
+			
 			goto done;
 		}
-
+		
 		camel_imap4_command_unref (ic);
-
+		
 		if (move && !(engine->capa & CAMEL_IMAP4_CAPABILITY_XGWMOVE)) {
 			for (j = i; j < n; j++) {
 				info = infos->pdata[j];
 				camel_folder_set_message_flags (src, camel_message_info_uid (info),
 								CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
 			}
-
+			
 			camel_folder_summary_touch (src->summary);
 		}
 	}
-
+	
  done:
-
+	
 	for (i = 0; i < infos->len; i++)
 		camel_message_info_free (infos->pdata[i]);
 	g_ptr_array_free (infos, TRUE);
-
+	
 	CAMEL_SERVICE_REC_UNLOCK (src->parent_store, connect_lock);
 }
 
@@ -1207,14 +1207,14 @@
 {
 	CamelIMAP4Folder *imap4_folder = (CamelIMAP4Folder *) folder;
 	GPtrArray *matches;
-
+	
 	CAMEL_SERVICE_REC_LOCK(folder->parent_store, connect_lock);
-
+	
 	camel_folder_search_set_folder (imap4_folder->search, folder);
 	matches = camel_folder_search_search (imap4_folder->search, expr, NULL, ex);
-
+	
 	CAMEL_SERVICE_REC_UNLOCK(folder->parent_store, connect_lock);
-
+	
 	return matches;
 }
 
@@ -1223,17 +1223,17 @@
 {
 	CamelIMAP4Folder *imap4_folder = (CamelIMAP4Folder *) folder;
 	GPtrArray *matches;
-
+	
 	if (uids->len == 0)
 		return g_ptr_array_new ();
-
+	
 	CAMEL_SERVICE_REC_LOCK(folder->parent_store, connect_lock);
-
+	
 	camel_folder_search_set_folder (imap4_folder->search, folder);
 	matches = camel_folder_search_search (imap4_folder->search, expr, uids, ex);
-
+	
 	CAMEL_SERVICE_REC_UNLOCK(folder->parent_store, connect_lock);
-
+	
 	return matches;
 }
 
@@ -1241,12 +1241,12 @@
 imap4_search_free (CamelFolder *folder, GPtrArray *uids)
 {
 	CamelIMAP4Folder *imap4_folder = (CamelIMAP4Folder *) folder;
-
+	
 	g_return_if_fail (imap4_folder->search);
-
+	
 	CAMEL_SERVICE_REC_LOCK(folder->parent_store, connect_lock);
-
+	
 	camel_folder_search_free_result (imap4_folder->search, uids);
-
+	
 	CAMEL_SERVICE_REC_UNLOCK(folder->parent_store, connect_lock);
 }



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