From: Parthasarathi Susarla <sparthasarathi@novell.com>
Date: Thu, 18 Aug 2005 15:42:01 +0000 (+0000)
Subject: ** see bug #312184
X-Git-Tag: upstream/3.7.4~7013
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4ddf218b1fcc1e98e1fab92b7347846827f0da0;p=platform%2Fupstream%2Fevolution-data-server.git

** see bug #312184

2005-08-18  Parthasarathi Susarla <sparthasarathi@novell.com>

	** see bug #312184

	* camel-groupwise-folder.c:
	(gw_update_cache): show signatures inline.
---

diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog
index c08d4ae..601e9bd 100644
--- a/camel/providers/groupwise/ChangeLog
+++ b/camel/providers/groupwise/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-18  Parthasarathi Susarla <sparthasarathi@novell.com>
+	
+	** see bug #312184
+
+	* camel-groupwise-folder.c:
+	(gw_update_cache): show signatures inline.
+
 2005-08-18 Vivek Jain <jvivek@novell.com>
 	
 	* camel-groupwise-store.c: (groupwise_create_folder):
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index d9bdf1d..590835d 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -950,7 +950,7 @@ gw_update_cache ( CamelFolder *folder, GList *item_list,CamelException *ex)
 
 		id = e_gw_item_get_id (temp_item);
 
-		 camel_operation_progress (NULL, (100*i)/total_items);
+		camel_operation_progress (NULL, (100*i)/total_items);
 		cache_stream  = camel_data_cache_get (gw_folder->cache, "cache", id, ex);
 		if (cache_stream) {
 			camel_object_unref (cache_stream);
@@ -1389,13 +1389,19 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
 				}
 				if (attachment && (len !=0) ) {
 					part = camel_mime_part_new ();
+					
+					if (!strcmp (attach->contentType, "application/pgp-signature")) {
+						camel_data_wrapper_set_mime_type(CAMEL_DATA_WRAPPER (multipart), "multipart/signed");
+						camel_content_type_set_param(CAMEL_DATA_WRAPPER (multipart)->mime_type, "protocol", attach->contentType);
+					} else {
+						camel_mime_part_set_content_id (part, attach->id);
+						camel_data_wrapper_set_mime_type(CAMEL_DATA_WRAPPER (multipart), "multipart/digest");
+					}
 
-					camel_data_wrapper_set_mime_type(CAMEL_DATA_WRAPPER (multipart), "multipart/digest");
 					camel_multipart_set_boundary(multipart, NULL);
 
 					camel_mime_part_set_filename(part, g_strdup(attach->name));
 					camel_mime_part_set_content(part, attachment, len, attach->contentType);
-					camel_mime_part_set_content_id (part, attach->id);
 
 					camel_multipart_add_part (multipart, part);