emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* fix some of the merge fallout

This commit is contained in:
Dirk-Jan C. Binnema 2011-05-18 22:20:39 +03:00
parent 6820bbf0ca
commit 0f20ce6273
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mu-msg-file.c
View File

@ -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;
}

2
src/tests/test-mu-msg.c
View File

@ -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);