From 0f20ce6273e0c46b5870ce46e5f60fba4da16e39 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 18 May 2011 22:20:39 +0300 Subject: [PATCH] * fix some of the merge fallout --- src/mu-msg-file.c | 16 +++++++++------- src/tests/test-mu-msg.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mu-msg-file.c b/src/mu-msg-file.c index 96563eb1..f7e363ec 100644 --- a/src/mu-msg-file.c +++ b/src/mu-msg-file.c @@ -181,18 +181,20 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err) static char* get_recipient (MuMsgFile *self, GMimeRecipientType rtype) { - char *recep; - InternetAddressList *receps; + char *recip; + InternetAddressList *recips; - receps = g_mime_message_get_recipients (self->_mime_msg, rtype); - recep = (char*)internet_address_list_to_string (receps, TRUE); + recips = g_mime_message_get_recipients (self->_mime_msg, rtype); + + /* FALSE --> don't encode */ + recip = (char*)internet_address_list_to_string (recips, FALSE); - if (mu_str_is_empty(recep)) { - g_free (recep); + if (mu_str_is_empty(recip)) { + g_free (recip); return NULL; } - return recep; + return recip; } diff --git a/src/tests/test-mu-msg.c b/src/tests/test-mu-msg.c index 7ee3bef1..5832d43b 100644 --- a/src/tests/test-mu-msg.c +++ b/src/tests/test-mu-msg.c @@ -219,7 +219,7 @@ test_mu_msg_05 (void) { MuMsg *msg; - msg = mu_msg_new (MU_TESTMAILDIR + msg = mu_msg_new_from_file (MU_TESTMAILDIR "cur/1305664394.2171_402.cthulhu!2,", NULL, NULL);