2010-09-19 [pawel] 3.7.6cvs40

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 9761ed139188de18f3fce375f184a9ae58d91a2d..7e97e46a3498626bd8cdded5691eba3c9ea6b9da 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1535,7 +1535,9 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
                compose_destroy(compose);
                return NULL;
        }
-
+       if (!compose->ml_post)
+               cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode/List", FALSE);
+       
        /* override from name according to folder properties */
        if (msginfo->folder && msginfo->folder->prefs &&
                msginfo->folder->prefs->reply_with_format &&
@@ -2999,15 +3001,6 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 
        gtk_text_buffer_get_start_iter(buffer, &iter);
        gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
-       
-       /* Some quotes may not end with new line - when replying with
-        * quote from GtkTextBuffer selection for example. Add new
-        * line character so cursor is at the beginning of the line */
-       if (!gtk_text_iter_starts_line(&iter)) {
-               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
-               gtk_text_buffer_get_end_iter(buffer, &iter);
-               compose->set_cursor_pos = gtk_text_iter_get_offset(&iter);
-       }
        gtk_text_buffer_place_cursor(buffer, &iter);
 
        compose->autowrap = prev_autowrap;
@@ -3223,7 +3216,9 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                                 compose->followup_to ? compose->followup_to :
                                 compose->newsgroups ? compose->newsgroups : "",
                                 COMPOSE_NEWSGROUPS, PREF_NONE);
-               } 
+               } else if (reply_to_ml)
+                       compose_entry_append(compose,
+                                  compose->ml_post, COMPOSE_TO, PREF_ML); 
                else 
                        compose_entry_append
                                (compose,
@@ -3234,7 +3229,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        compose_reply_set_subject(compose, msginfo);
 
        if (to_ml && compose->ml_post) return;
-       if (!to_all || compose->account->protocol == A_NNTP) return;
+       if (!to_all) return;
 
        if (compose->replyto) {
                Xstrdup_a(replyto, compose->replyto, return);