# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1070934915 0
# Node ID 954b986ad3e362f4f3ff448d9e00dacb9e63cd4e
# Parent  061b39119a1b873160cb0f7999e766db8489a704
[gaim-migrate @ 8464]
Email parsing changes from Felipe Contreras (revo):
Currently only MSN send email notifications with MIME
fields, so, only decode MIME fields in MSN.

This makes me feel warm.

committer: Tailor Script <tailor@pidgin.im>

diff -r 061b39119a1b -r 954b986ad3e3 src/gtknotify.c
--- a/src/gtknotify.c	Tue Dec 09 01:20:36 2003 +0000
+++ b/src/gtknotify.c	Tue Dec 09 01:55:15 2003 +0000
@@ -215,17 +215,13 @@
 		char *from_text = NULL, *subject_text = NULL;
 
 		if (froms != NULL) {
-			char *from_decoded = gaim_mime_decode_field(*froms);
 			from_text = g_strdup_printf(
-				_("<span weight=\"bold\">From:</span> %s\n"), from_decoded);
-			g_free(from_decoded);
+				_("<span weight=\"bold\">From:</span> %s\n"), *froms);
 		}
 
 		if (subjects != NULL) {
-			char *subject_decoded = gaim_mime_decode_field(*subjects);
 			subject_text = g_strdup_printf(
-				_("<span weight=\"bold\">Subject:</span> %s\n"), subject_decoded);
-			g_free(subject_decoded);
+				_("<span weight=\"bold\">Subject:</span> %s\n"), *subjects);
 		}
 
 		label_text = g_strdup_printf(
diff -r 061b39119a1b -r 954b986ad3e3 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Tue Dec 09 01:20:36 2003 +0000
+++ b/src/protocols/msn/notification.c	Tue Dec 09 01:55:15 2003 +0000
@@ -2053,7 +2053,7 @@
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
 	GHashTable *table;
-	const char *from, *subject;
+	char *from, *subject;
 
 	if (strcmp(servconn->msg_passport, "Hotmail")) {
 		/* This isn't an official message. */
@@ -2073,12 +2073,15 @@
 
 	table = msn_message_get_hashtable_from_body(msg);
 
-	from    = g_hash_table_lookup(table, "From");
-	subject = g_hash_table_lookup(table, "Subject");
+	from    = gaim_mime_decode_field(g_hash_table_lookup(table, "From"));
+	subject = gaim_mime_decode_field(g_hash_table_lookup(table, "Subject"));
 
 	gaim_notify_email(gc, subject, from, msn_user_get_passport(session->user),
 					  session->passport_info.file, NULL, NULL);
 
+	g_free(from);
+	g_free(subject);
+
 	g_hash_table_destroy(table);
 
 	return TRUE;