* Fixes: NB#59203

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

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 72c918a..390f7e3 100644 (file)
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -43,7 +43,7 @@ static void modest_tny_send_queue_finalize   (GObject *obj);
 static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
 
 /* Signal handlers */ 
-static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
+/* static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data); */
 static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
 static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
 
@@ -135,7 +135,7 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 {
        ModestTnySendQueuePrivate *priv;
        TnyHeader *header;
-       SendInfo *info;
+       SendInfo *info = NULL;
        GList* existing;
        const gchar* msg_id;
 
@@ -156,8 +156,8 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
        existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
        if(existing != NULL)
        {
-               g_assert(info->status == MODEST_TNY_SEND_QUEUE_SUSPENDED ||
-                        info->status == MODEST_TNY_SEND_QUEUE_FAILED);
+               //g_assert(info->status == MODEST_TNY_SEND_QUEUE_SUSPENDED ||
+               //        info->status == MODEST_TNY_SEND_QUEUE_FAILED);
 
                info = existing->data;
                info->status = MODEST_TNY_SEND_QUEUE_WAITING;
@@ -308,11 +308,11 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
        /* Connect signals to control when a msg is being or has been sent */
        /* TODO: this signal was implemented in tinymail camel send queue, but im
           waiting for implement some unit tests nbefore commited changes */
-       if (FALSE) {
-               g_signal_connect (G_OBJECT(self), "msg-sending",
-                                 G_CALLBACK(_on_msg_start_sending), 
-                                 NULL);
-       }
+/*     if (FALSE) { */
+/*             g_signal_connect (G_OBJECT(self), "msg-sending", */
+/*                               G_CALLBACK(_on_msg_start_sending),  */
+/*                               NULL); */
+/*     } */
                          
        g_signal_connect (G_OBJECT(self), "msg-sent",
                          G_CALLBACK(_on_msg_has_been_sent), 
@@ -333,22 +333,17 @@ modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
 /*     tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
 }
 
-#if 0
 gboolean
 modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self,
                                         const gchar *msg_id)
 {      
-       ModestTnySendQueuePrivate *priv;
+       ModestTnySendQueueStatus status;
        
        g_return_val_if_fail (msg_id != NULL, FALSE); 
-       priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
        
-       if (modest_tny_send_queue_sending_in_progress(self))
-               return g_ascii_strcasecmp(priv->current_msg_id, msg_id);
-       else 
-               return FALSE;
+       status = modest_tny_send_queue_get_msg_status (self, msg_id);
+       return status == MODEST_TNY_SEND_QUEUE_SENDING;
 }
-#endif
 
 gboolean
 modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
@@ -368,31 +363,31 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg
   return ((SendInfo*)item->data)->status;
 }
 
-static void 
-_on_msg_start_sending (TnySendQueue *self,
-                      TnyMsg *msg,
-                      gpointer user_data)
-{
-       ModestTnySendQueuePrivate *priv;
-       TnyHeader *header;
-       GList *item;
-       SendInfo *info;
+/* static void  */
+/* _on_msg_start_sending (TnySendQueue *self, */
+/*                    TnyMsg *msg, */
+/*                    gpointer user_data) */
+/* { */
+/*     ModestTnySendQueuePrivate *priv; */
+/*     TnyHeader *header; */
+/*     GList *item; */
+/*     SendInfo *info; */
 
-       priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+/*     priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */
 
-       header = tny_msg_get_header(msg);
-       item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
+/*     header = tny_msg_get_header(msg); */
+/*     item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */
 
-       if (item != NULL)
-       {
-               info = item->data;
-               info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+/*     if (item != NULL) */
+/*     { */
+/*             info = item->data; */
+/*             info->status = MODEST_TNY_SEND_QUEUE_SENDING; */
 
-               g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
-       }
+/*             g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
+/*     } */
 
-       priv->current = item;
-}
+/*     priv->current = item; */
+/* } */
 
 static void 
 _on_msg_has_been_sent (TnySendQueue *self,