2006-10-31 [wwp] 2.5.6cvs13

	* src/compose.c
		fix and optimize trimming of leading linefeeds in body loop.

diff --git a/ChangeLog b/ChangeLog
index 8c1400b5d58eaa42f761f57db6c5d4c7fcbddac1..88464ed980a90cbd0d2fbf163e7890c01d420c83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-31 [wwp]       2.5.6cvs13
+
+       * src/compose.c
+               fix and optimize trimming of leading linefeeds in body loop.
+

 2006-10-31 [colin]     2.5.6cvs12
 
        * src/etpan/imap-thread.c
 2006-10-31 [colin]     2.5.6cvs12
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 58f1dbd56369d8ccfc794a702f3e5d36c04a84bf..8c7da4d4bf02524a308b1adba9455c34c4779920 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2015,3 +2015,4 @@
 ( cvs diff -u -r 1.382.2.318 -r 1.382.2.319 src/compose.c;  ) > 2.5.6cvs10.patchset
 ( cvs diff -u -r 1.204.2.106 -r 1.204.2.107 src/prefs_common.c;  cvs diff -u -r 1.103.2.64 -r 1.103.2.65 src/prefs_common.h;  cvs diff -u -r 1.382.2.319 -r 1.382.2.320 src/compose.c;  ) > 2.5.6cvs11.patchset
 ( cvs diff -u -r 1.1.4.53 -r 1.1.4.54 src/etpan/imap-thread.c;  cvs diff -u -r 1.179.2.135 -r 1.179.2.136 src/imap.c;  ) > 2.5.6cvs12.patchset
 ( cvs diff -u -r 1.382.2.318 -r 1.382.2.319 src/compose.c;  ) > 2.5.6cvs10.patchset
 ( cvs diff -u -r 1.204.2.106 -r 1.204.2.107 src/prefs_common.c;  cvs diff -u -r 1.103.2.64 -r 1.103.2.65 src/prefs_common.h;  cvs diff -u -r 1.382.2.319 -r 1.382.2.320 src/compose.c;  ) > 2.5.6cvs11.patchset
 ( cvs diff -u -r 1.1.4.53 -r 1.1.4.54 src/etpan/imap-thread.c;  cvs diff -u -r 1.179.2.135 -r 1.179.2.136 src/imap.c;  ) > 2.5.6cvs12.patchset

+( cvs diff -u -r 1.382.2.320 -r 1.382.2.321 src/compose.c;  ) > 2.5.6cvs13.patchset

diff --git a/configure.ac b/configure.ac
index c7942309255b0ed5f2d8a223eed98c6ed4a45005..319b55365b998a98f1edabe59b65671bb731afe2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 80a26cd9cbe23f6033b7c8b64a723dd9bde85516..d6c4dd8948c71fdcf1a8277978bb040e7182b599 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2429,9 +2429,9 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
        if (fmt && *fmt != '\0') {
                gchar *tmp = NULL;
 
        if (fmt && *fmt != '\0') {
                gchar *tmp = NULL;
 

-               while (trimmed_body && strlen(trimmed_body) > 1
-                       && trimmed_body[0]=='\n')
-                       *trimmed_body++;
+               if (trimmed_body)
+                       while (*trimmed_body == '\n')
+                               trimmed_body++;

 
                /* decode \-escape sequences in the internal representation of the quote format */
                tmp = malloc(strlen(fmt)+1);
 
                /* decode \-escape sequences in the internal representation of the quote format */
                tmp = malloc(strlen(fmt)+1);