talons

commit 8f63427c199ecd922f387c9e817dbdf9b4ca3272
parent 52516eabcc492d52ca8ebecd61a0477828fdca5b
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat, 15 Dec 2012 08:51:08 +0000

2012-12-15 [paul]	3.9.0cvs48

	* src/addrselect.c
		fix bug 2832, 'mail to from adress-book splitt names'

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addrselect.c
 | 
7
+++++--

4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-15 [paul]	3.9.0cvs48
+
+	* src/addrselect.c
+		fix bug 2832, 'mail to from adress-book splitt names'
+
 2012-12-12 [colin]	3.9.0cvs47
 
 	* src/action.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4545,3 +4545,4 @@
 ( cvs diff -u -r 1.27.2.66 -r 1.27.2.67 src/addr_compl.c;  ) > 3.9.0cvs45.patchset
 ( cvs diff -u -r 1.382.2.618 -r 1.382.2.619 src/compose.c;  ) > 3.9.0cvs46.patchset
 ( cvs diff -u -r 1.12.2.78 -r 1.12.2.79 src/action.c;  cvs diff -u -r 1.274.2.363 -r 1.274.2.364 src/mainwindow.c;  ) > 3.9.0cvs47.patchset
+( cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/addrselect.c;  ) > 3.9.0cvs48.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/addrselect.c b/src/addrselect.c
@@ -231,8 +231,11 @@ static gchar *addrselect_format_address( AddrItemObject * aio ) {
 		}
 	}
 	if( address ) {
-		if( name ) {
-			buf = g_strdup_printf( "%s <%s>", name, address );
+		if( name && name[0] != '\0' ) {
+			if( strchr_with_skip_quote( name, '"', ',' ) )
+				buf = g_strdup_printf( "\"%s\" <%s>", name, address );
+			else
+				buf = g_strdup_printf( "%s <%s>", name, address );
 		}
 		else {
 			buf = g_strdup( address );