[evolution-mapi/gnome-3-4] Bug #679041 - Incorrect date in Sent Items folder

[Milan Crha <mcrha src gnome org>]

commit ec53ec7add7e66f20a8dfa95ba78cfaa0868eccc
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jul 2 12:18:25 2012 +0200

    Bug #679041 - Incorrect date in Sent Items folder

 src/camel/camel-mapi-folder.c           |    5 ++---
 src/libexchangemapi/e-mapi-mail-utils.c |   10 ++--------
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 1e13e2b..ee65b77 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -613,7 +613,6 @@ gather_object_summary_cb (EMapiConnection *conn,
 			const gchar *subject, *message_id, *references, *in_reply_to, *display_to, *display_cc;
 			const struct FILETIME *delivery_time, *submit_time;
 			const uint32_t *msg_size;
-			gint offset = 0;
 			gchar *formatted_addr, *from_name, *from_email;
 			CamelAddress *to_addr, *cc_addr, *bcc_addr;
 
@@ -637,9 +636,9 @@ gather_object_summary_cb (EMapiConnection *conn,
 			minfo->info.size = msg_size ? *msg_size : 0;
 
 			if (minfo->info.date_sent != 0)
-				minfo->info.date_sent = camel_header_decode_date (ctime (&minfo->info.date_sent), &offset);
+				minfo->info.date_sent = minfo->info.date_sent;
 			if (minfo->info.date_received != 0)
-				minfo->info.date_received = camel_header_decode_date (ctime (&minfo->info.date_received), &offset);
+				minfo->info.date_received = minfo->info.date_received;
 
 			/* Threading related properties */
 			mapi_set_message_id (minfo, message_id);
diff --git a/src/libexchangemapi/e-mapi-mail-utils.c b/src/libexchangemapi/e-mapi-mail-utils.c
index a60e920..48c3cd1 100644
--- a/src/libexchangemapi/e-mapi-mail-utils.c
+++ b/src/libexchangemapi/e-mapi-mail-utils.c
@@ -768,14 +768,8 @@ e_mapi_mail_utils_object_to_message (EMapiConnection *conn, /* const */ EMapiObj
 		msg_date = e_mapi_util_find_array_propval (&object->properties, PidTagClientSubmitTime);
 		if (!msg_date)
 			msg_date = e_mapi_util_find_array_propval (&object->properties, PidTagMessageDeliveryTime);
-		if (msg_date) {
-			time_t msg_date_t, actual_time;
-			gint offset = 0;
-
-			msg_date_t = e_mapi_util_filetime_to_time_t (msg_date);
-			actual_time = camel_header_decode_date (ctime (&msg_date_t), &offset);
-			camel_mime_message_set_date (msg, actual_time, offset);
-		}
+		if (msg_date)
+			camel_mime_message_set_date (msg, e_mapi_util_filetime_to_time_t (msg_date), 0);
 
 		str = e_mapi_util_find_array_propval (&object->properties, PidTagSubject);
 		if (str)