2006-09-18 [paul] 2.4.0cvs196

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 59d7ce2171fe90131db3613bf22a50c780cfb7a4..a76bf917d7cafbdb2143a1a1d3b6b856174d5687 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -982,7 +982,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        } else {
                if (mailto) {
                        compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
-               } else if (item) {
+               } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
                        compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
                }
                /*
@@ -4021,7 +4021,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
                        entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
                        header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
                        g_strstrip(entry);
-                       if (strcmp(entry, compose->account->auto_cc)
+                       if (strcmp(entry, compose->account->auto_bcc)
                        ||  strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
                                found_other = TRUE;
                                g_free(entry);
@@ -4144,13 +4144,12 @@ gint compose_send(Compose *compose)
                inc_unlock();
                return -1;
        }
-       
        if (msgpath == NULL) {
                msgpath = folder_item_fetch_msg(folder, msgnum);
-               val = procmsg_send_message_queue(msgpath, &errstr);
+               val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
                g_free(msgpath);
        } else {
-               val = procmsg_send_message_queue(msgpath, &errstr);
+               val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
                g_unlink(msgpath);
                g_free(msgpath);
        }
@@ -5571,7 +5570,7 @@ GtkWidget *compose_create_attach(Compose *compose)
        gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
 
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist),
-                                    prefs_common.enable_rules_hint);
+                                    prefs_common.use_stripes_everywhere);
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);