Re: [evolution-patches] strftime fixes for the mailer

[Jeffrey Stedfast <fejj ximian com>]

oops, that last diff'd function should not be in there... that is
leftover from me trying to locate some bug or another.

here's the new diff.

On Fri, 2003-06-27 at 14:47, Jeffrey Stedfast wrote:
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 42630.patch
? crash.txt
? mb.patch
? message-tree.c
? message-tree.h
? strftime-fixes.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2761
diff -u -r1.2761 ChangeLog
--- ChangeLog	25 Jun 2003 16:54:16 -0000	1.2761
+++ ChangeLog	27 Jun 2003 18:48:52 -0000
@@ -1,3 +1,15 @@
+2003-06-27  Jeffrey Stedfast  <fejj ximian com>
+
+	* message-list.c (filter_date): Use the newer utf8 versions of the
+	e_strftime*() functions since our format strings are all now in
+	UTF-8.
+
+	* mail-display.c (mail_display_render): Use the newer
+	e_utf8_strftime_fix_am_pm().
+
+	* mail-callbacks.c (mail_generate_reply): Use e_utf8_strftime(),
+	otherwise we can end up with invalid utf-8.
+
 2003-06-25  Radek Doulik  <rodo ximian com>
 
 	* mail-config.c (config_write_style): provide hardcoded default
Index: mail-callbacks.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-callbacks.c,v
retrieving revision 1.447
diff -u -r1.447 mail-callbacks.c
--- mail-callbacks.c	25 Jun 2003 08:25:02 -0000	1.447
+++ mail-callbacks.c	27 Jun 2003 18:48:54 -0000
@@ -1190,7 +1190,7 @@
 		}
 		
 		date = camel_mime_message_get_date (message, NULL);
-		strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), localtime (&date));
+		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);
 		mail_ignore (composer, name, address);
 		if (text) {
Index: mail-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-display.c,v
retrieving revision 1.282
diff -u -r1.282 mail-display.c
--- mail-display.c	11 Jun 2003 16:19:34 -0000	1.282
+++ mail-display.c	27 Jun 2003 18:48:55 -0000
@@ -1888,7 +1888,7 @@
 			
 			localtime_r (&target_date, &due);
 			
-			e_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
+			e_utf8_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
 		} else {
 			due_date[0] = '\0';
 		}
Index: message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.346
diff -u -r1.346 message-list.c
--- message-list.c	25 Jun 2003 15:59:00 -0000	1.346
+++ message-list.c	27 Jun 2003 18:48:56 -0000
@@ -1076,7 +1076,7 @@
 	if (then.tm_mday == now.tm_mday &&
 	    then.tm_mon == now.tm_mon &&
 	    then.tm_year == now.tm_year) {
-		e_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then);
+		e_utf8_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then);
 		done = TRUE;
 	}
 	if (!done) {
@@ -1085,7 +1085,7 @@
 		if (then.tm_mday == yesterday.tm_mday &&
 		    then.tm_mon == yesterday.tm_mon &&
 		    then.tm_year == yesterday.tm_year) {
-			e_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then);
+			e_utf8_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then);
 			done = TRUE;
 		}
 	}
@@ -1097,7 +1097,7 @@
 			if (then.tm_mday == yesterday.tm_mday &&
 			    then.tm_mon == yesterday.tm_mon &&
 			    then.tm_year == yesterday.tm_year) {
-				e_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then);
+				e_utf8_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then);
 				done = TRUE;
 				break;
 			}
@@ -1105,9 +1105,9 @@
 	}
 	if (!done) {
 		if (then.tm_year == now.tm_year) {
-			e_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then);
+			e_utf8_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then);
 		} else {
-			e_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then);
+			e_utf8_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then);
 		}
 	}
 #if 0