2005-10-25 [colin] 1.9.15cvs107

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 27bc06e32d6b5cab12465663a3017ce1937ebb2a..98a0cadc3a742b655d05ed1a6c76024c4ed266b0 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -887,6 +887,8 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        } else {
                if (mailto) {
                        compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
+               } else if (item) {
+                       compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
                }
                /*
                 * CLAWS: just don't allow return receipt request, even if the user
@@ -1435,15 +1437,18 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
        /* check sig separator */
        if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
                        compose->account->sig_sep)) {
+               gchar *tmp = NULL;
                /* check end of line (\n) */
                gtk_text_buffer_get_iter_at_offset(textbuf, &start,
                        start_pos+strlen(compose->account->sig_sep));
                gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
                        start_pos+strlen(compose->account->sig_sep)+1);
-
-               if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),"\n"));
+               tmp = gtk_text_iter_get_text(&start, &end_iter);
+               if (!strcmp(tmp,"\n")) {
+                       g_free(tmp);
                        return TRUE;
-               
+               }
+               g_free(tmp);    
 
        }
 
@@ -2229,12 +2234,29 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        compose_entry_append(compose,
                            msginfo->folder->prefs->default_reply_to,
                            COMPOSE_TO);
-               } else
-                       compose_entry_append(compose,
+                       compose_entry_mark_default_to(compose,
+                               msginfo->folder->prefs->default_reply_to);
+               } else {
+                       gchar *tmp1 = NULL;
+                       Xstrdup_a(tmp1, msginfo->from, return);
+                       extract_address(tmp1);
+                       if (to_all || to_sender ||
+                           !account_find_from_address(tmp1))
+                               compose_entry_append(compose,
                                 (compose->replyto && !to_sender)
-                                 ? compose->replyto :
-                                 msginfo->from ? msginfo->from : "",
-                                 COMPOSE_TO);
+                                         ? compose->replyto :
+                                         msginfo->from ? msginfo->from : "",
+                                         COMPOSE_TO);
+                       else if (!to_all && !to_sender) {
+                               /* reply to the last list of recipients */
+                               compose_entry_append(compose,
+                                         msginfo->to ? msginfo->to : "",
+                                         COMPOSE_TO);
+                               compose_entry_append(compose,
+                                         msginfo->cc ? msginfo->cc : "",
+                                         COMPOSE_CC);
+                       }
+               }
        } else {
                if (to_sender || (compose->followup_to && 
                        !strncmp(compose->followup_to, "poster", 6)))
@@ -4028,13 +4050,20 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        /* append attachment parts */
        if (compose_use_attach(compose)) {
                MimeInfo *mimempart;
-
+               gchar *boundary = NULL;
                mimempart = procmime_mimeinfo_new();
                mimempart->content = MIMECONTENT_EMPTY;
                mimempart->type = MIMETYPE_MULTIPART;
                mimempart->subtype = g_strdup("mixed");
+
+               do {
+                       if (boundary)
+                               g_free(boundary);
+                       boundary = generate_mime_boundary(NULL);
+               } while (strstr(buf, boundary) != NULL);
+
                g_hash_table_insert(mimempart->typeparameters, g_strdup("boundary"),
-                                   generate_mime_boundary(NULL));
+                                   boundary);
 
                mimetext->disposition = DISPOSITIONTYPE_INLINE;
 
@@ -5965,6 +5994,9 @@ static void compose_destroy(Compose *compose)
        g_free(compose->exteditor_file);
 
        g_free(compose->orig_charset);
+
+       g_free(compose->privacy_system);
+
        if (addressbook_get_target_compose() == compose)
                addressbook_set_target_compose(NULL);