sync with latest 0.9.0pre1

[claws.git] / src / addr_compl.c

diff --git a/src/addr_compl.c b/src/addr_compl.c
index e2858f068be3263dc85f5dbdb19a101726dceb71..f11f4b929c4192ac7dec82c3db7f7f514e20231b 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -376,7 +376,8 @@ gchar *get_complete_address(gint index)
                        if (p != NULL) {
                                if (!p->name || p->name[0] == '\0')
                                        address = g_strdup_printf(p->address);
                        if (p != NULL) {
                                if (!p->name || p->name[0] == '\0')
                                        address = g_strdup_printf(p->address);

-                               else if (strchr_with_skip_quote(p->name, '"', ','))
+                               else if (p->name[0] != '"' &&
+                                        strpbrk(p->name, ",.[]<>") != NULL)

                                        address = g_strdup_printf
                                                ("\"%s\" <%s>", p->name, p->address);
                                else
                                        address = g_strdup_printf
                                                ("\"%s\" <%s>", p->name, p->address);
                                else