2012-12-15 [paul] 3.9.0cvs48

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

diff --git a/ChangeLog b/ChangeLog
index 95b0f54ffb1e629dd59775bdf1beb3ed7325c3b4..005caec660cee5449d3a168a3aa2a20624aae257 100644 (file)
--- 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
index ea18936009f38737ccd85e30a246c9767c97787b..bdb4b3dff44a0e563e83dae627dbe6921e360243 100644 (file)
--- 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
index ea8342771da0e0694aeae0602a4b39cde9b721e3..7134d0a7ca93cb68050e3b67744b159a99e40857 100644 (file)
--- 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
index ffdb511e60263cd10363a9c49b7968bb353dc2e5..8d967cf61f958a57a57f48fe11596f9f2281e287 100644 (file)
--- 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 );