2004-09-29 [paul] 0.9.12cvs113.1

	* src/quote_fmt_parse.y
		sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index fbde76308b009c3a634db30658b960831e32b99e..b38320a21bc1b8afb22371698fb0eeb0ae58b9f2 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-09-29 [paul]      0.9.12cvs113.1
+
+       * src/quote_fmt_parse.y
+               sync with HEAD
+ 
+
 2004-09-28 [colin]     0.9.12cvs112.1
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 5e59e395bc48d2283ad0082a3f1496b97b71bb15..d69c368795987f0f4eb14061b09aff1f53ec187d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -181,3 +181,4 @@
 ( cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/addressbook.c; ) > 0.9.12cvs108.1.patchset
 ( cvs diff -u -r 1.207.2.15 -r 1.207.2.16 src/folderview.c; ) > 0.9.12cvs110.1.patchset
 ( cvs diff -u -r 1.207.2.16 -r 1.207.2.17 src/folderview.c; cvs diff -u -r 1.274.2.19 -r 1.274.2.20 src/mainwindow.c; ) > 0.9.12cvs112.1.patchset
+( cvs diff -u -r 1.654.2.215 -r 1.654.2.216 configure.ac; cvs diff -u -r 1.22.2.2 -r 1.22.2.3 src/quote_fmt_parse.y; ) > 0.9.12cvs113.1.patchset

diff --git a/configure.ac b/configure.ac
index 2a66735a8d434a4bc9ec78b7accabcff30835a19..dbaaaf2afe6b69aa5b4867c5a8c37c23d9dcbc7d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=112
+EXTRA_VERSION=113
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 722c69e07a7a8f7b172633a35bd4f207637600fd..a4afabeaa7c92606dff214f1c10ca7ae8931077d 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -296,13 +296,26 @@ special:
                        guchar *p;
                        gchar *str;
 
-                       str = alloca(strlen(msginfo->fromname) + 1);
-                       if (str != NULL) {
-                               strcpy(str, msginfo->fromname);
-                               p = str;
-                               while (*p && !isspace(*p)) p++;
-                               *p = '\0';
-                               INSERT(str);
+                       p = strchr(msginfo->fromname, ',');
+                       if (p != NULL) {
+                               /* fromname is like "Duck, Donald" */
+                               p++;
+                               while (*p && isspace(*p)) p++;
+                               str = alloca(strlen(p) + 1);
+                               if (str != NULL) {
+                                       strcpy(str, p);
+                                       INSERT(str);
+                               }
+                       } else {
+                               /* fromname is like "Donald Duck" */
+                               str = alloca(strlen(msginfo->fromname) + 1);
+                               if (str != NULL) {
+                                       strcpy(str, msginfo->fromname);
+                                       p = str;
+                                       while (*p && !isspace(*p)) p++;
+                                       *p = '\0';
+                                       INSERT(str);
+                               }
                        }
                }
        }
@@ -317,22 +330,33 @@ special:
                        str = alloca(strlen(msginfo->fromname) + 1);
                        if (str != NULL) {
                                strcpy(str, msginfo->fromname);
-                                p = str;
-                                while (*p && !isspace(*p)) p++;
-                                if (*p) {
-                                   /* We found a space. Get first none-space char and
-                                    insert rest of string from there. */
-                                   while (*p && isspace(*p)) p++;
-                                    if (*p) {
-                                       INSERT(p);
-                                   } else {
-                                       /* If there is no none-space char, just insert
-                                        whole fromname. */
+                               p = strchr(str, ',');
+                               if (p != NULL) {
+                                       /* fromname is like "Duck, Donald" */
+                                       *p = '\0';
                                        INSERT(str);
-                                   }
                                } else {
-                                   /* If there is no space, just insert whole fromname. */
-                                   INSERT(str);
+                                       /* fromname is like "Donald Duck" */
+                                       p = str;
+                                       while (*p && !isspace(*p)) p++;
+                                       if (*p) {
+                                           /* We found a space. Get first 
+                                            none-space char and insert
+                                            rest of string from there. */
+                                           while (*p && isspace(*p)) p++;
+                                           if (*p) {
+                                               INSERT(p);
+                                           } else {
+                                               /* If there is no none-space 
+                                                char, just insert whole 
+                                                fromname. */
+                                               INSERT(str);
+                                           }
+                                       } else {
+                                           /* If there is no space, just 
+                                            insert whole fromname. */
+                                           INSERT(str);
+                                       }
                                }
                        }
                }