2005-10-30 [colin] 1.9.15cvs127

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 3aad20a38134408e29b02c326e4bcd50df1ab478..57b00475f9ac7ab36c0aa66d41fb075cb3b2ae44 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
@@ -1123,8 +1125,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        PrefsAccount *reply_account;
        GtkTextView *textview;
        GtkTextBuffer *textbuf;
-       GtkTextIter iter;
-       int cursor_pos;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
@@ -1208,11 +1208,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        if (account->auto_sig)
                compose_insert_sig(compose, FALSE);
 
-       cursor_pos = quote_fmt_get_cursor_pos();
-       gtk_text_buffer_get_start_iter(textbuf, &iter);
-       gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
-       gtk_text_buffer_place_cursor(textbuf, &iter);
-       
        compose_wrap_all(compose);
 
        gtk_widget_grab_focus(compose->text);
@@ -1425,7 +1420,7 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
        GtkTextIter start = *iter;
        GtkTextIter end_iter;
        int start_pos = gtk_text_iter_get_offset(&start);
-
+       gchar *str = NULL;
        if (!compose->account->sig_sep)
                return FALSE;
        
@@ -1433,19 +1428,23 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
                start_pos+strlen(compose->account->sig_sep));
 
        /* check sig separator */
-       if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
-                       compose->account->sig_sep)) {
+       str = gtk_text_iter_get_text(&start, &end_iter);
+       if (!strcmp(str, 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(str);
+                       g_free(tmp);
                        return TRUE;
-               
-
+               }
+               g_free(tmp);    
        }
+       g_free(str);
 
        return FALSE;
 }
@@ -2099,8 +2098,10 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
        gint len;
        gboolean prev_autowrap;
        const gchar *trimmed_body = body;
+       gint cursor_pos = 0;
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter iter;
        
        if (!msginfo)
                msginfo = &dummyinfo;
@@ -2145,8 +2146,6 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
                                compose);
        for (p = buf; *p != '\0'; ) {
                GtkTextMark *mark;
-               GtkTextIter iter;
-
                
                mark = gtk_text_buffer_get_insert(buffer);
                gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -2174,6 +2173,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
                        break;
        }
 
+       cursor_pos = quote_fmt_get_cursor_pos();
+       gtk_text_buffer_get_start_iter(buffer, &iter);
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
+       gtk_text_buffer_place_cursor(buffer, &iter);
+       
+
        compose->autowrap = prev_autowrap;
        if (compose->autowrap)
                compose_wrap_all(compose);
@@ -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)))
@@ -5972,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);