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

* mu-str: minor

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-01-11 23:22:00 +02:00
parent 5d6fe733a0
commit 679f56b047
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mu-str.c
View File

@ -171,9 +171,7 @@ mu_str_display_contact_s (const char *str)
static gchar contact[255]; static gchar contact[255];
gchar *c, *c2; gchar *c, *c2;
if (!str) str = str ? str : "";
str = "";
g_strlcpy (contact, str, sizeof(contact)); g_strlcpy (contact, str, sizeof(contact));
/* we check for '<', so we can strip out the address stuff in /* we check for '<', so we can strip out the address stuff in
@ -182,7 +180,6 @@ mu_str_display_contact_s (const char *str)
*/ */
c = g_strstr_len (contact, -1, "<"); c = g_strstr_len (contact, -1, "<");
if (c != NULL) { if (c != NULL) {
for (c2 = contact; c2 < c && !(isalnum(*c2)); ++c2); for (c2 = contact; c2 < c && !(isalnum(*c2)); ++c2);
if (c2 != c) /* apparently, there was something, if (c2 != c) /* apparently, there was something,
* so we can remove the <... part*/ * so we can remove the <... part*/
@ -194,6 +191,13 @@ mu_str_display_contact_s (const char *str)
if (*c2 == '"' || *c2 == '<' || *c2 == '>') if (*c2 == '"' || *c2 == '<' || *c2 == '>')
*c2 = ' '; *c2 = ' ';
/* FIXME: this breaks cc10 */
/* remove everything between '()' if it's after the 5th pos*/
/* c = g_strstr_len (contact, -1, "("); */
/* if (c && c - contact > 5) */
/* *c = '\0'; */
g_strstrip (contact); g_strstrip (contact);
return contact; return contact;