2007-06-08 Murray Cumming <murrayc@murrayc.com>

* src/modest-mail-operation.c:
        (modest_mail_operation_send_new_mail):
        Added a comment about a nasty but apparently harmless message. Details
        added to the wiki g_warnings() page.

pmo-trunk-r2122

diff --git a/ChangeLog2 b/ChangeLog2
index 358f405..5c66468 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,12 @@
 2007-06-08  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-mail-operation.c:
+       (modest_mail_operation_send_new_mail):
+       Added a comment about a nasty but apparently harmless message. Details 
+       added to the wiki g_warnings() page.
+
+2007-06-08  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-tny-send-queue.c: (modest_tny_send_queue_add),
        (modest_tny_send_queue_class_init):
        Do not use the priv struct because it is empty, to avoid g_warnings 

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index cfff711..7a5bb33 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -530,6 +530,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        if (folder) {
                if (draft_msg != NULL) {
                        header = tny_msg_get_header (draft_msg);
+                       /* Note: This can fail (with a warning) if the message is not really already in a folder,
+                        * because this function requires it to have a UID. */
                        tny_folder_remove_msg (folder, header, NULL);
                        g_object_unref (header);
                }

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index a7b20ad..50e8fb2 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1465,6 +1465,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                g_printerr ("modest: no account found\n");
                return;
        }
+       
        MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
 
        if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {