mirror of https://github.com/djcb/mu.git
* fix some of the merge fallout
This commit is contained in:
parent
6820bbf0ca
commit
0f20ce6273
|
@ -181,18 +181,20 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
|
||||||
static char*
|
static char*
|
||||||
get_recipient (MuMsgFile *self, GMimeRecipientType rtype)
|
get_recipient (MuMsgFile *self, GMimeRecipientType rtype)
|
||||||
{
|
{
|
||||||
char *recep;
|
char *recip;
|
||||||
InternetAddressList *receps;
|
InternetAddressList *recips;
|
||||||
|
|
||||||
receps = g_mime_message_get_recipients (self->_mime_msg, rtype);
|
recips = g_mime_message_get_recipients (self->_mime_msg, rtype);
|
||||||
recep = (char*)internet_address_list_to_string (receps, TRUE);
|
|
||||||
|
/* FALSE --> don't encode */
|
||||||
|
recip = (char*)internet_address_list_to_string (recips, FALSE);
|
||||||
|
|
||||||
if (mu_str_is_empty(recep)) {
|
if (mu_str_is_empty(recip)) {
|
||||||
g_free (recep);
|
g_free (recip);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return recep;
|
return recip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -219,7 +219,7 @@ test_mu_msg_05 (void)
|
||||||
{
|
{
|
||||||
MuMsg *msg;
|
MuMsg *msg;
|
||||||
|
|
||||||
msg = mu_msg_new (MU_TESTMAILDIR
|
msg = mu_msg_new_from_file (MU_TESTMAILDIR
|
||||||
"cur/1305664394.2171_402.cthulhu!2,",
|
"cur/1305664394.2171_402.cthulhu!2,",
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue