Re: [evolution-patches] [resend] Fix date/time in quote attribution.

[David Woodhouse <dwmw2 infradead org>]

On Mon, 2003-08-18 at 11:01 +0100, David Woodhouse wrote:
> ... but answer came there none...
> 
> Breaks string freeze; for -HEAD only.

This time it gets the time right. I hate Mondays.


-- 
dwmw2

--- evolution-1.4.4/mail/mail-callbacks.c~	2003-07-09 17:18:29.000000000 +0100
+++ evolution-1.4.4/mail/mail-callbacks.c	2003-08-15 12:26:57.000000000 +0100
@@ -995,6 +995,7 @@
 	GConfClient *gconf;
 	EIterator *iter;
 	time_t date;
+	int date_ofs;
 	char *url;
 	
 	gconf = mail_config_get_gconf_client ();
@@ -1189,9 +1190,13 @@
 			name = _("an unknown sender");
 		}
 		
-		date = camel_mime_message_get_date (message, NULL);
-		e_utf8_strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), localtime (&date));
-		text = mail_tool_quote_message (message, format, name && *name ? name : address);
+		date = camel_mime_message_get_date (message, &date_ofs);
+		/* Convert to UTC */
+		date += (date_ofs / 100) * 60 * 60;
+		date += (date_ofs % 100) * 60;
+
+		e_utf8_strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"), gmtime (&date));
+		text = mail_tool_quote_message (message, format, date_ofs, name && *name ? name : address);
 		mail_ignore (composer, name, address);
 		if (text) {
 			e_msg_composer_set_body_text (composer, text);