2006-08-27 [colin] 2.4.0cvs98

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 03ad449e0d293e70e08cd2c11c79705dd1fde2a5..a9cb7194bc0e21bb7ce786818d24077d93eb2e1c 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1642,6 +1642,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
        gboolean use_encryption = FALSE;
        gchar *privacy_system = NULL;
        int priority = PRIORITY_NORMAL;
+       MsgInfo *replyinfo = NULL, *fwdinfo = NULL;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
@@ -1695,6 +1696,28 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
                        param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
                        priority = param;
                }
+               if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, 
+                                            sizeof(queueheader_buf), "RMID:")) {
+                       gchar **tokens = g_strsplit(&queueheader_buf[strlen("RMID:")], "\t", 0);
+                       if (tokens[0] && tokens[1] && tokens[2]) {
+                               FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+                               if (orig_item != NULL) {
+                                       replyinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+                               }
+                       }
+                       g_strfreev(tokens);
+               }
+               if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, 
+                                            sizeof(queueheader_buf), "FMID:")) {
+                       gchar **tokens = g_strsplit(&queueheader_buf[strlen("FMID:")], "\t", 0);
+                       if (tokens[0] && tokens[1] && tokens[2]) {
+                               FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+                               if (orig_item != NULL) {
+                                       fwdinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+                               }
+                       }
+                       g_strfreev(tokens);
+               }
        } else {
                account = msginfo->folder->folder->account;
        }
@@ -1713,6 +1736,9 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 
        compose = compose_create(account, COMPOSE_REEDIT, batch);
        
+       compose->replyinfo = replyinfo;
+       compose->fwdinfo = fwdinfo;
+
        compose->updating = TRUE;
        compose->priority = priority;
 
@@ -4059,6 +4085,8 @@ gint compose_send(Compose *compose)
        gchar *msgpath = NULL;
        gboolean discard_window = FALSE;
        gchar *errstr = NULL;
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+
        if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
                        || compose->batch == TRUE)
                discard_window = TRUE;
@@ -4073,6 +4101,7 @@ gint compose_send(Compose *compose)
                goto bail;
        }
 
+       inc_lock();
        val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
 
        if (val) {
@@ -4082,6 +4111,9 @@ gint compose_send(Compose *compose)
                if (val == -4) {
                        alertpanel_error(_("Could not queue message for sending:\n\n"
                                           "Charset conversion failed."));
+               } else if (val == -5) {
+                       alertpanel_error(_("Could not queue message for sending:\n\n"
+                                          "Couldn't get recipient encryption key."));
                } else if (val == -3) {
                        if (privacy_peek_error())
                        alertpanel_error(_("Could not queue message for sending:\n\n"
@@ -4109,15 +4141,15 @@ gint compose_send(Compose *compose)
                if (!discard_window) {
                        goto bail;
                }
+               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);
        }
@@ -4150,15 +4182,21 @@ gint compose_send(Compose *compose)
                if (!discard_window) {
                        goto bail;              
                }
+               inc_unlock();
                return -1;
        }
-
+       inc_unlock();
+       toolbar_main_set_sensitive(mainwin);
+       main_window_set_menu_sensitive(mainwin);
        return 0;
 
 bail:
+       inc_unlock();
        compose_allow_user_actions (compose, TRUE);
        compose->sending = FALSE;
        compose->modified = TRUE; 
+       toolbar_main_set_sensitive(mainwin);
+       main_window_set_menu_sensitive(mainwin);
 
        return -1;
 }
@@ -4802,6 +4840,11 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                                fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
                                /* and if encdata was null, it means there's been a problem in 
                                 * key selection */
+                               lock = FALSE;
+                               fclose(fp);
+                               g_unlink(tmp);
+                               g_free(tmp);
+                               return -5;
                        }
                        g_free(encdata);
                }
@@ -7540,10 +7583,13 @@ static void compose_send_later_cb(gpointer data, guint action,
        Compose *compose = (Compose *)data;
        gint val;
 
+       inc_lock();
        val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
-       if (!val) 
+       inc_unlock();
+
+       if (!val) {
                compose_close(compose);
-       else if (val == -1) {
+       } else if (val == -1) {
                alertpanel_error(_("Could not queue message."));
        } else if (val == -2) {
                alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
@@ -7554,7 +7600,11 @@ static void compose_send_later_cb(gpointer data, guint action,
        } else if (val == -4) {
                alertpanel_error(_("Could not queue message for sending:\n\n"
                                   "Charset conversion failed."));
+       } else if (val == -5) {
+               alertpanel_error(_("Could not queue message for sending:\n\n"
+                                  "Couldn't get recipient encryption key."));
        }
+       toolbar_main_set_sensitive(mainwindow_get_mainwindow());
 }
 
 void compose_draft (gpointer data)