0.8.8claws112
authorChristoph Hohmann <reboot@gmx.ch>
Sat, 18 Jan 2003 13:31:31 +0000 (13:31 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sat, 18 Jan 2003 13:31:31 +0000 (13:31 +0000)
* src/compose.c
        fix applying templates to forwarded messages

Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>

ChangeLog.claws
configure.ac
src/compose.c

index 792b2bc..31bd7ef 100644 (file)
@@ -1,3 +1,10 @@
+2003-01-18 [christoph] 0.8.8claws112
+
+       * src/compose.c
+               fix applying templates to forwarded messages
+
+       Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>
+
 2003-01-17 [christoph] 0.8.8claws111
 
        * src/folder.c
index 74bb9e6..0ca2db3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws111
+EXTRA_VERSION=claws112
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 165519e..dd3f1dd 100644 (file)
@@ -5178,7 +5178,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        if (replace)
                gtk_stext_clear(GTK_STEXT(compose->text));
 
-       if (compose->replyinfo == NULL) {
+       if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
                parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
                                               NULL, NULL);
        } else {
@@ -5187,8 +5187,14 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
                else
                        qmark = "> ";
 
-               parsed_str = compose_quote_fmt(compose, compose->replyinfo,
-                                              tmpl->value, qmark, NULL);
+               if (compose->replyinfo != NULL)
+                       parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+                                                      tmpl->value, qmark, NULL);
+               else if (compose->fwdinfo != NULL)
+                       parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+                                                      tmpl->value, qmark, NULL);
+               else
+                       parsed_str = NULL;
        }
 
        if (replace && parsed_str && prefs_common.auto_sig)