evolution-data-server r9214 - branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi

[jjohnny svn gnome org]

Author: jjohnny
Date: Mon Jul 28 20:55:18 2008
New Revision: 9214
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9214&view=rev

Log:
Cache cleanups.


Modified:
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c	Mon Jul 28 20:55:18 2008
@@ -295,36 +295,15 @@
 		if (!strcmp (folder->full_name, "Junk Mail"))
 			continue;
 
-		/******************** Begine Caching ************************/
-		//add to cache if its a new message
-		t_cache_stream  = camel_data_cache_get (mapi_folder->cache, "cache", msg_uid, ex);
-		if (t_cache_stream) {
-			camel_object_unref (t_cache_stream);
-
-			mail_msg = mapi_folder_item_to_msg (folder, item, ex);
-
-			CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
-			if ((cache_stream = camel_data_cache_add (mapi_folder->cache, "cache", msg_uid, NULL))) {
-				if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *) mail_msg, 	cache_stream) == -1 || camel_stream_flush (cache_stream) == -1)
-					camel_data_cache_remove (mapi_folder->cache, "cache", msg_uid, NULL);
-				camel_object_unref (cache_stream);
-			}
-
-			camel_object_unref (mail_msg);
-			CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
-		}
-		/******************** Caching stuff ends *************************/
 		g_free (msg_uid);
 		i++;
 	}
 	camel_operation_end (NULL);
-	//	g_free (container_id);
+
 	g_string_free (str, TRUE);
 	camel_object_trigger_event (folder, "folder_changed", changes);
 
 	camel_folder_change_info_free (changes);
-	//TASK 2.
-
 }
 
 static void 

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c	Mon Jul 28 20:55:18 2008
@@ -149,44 +149,59 @@
 }
 
 static int
-mapi_summary_header_load (CamelFolderSummary *summary, FILE *out) 
+mapi_summary_header_load (CamelFolderSummary *summary, FILE *in) 
 {
-	//TODO 
+	if (camel_mapi_summary_parent->summary_header_load (summary, in) == -1)
+		return -1 ;
+
 	return 0;
 }
 static int 
 mapi_summary_header_save (CamelFolderSummary *summary, FILE *out) 
 {
-	//TODO
+	if (camel_mapi_summary_parent->summary_header_save (summary, out) == -1)
+		return -1;
+
 	return 0;
 }
 
 static CamelMessageInfo*
 mapi_message_info_load (CamelFolderSummary *s, FILE *in) 
 {
-	//TODO
-	return NULL;
+	CamelMessageInfo *info ;
+
+	info = camel_mapi_summary_parent->message_info_load(s,in) ;
+
+	return info ;
 }
 
 static int 
 mapi_message_info_save (CamelFolderSummary *s, FILE *out, CamelMessageInfo *info) 
 {
-	//TODO
+	if (camel_mapi_summary_parent->message_info_save (s, out, info) == -1)
+		return -1;
+
 	return 0;
 }
 
 static CamelMessageContentInfo* 
 mapi_content_info_load (CamelFolderSummary *s, FILE *in) 
 {
-	//TODO
-	return NULL;
+
+	if (fgetc (in))
+		return camel_mapi_summary_parent->content_info_load (s, in);
+	else
+		return camel_folder_summary_content_info_new (s);
 }
 
 static int
 mapi_content_info_save (CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *info)
 {
-	//TODO
-	return 0;
+	if (info->type) {
+		fputc (1, out);
+		return camel_mapi_summary_parent->content_info_save (s, out, info);
+	} else
+		return fputc (0, out);
 }
 
 void