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

28
lib/mu-contacts.c
View File

@ -270,6 +270,17 @@ downcase_domain_maybe (const char *addr)
return addr_conv;
}
static void
clear_str (char* str)
{
if (str) {
mu_str_remove_ctrl_in_place (str);
g_strstrip (str);
}
}
gboolean
mu_contacts_add (MuContacts *self, const char *addr, const char *name,
@ -299,6 +310,8 @@ mu_contacts_add (MuContacts *self, const char *addr, const char *name,
* empty*/
g_free (cinfo->_name);
cinfo->_name = g_strdup (name);
if (cinfo->_name)
mu_str_remove_ctrl_in_place (cinfo->_name);
}
cinfo->_tstamp = tstamp;
}
@ -454,21 +467,6 @@ mu_contacts_destroy (MuContacts *self)
}
static void
clear_str (char* str)
{
/* replace ctrl chars with '_' */
while (str && *str) {
if (iscntrl (*str))
*str = '_';
++str;
}
if (str)
g_strstrip (str);
}
/* note, we will *own* the name, email we get, and we'll free them in
* the end... */
static ContactInfo *