Remove leading emtpy lines from quoted text before quoting it

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eb6bff3793769bfa9f11410775eb6ab6278bbd15..bfd4ee2dc8b7dc6305b544151a0a850241f97773 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-03-13 [colin]     0.8.11claws9
+
+       * src/compose.c
+               Remove leading emtpy lines from quoted text
+               before quoting it
+

 2003-03-13 [melvin]    0.8.11claws8
 
        * src/prefs_actions.c
 2003-03-13 [melvin]    0.8.11claws8
 
        * src/prefs_actions.c

diff --git a/configure.ac b/configure.ac
index 8f77440576e271a36038d672bcfd6be579506852..7bcf58da7d76d1c774c962968d1988acadb48346 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws9

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 6e766b4021c4f2144ff78e8c5b4a23d71565a3b1..cf027720724726721b364a1d4ec8eaeb590b9b25 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1668,7 +1668,8 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
        gchar *buf;
        gchar *p, *lastp;
        gint len;
        gchar *buf;
        gchar *p, *lastp;
        gint len;

-
+       gchar *trimmed_body = body;
+       

        if (!msginfo)
                msginfo = &dummyinfo;
 
        if (!msginfo)
                msginfo = &dummyinfo;
 


@@ -1685,7 +1686,11 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
        }
 
        if (fmt && *fmt != '\0') {
        }
 
        if (fmt && *fmt != '\0') {

-               quote_fmt_init(msginfo, quote_str, body);
+               while (trimmed_body && strlen(trimmed_body) > 1
+                       && trimmed_body[0]=='\n')
+                       *trimmed_body++;
+
+               quote_fmt_init(msginfo, quote_str, trimmed_body);

                quote_fmt_scan_string(fmt);
                quote_fmt_parse();
 
                quote_fmt_scan_string(fmt);
                quote_fmt_parse();