sync with latest 0.9.0pre1

[claws.git] / src / addressbook.c

diff --git a/src/addressbook.c b/src/addressbook.c
index f528d578f141c2619367a0f9b1989bd3c70fe394..8d5bdc2c35ea3ba68789276436eee9f1d7490567 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1116,7 +1116,7 @@ gchar *addressbook_format_address( AddrItemObject * aio ) {
        }
        if( address ) {
                if( name && name[0] != '\0' ) {
        }
        if( address ) {
                if( name && name[0] != '\0' ) {

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

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