2007-07-31 Philip Van Hoof <pvanhoof@gnome.org>

[modest] / src / modest-tny-send-queue.c

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 40518b8..281699c 100644 (file)
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -34,6 +34,8 @@
 #include <tny-folder.h>
 #include <tny-camel-msg.h>
 #include <modest-tny-account.h>
+#include <modest-runtime.h>
+#include <widgets/modest-window-mgr.h>
 #include <modest-marshal.h>
 #include <string.h> /* strcmp */
 
@@ -140,11 +142,13 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
                if (err != NULL) goto frees;
                iter = tny_list_create_iterator (headers);
                while (!tny_iterator_is_done (iter)) {
-                       header = TNY_HEADER (tny_iterator_get_current (iter));          
-                       tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
-                       tny_iterator_next (iter);
-                       g_object_unref (header);
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
+                       if (header) {   
+                               tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
+                               tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+                               tny_iterator_next (iter);
+                               g_object_unref (header);
+                       }
                }
                
                g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
@@ -168,26 +172,24 @@ static void
 modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 {
        ModestTnySendQueuePrivate *priv;
-       TnyHeader *header;
+       TnyHeader *header = NULL;
        SendInfo *info = NULL;
-       GList* existing;
-       const gchar* msg_id;
+       GList* existing = NULL;
+       const gchar* msg_id = NULL;
 
        g_return_if_fail (TNY_IS_SEND_QUEUE(self));
        g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
 
        priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
        header = tny_msg_get_header (msg);
-
-       /* FIXME: do something smart here... */
-
+       
        /* Note that this call actually sets the message id to something
         * sensible. */ 
        TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */
 
        /* Check whether the mail is already in the queue */
 /*     msg_id = tny_header_get_message_id (header); */
-       msg_id = tny_header_get_uid (header);
+       msg_id = tny_header_get_uid (header);   
        g_return_if_fail (msg_id != NULL);
        existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
        if(existing != NULL)
@@ -217,11 +219,13 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 static void
 _add_message (ModestTnySendQueue *self, TnyHeader *header)
 {
+       ModestWindowMgr *mgr = NULL;
        ModestTnySendQueuePrivate *priv;
        SendInfo *info = NULL;
        GList* existing = NULL;
        gchar* msg_uid = NULL;
        ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING;
+       gboolean editing = FALSE;
 
        g_return_if_fail (TNY_IS_SEND_QUEUE(self));
        g_return_if_fail (TNY_IS_HEADER(header));
@@ -236,9 +240,16 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header)
        case MODEST_TNY_SEND_QUEUE_FAILED:
                if (status != MODEST_TNY_SEND_QUEUE_SUSPENDED)
                        tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
+               
+               /* Check if it already exists on queue */
                existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid);
                if(existing != NULL) return;
        
+               /* Check if its being edited */
+               mgr = modest_runtime_get_window_mgr ();
+               editing = modest_window_mgr_find_registered_header (mgr, header, NULL);
+               if (editing) return;
+               
                /* Add new meesage info */
                info = g_slice_new (SendInfo);
                info->msg_id = strdup(msg_uid);
@@ -415,14 +426,22 @@ modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
        GError *err = NULL;
 
        outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self));
+       if (!outbox)
+               return;
+
        tny_folder_get_headers (outbox, headers, TRUE, &err);
-       if (err != NULL) goto frees;
+       if (err != NULL) 
+               goto frees;
+
        iter = tny_list_create_iterator (headers);
        while (!tny_iterator_is_done (iter)) {
-               header = TNY_HEADER (tny_iterator_get_current (iter));          
-               _add_message (self, header); 
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               if (header) {   
+                       _add_message (self, header); 
+                       g_object_unref (header);
+               }
+
                tny_iterator_next (iter);
-               g_object_unref (header);
        }
        
        /* Flush send queue */