2005-05-05 [paul] 1.0.4cvs8

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index c9477969c9e070f4464afc3b44d503745f96c461..38dfdce106ff284bf816e57b273000ff25ca0c53 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3234,13 +3234,11 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
        to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
 
        first_to_address = TRUE;
-       first_cc_address = TRUE;
        for (list = compose->header_list; list; list = list->next) {
                headerentry = ((ComposeHeaderEntry *)list->data);
                headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
 
-               if (g_strcasecmp(headerentryname, cc_hdr) == 0 
-                  || g_strcasecmp(headerentryname, to_hdr) == 0) {
+               if (g_strcasecmp(headerentryname, to_hdr) == 0) {
                        str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
                        Xstrdup_a(str, str, return -1);
                        g_strstrip(str);
@@ -3248,31 +3246,48 @@ static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
                                compose_convert_header
                                        (buf, sizeof(buf), str,
                                        strlen("Resent-To") + 2, TRUE);
-                               if (g_strcasecmp(headerentryname, to_hdr) == 0) {
-                                       if (first_to_address) {
-                                               fprintf(fp, "Resent-To: ");
-                                               first_to_address = FALSE;
-                                       } else {
-                                               fprintf(fp, ",");
-                                       }
-                               }
-                               if (g_strcasecmp(headerentryname, cc_hdr) == 0) {
-                                       if (first_cc_address) {
-                                               fprintf(fp, "\n");
-                                               fprintf(fp, "Resent-Cc: ");
-                                               first_cc_address = FALSE;
-                                       } else {
-                                               fprintf(fp, ",");
-                                       }
-                               }
-                               
+
+                                if (first_to_address) {
+                                        fprintf(fp, "Resent-To: ");
+                                        first_to_address = FALSE;
+                                } else {
+                                        fprintf(fp, ",");
+                                }
                                fprintf(fp, "%s", buf);
                        }
                }
        }
-       /* if (!first_address) { */
-       fprintf(fp, "\n");
-       /* } */
+       if (!first_to_address) {
+               fprintf(fp, "\n");
+        }
+
+       first_cc_address = TRUE;
+       for (list = compose->header_list; list; list = list->next) {
+               headerentry = ((ComposeHeaderEntry *)list->data);
+               headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
+
+               if (g_strcasecmp(headerentryname, cc_hdr) == 0) {
+                       str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+                       Xstrdup_a(str, str, return -1);
+                       g_strstrip(str);
+                       if (str[0] != '\0') {
+                               compose_convert_header
+                                       (buf, sizeof(buf), str,
+                                       strlen("Resent-Cc") + 2, TRUE);
+
+                                if (first_cc_address) {
+                                        fprintf(fp, "Resent-Cc: ");
+                                        first_cc_address = FALSE;
+                                } else {
+                                        fprintf(fp, ",");
+                                }
+                               fprintf(fp, "%s", buf);
+                       }
+               }
+       }
+       if (!first_cc_address) {
+               fprintf(fp, "\n");
+        }
 
        return(0);
 }