2006-02-22 [wwp] 2.0.0cvs70

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 1e9a886c8aed357a4f4e56dd0aef7c3f75ef5db0..41f373dc1516655b138d40c755ea6fb433641c6d 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -272,10 +272,12 @@ static gint compose_remove_reedit_target  (Compose        *compose,
 void compose_remove_draft                      (Compose        *compose);
 static gint compose_queue                      (Compose        *compose,
                                                 gint           *msgnum,
-                                                FolderItem     **item);
+                                                FolderItem     **item,
+                                                gchar          **msgpath);
 static gint compose_queue_sub                  (Compose        *compose,
                                                 gint           *msgnum,
                                                 FolderItem     **item,
+                                                gchar          **msgpath,
                                                 gboolean       check_subject);
 static void compose_add_attachments            (Compose        *compose,
                                                 MimeInfo       *parent);
@@ -1753,10 +1755,14 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
 
        compose->modified = FALSE;
        compose_set_title(compose);
@@ -3770,7 +3776,7 @@ gint compose_send(Compose *compose)
        gint msgnum;
        FolderItem *folder;
        gint val = -1;
-       gchar *msgpath;
+       gchar *msgpath = NULL;
 
        compose_allow_user_actions (compose, FALSE);
        compose->sending = TRUE;
@@ -3778,7 +3784,7 @@ gint compose_send(Compose *compose)
        if (compose_check_entries(compose, TRUE) == FALSE)
                goto bail;
 
-       val = compose_queue(compose, &msgnum, &folder);
+       val = compose_queue(compose, &msgnum, &folder, &msgpath);
 
        if (val) {
                if (val == -4) {
@@ -3816,10 +3822,15 @@ gint compose_send(Compose *compose)
                return 0;
        }
        
-       msgpath = folder_item_fetch_msg(folder, msgnum);
-       val = procmsg_send_message_queue(msgpath);
-       g_free(msgpath);
-
+       if (msgpath == NULL) {
+               msgpath = folder_item_fetch_msg(folder, msgnum);
+               val = procmsg_send_message_queue(msgpath);
+               g_free(msgpath);
+       } else {
+               val = procmsg_send_message_queue(msgpath);
+               g_unlink(msgpath);
+               g_free(msgpath);
+       }
        if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
                compose->sending = FALSE;
                compose_allow_user_actions (compose, TRUE);
@@ -4346,11 +4357,11 @@ void compose_remove_draft(Compose *compose)
 
 }
 
-static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath)
 {
-       return compose_queue_sub (compose, msgnum, item, FALSE);
+       return compose_queue_sub (compose, msgnum, item, msgpath, FALSE);
 }
-static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath, gboolean check_subject)
 {
        FolderItem *queue;
        gchar *tmp;
@@ -4544,14 +4555,18 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                return -1;
        }
        folder_item_scan(queue);
-       if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
+       if ((num = folder_item_add_msg(queue, tmp, NULL, FALSE)) < 0) {
                g_warning("can't queue the message\n");
                g_unlink(tmp);
                g_free(tmp);
                return -1;
        }
-       g_unlink(tmp);
-       g_free(tmp);
+       
+       if (msgpath == NULL) {
+               g_unlink(tmp);
+               g_free(tmp);
+       } else
+               *msgpath = tmp;
 
        if (compose->mode == COMPOSE_REEDIT) {
                compose_remove_reedit_target(compose, FALSE);
@@ -5697,6 +5712,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                                                  conv_get_locale_charset_str(),
                                                  prefs_common.misspelled_col,
                                                  prefs_common.check_while_typing,
+                                                 prefs_common.recheck_when_changing_dict,
                                                  prefs_common.use_alternate,
                                                  GTK_TEXT_VIEW(text),
                                                  GTK_WINDOW(compose->window));
@@ -6884,10 +6900,14 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
        gtk_widget_set_sensitive(compose->toolbar->sendl_btn,     sensitive);
        gtk_widget_set_sensitive(compose->toolbar->draft_btn,     sensitive);
        gtk_widget_set_sensitive(compose->toolbar->insert_btn,    sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn,       sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn,  sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn,  sensitive);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn,   ensitive);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
 }
 #endif /* G_OS_UNIX */
 
@@ -7104,7 +7124,7 @@ static void compose_send_later_cb(gpointer data, guint action,
        Compose *compose = (Compose *)data;
        gint val;
 
-       val = compose_queue_sub(compose, NULL, NULL, TRUE);
+       val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
        if (!val) 
                compose_close(compose);
        else if (val == -2) {