[PATCH] Re: forwarding as attach of multiple messages



Patch to make `Forward inline' really forward, even when autoquote is 
off.  Against today's cvs tree.

Note: this does nothing about Carlos's original complaint: forwarding 
multiple messages results in one new message per original.
diff -Nur --exclude=CVS --exclude=gtkhtml balsa-cvs/src/sendmsg-window.c balsa-quote/src/sendmsg-window.c
--- balsa-cvs/src/sendmsg-window.c	Tue Oct 16 09:38:13 2001
+++ balsa-quote/src/sendmsg-window.c	Tue Oct 16 18:56:32 2001
@@ -1838,18 +1838,21 @@
     GString *body = NULL;
     gchar *signature;
     gint pos = 0;
+    gboolean reply_any = (type == SEND_REPLY || type == SEND_REPLY_ALL
+                          || type == SEND_REPLY_GROUP);
+    gboolean forwd_any = (type == SEND_FORWARD_ATTACH
+                          || type == SEND_FORWARD_INLINE);
 
-    if (type != SEND_NORMAL && message && balsa_app.autoquote)
-	body = quoteBody(msg, message, type);
+    if (message && ((balsa_app.autoquote && reply_any)
+                    || type == SEND_FORWARD_INLINE))
+        body = quoteBody(msg, message, type);
     else
 	body = g_string_new("");
 
     if ((signature = read_signature(msg)) != NULL) {
-	if (((type == SEND_REPLY || type == SEND_REPLY_ALL || type == SEND_REPLY_GROUP) &&
-	     balsa_app.current_ident->sig_whenreply) ||
-	    ((type == SEND_FORWARD_ATTACH || type == SEND_FORWARD_INLINE) && 
-	     balsa_app.current_ident->sig_whenforward) ||
-	    (type == SEND_NORMAL && balsa_app.current_ident->sig_sending)) {
+	if ((reply_any && balsa_app.current_ident->sig_whenreply)
+       || (forwd_any && balsa_app.current_ident->sig_whenforward)
+       || (type == SEND_NORMAL && balsa_app.current_ident->sig_sending)) {
 
 	    if (balsa_app.current_ident->sig_separator
 		&& g_strncasecmp(signature, "--\n", 3)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]