From c66a38af5fd0147dd45be409e3bfe4afbd6e409a Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Fri, 20 Apr 2001 14:32:32 +0000
Subject: Convert subject from utf8 before passing it on.

	* mail-ops.c: (send_mail_desc): Convert subject from utf8
	before passing it on.

svn path=/trunk/; revision=9474
---
 mail/ChangeLog  |  5 +++++
 mail/mail-ops.c | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e1583f3e79..d4bed1ea05 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-20  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* mail-ops.c: (send_mail_desc): Convert subject from utf8
+	before passing it on.
+
 2001-04-20  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* mail-display.c: #if 0'd out my not-working selection code
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index c97144e1e0..348cb72206 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -32,6 +32,7 @@
 /* #include <ctype.h> */
 #include <errno.h>
 #include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
 #include <camel/camel-mime-filter-from.h>
 #include <camel/camel-operation.h>
 #include "mail.h"
@@ -580,12 +581,19 @@ struct _send_mail_msg {
 static char *send_mail_desc(struct _mail_msg *mm, int done)
 {
 	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	const char *subject;
+	char *subject;
+	const char *subject_utf8;
+	
+	subject_utf8 = camel_mime_message_get_subject(m->message);
+	
+	if (subject_utf8) {
+		char *desc;
 
-	subject = camel_mime_message_get_subject(m->message);
-	if (subject && subject[0])
-		return g_strdup_printf (_("Sending \"%s\""), subject);
-	else
+		subject = e_utf8_to_locale_string (subject_utf8);
+		desc = g_strdup_printf (_("Sending \"%s\""), subject);
+		g_free (subject);
+		return desc;
+	} else
 		return g_strdup(_("Sending message"));
 }
 
-- 
cgit