evolution-data-server r9903 - trunk/camel/providers/local

[sragavan svn gnome org]

Author: sragavan
Date: Mon Jan 12 03:25:38 2009
New Revision: 9903
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9903&view=rev

Log:
2009-01-12  Srinivasa Ragavan  <sragavan novell com>

	* camel-mbox-folder.c: (mbox_get_message): Fix for better flag sync.
	Always send XEV headers with messages.




Modified:
   trunk/camel/providers/local/ChangeLog
   trunk/camel/providers/local/camel-mbox-folder.c

Modified: trunk/camel/providers/local/camel-mbox-folder.c
==============================================================================
--- trunk/camel/providers/local/camel-mbox-folder.c	(original)
+++ trunk/camel/providers/local/camel-mbox-folder.c	Mon Jan 12 03:25:38 2009
@@ -372,10 +372,13 @@
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
 	CamelMimeMessage *message = NULL;
 	CamelMboxMessageInfo *info;
+	CamelMessageInfoBase *mi = (CamelMessageInfoBase *)info;
+	char *xev;
 	CamelMimeParser *parser = NULL;
 	int fd, retval;
 	int retried = FALSE;
 	off_t frompos;
+	guint32 flags;
 
 	d(printf("Getting message %s\n", uid));
 
@@ -475,6 +478,14 @@
 		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf->changes);
 		camel_folder_change_info_clear(lf->changes);
 	}
-	
+
+	/* Give out messages always with XEV. */
+	flags = mi->flags;
+	mi->flags &= ~(CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED);
+	xev = camel_local_summary_encode_x_evolution(folder->summary, mi);
+	camel_medium_set_header((CamelMedium *)message, "X-Evolution", xev);
+	g_free(xev);
+	mi->flags = flags;
+
 	return message;
 }