alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-contacts, mu-msg-file: better deal with contacts with control chars

Browse Source
This commit is contained in:
djcb
2013-06-24 22:42:18 +03:00
parent 6783e448aa
commit 97909566df
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,12 +173,11 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
return TRUE;
}
static char*
get_recipient (MuMsgFile *self, GMimeRecipientType rtype)
{
char *recip;
InternetAddressList *recips;
char *recip;
InternetAddressList *recips;
recips = g_mime_message_get_recipients (self->_mime_msg, rtype);
@ -195,6 +194,9 @@ get_recipient (MuMsgFile *self, GMimeRecipientType rtype)
return NULL;
}
if (recip)
mu_str_remove_ctrl_in_place (recip);
return recip;
}
@ -592,10 +594,11 @@ get_tags (MuMsgFile *self)
}
static char*
cleanup_maybe (const char *str, gboolean *do_free)
{
char *cur, *s;
char *s;
if (!str)
return NULL;
@ -610,10 +613,7 @@ cleanup_maybe (const char *str, gboolean *do_free)
} else
s = (char*)str;
/* strip control chars */
for (cur = s; *cur; ++cur)
if (iscntrl(*cur))
*cur = ' ';
mu_str_remove_ctrl_in_place (s);
return s;
}