2005-03-18 [paul] 1.0.3cvs2.4

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 674b2f239817181b0f90fdf33be4e556b63e62fa..e8ca3315e5a0d2af94317c18c5409d7457c581d6 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1669,13 +1669,14 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
        fclose(fp);
 
        if (hentry[H_REPLY_TO].body != NULL) {
-               conv_unmime_header_overwrite(hentry[H_REPLY_TO].body);
-               compose->replyto = hentry[H_REPLY_TO].body;
+               compose->replyto =
+                       conv_unmime_header(hentry[H_REPLY_TO].body, NULL);
+               g_free(hentry[H_REPLY_TO].body);
                hentry[H_REPLY_TO].body = NULL;
        }
        if (hentry[H_CC].body != NULL) {
-               conv_unmime_header_overwrite(hentry[H_CC].body);
-               compose->cc = hentry[H_CC].body;
+               compose->cc = conv_unmime_header(hentry[H_CC].body, NULL);
+               g_free(hentry[H_CC].body);
                hentry[H_CC].body = NULL;
        }
        if (hentry[H_REFERENCES].body != NULL) {
@@ -1689,21 +1690,20 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                hentry[H_REFERENCES].body = NULL;
        }
        if (hentry[H_BCC].body != NULL) {
-               if (compose->mode == COMPOSE_REEDIT) {
-                       conv_unmime_header_overwrite(hentry[H_BCC].body);
-                       compose->bcc = hentry[H_BCC].body;
-               } else
-                       g_free(hentry[H_BCC].body);
+               if (compose->mode == COMPOSE_REEDIT)
+                       compose->bcc =
+                               conv_unmime_header(hentry[H_BCC].body, NULL);
+               g_free(hentry[H_BCC].body);
                hentry[H_BCC].body = NULL;
        }
        if (hentry[H_NEWSGROUPS].body != NULL) {
-               conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body);
                compose->newsgroups = hentry[H_NEWSGROUPS].body;
                hentry[H_NEWSGROUPS].body = NULL;
        }
        if (hentry[H_FOLLOWUP_TO].body != NULL) {
-               conv_unmime_header_overwrite(hentry[H_FOLLOWUP_TO].body);
-               compose->followup_to = hentry[H_FOLLOWUP_TO].body;
+               compose->followup_to =
+                       conv_unmime_header(hentry[H_FOLLOWUP_TO].body, NULL);
+               g_free(hentry[H_FOLLOWUP_TO].body);
                hentry[H_FOLLOWUP_TO].body = NULL;
        }
        if (hentry[H_LIST_POST].body != NULL) {