Renamed from mail_html_write_string.

2001-11-01  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-display.h (mail_html_write): Renamed from
	mail_html_write_string.

	* mail-display.c (mail_text_write): Don't bother with varargs
	since nothing used them, we were only passing strings anyway...
	(mail_error_printf): Renamed from mail_error_write, this makes
	more sense.
	(mail_html_write): Removed.

	* mail-format.c: Updated to use gtk_html_stream_printf directly
	and s/mail_html_write_string/mail_html_write.
	(mail_lookup_handler): Don't use %.*s here either...
	(handle_text_enriched): Same.
	(write_one_text_plain_chunk): And finally here (also update for
	new mail_text_write api).
	(handle_multipart_signed): Update for new mail_text_write api.
	(format_mime_part): Update for new mail_error_text/printf name
	change.
	(handle_multipart_encrypted): Same.

	* mail-tools.c (mail_tool_generate_forward_subject): Same as
	mail_generate_reply.

	* mail-callbacks.c (mail_generate_reply): Don't use %.*s in any
	*printf* functions.

svn path=/trunk/; revision=14590

1 files changed, 14 insertions, 4 deletions

diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index ae3fdaad75..789e60cad8 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -945,13 +945,23 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
 		if (!g_strncasecmp (subject, "Re: ", 4))
 			subject = g_strndup (subject, max_subject_length);
 		else {
-			if (strlen (subject) < max_subject_length)
+			if (strlen (subject) < max_subject_length) {
 				subject = g_strdup_printf ("Re: %s", subject);
-			else
-				subject = g_strdup_printf ("Re: %.*s...", max_subject_length, subject);
+			} else {
+				/* We can't use %.*s because it depends on the locale being C/POSIX
+                                   or UTF-8 to work correctly in glibc */
+				char *sub;
+				
+				/*subject = g_strdup_printf ("Re: %.*s...", max_subject_length, subject);*/
+				sub = g_malloc (max_subject_length + 8);
+				memcpy (sub, "Re: ", 4);
+				memcpy (sub + 4, subject, max_subject_length);
+				memcpy (sub + 4 + max_subject_length, "...", 4);
+				subject = sub;
+			}
 		}
 	}
-
+	
 	tov = e_destination_list_to_vector (to);
 	ccv = e_destination_list_to_vector (cc);