X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=0db96a17d373b71c0ab8990c54382c44c381de27;hb=85bc4429bff8a674e295fc17cb1a2633e47abdfe;hp=17a7b25f6c9647efa7ca506aa7319accbb0674dc;hpb=9b9efa32a2edc633130c4df8967dee7abc0ec41a;p=modest diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 17a7b25..0db96a1 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -43,8 +43,8 @@ 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_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data); +static void _on_msg_start_sending (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data); +static void _on_msg_has_been_sent (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data); static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data); static TnyFolder*modest_tny_send_queue_get_outbox (TnySendQueue *self); @@ -115,6 +115,10 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err) { ModestTnySendQueuePrivate *priv; SendInfo *info; + TnyIterator *iter = NULL; + TnyFolder *outbox = NULL; + TnyList *headers = tny_simple_list_new (); + TnyHeader *header = NULL; priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); if(priv->current != NULL) @@ -130,7 +134,21 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err) } /* Set flags to supend sending operaiton (if removed, this is not necessary) */ - if (!remove) { + if (!remove) { + outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self)); + tny_folder_get_headers (outbox, headers, TRUE, 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)); + 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); g_queue_free (priv->queue); priv->queue = g_queue_new(); @@ -138,6 +156,14 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err) /* Dont call super class implementaiton, becasue camel removes messages from outbox */ TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove, err); /* FIXME */ + + frees: + if (headers != NULL) + g_object_unref (G_OBJECT (headers)); + if (outbox != NULL) + g_object_unref (G_OBJECT (outbox)); + if (iter != NULL) + g_object_unref (iter); } static void @@ -163,7 +189,8 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) /* 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) { @@ -184,6 +211,9 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) } g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); + + /* free */ + g_object_unref (header); } static void @@ -206,7 +236,8 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header) case MODEST_TNY_SEND_QUEUE_UNKNONW: case MODEST_TNY_SEND_QUEUE_SUSPENDED: case MODEST_TNY_SEND_QUEUE_FAILED: - tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY); + if (status != MODEST_TNY_SEND_QUEUE_SUSPENDED) + tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY); existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid); if(existing != NULL) return; @@ -362,14 +393,9 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account) 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); */ -/* } */ - + 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), NULL); @@ -395,18 +421,25 @@ modest_tny_send_queue_try_to_send (ModestTnySendQueue* self) 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 */ tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); frees: - g_object_unref (G_OBJECT (headers)); - g_object_unref (G_OBJECT (outbox)); + if (headers != NULL) + g_object_unref (G_OBJECT (headers)); + if (outbox != NULL) + g_object_unref (G_OBJECT (outbox)); + if (iter != NULL) + g_object_unref (iter); } gboolean @@ -461,65 +494,74 @@ modest_tny_send_queue_get_msg_id (TnyHeader *header) } -/* 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); */ - -/* header = tny_msg_get_header(msg); */ -/* item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */ +static void +_on_msg_start_sending (TnySendQueue *self, + TnyHeader *header, + TnyMsg *msg, + int done, + int total, + gpointer user_data) +{ + ModestTnySendQueuePrivate *priv = NULL; + GList *item = NULL; + SendInfo *info = NULL; + gchar *msg_id = NULL; -/* if (item != NULL) */ -/* { */ -/* info = item->data; */ -/* info->status = MODEST_TNY_SEND_QUEUE_SENDING; */ + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); + + /* Get message uid */ + msg_id = modest_tny_send_queue_get_msg_id (header); -/* g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */ -/* } */ + /* Get status info */ + item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id); + g_return_if_fail (item != NULL); + info = item->data; + info->status = MODEST_TNY_SEND_QUEUE_SENDING; + + /* Set current status item */ + g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); + priv->current = item; -/* priv->current = item; */ -/* } */ + /* free */ + g_free (msg_id); +} static void _on_msg_has_been_sent (TnySendQueue *self, + TnyHeader *header, TnyMsg *msg, + int done, + int total, gpointer user_data) { ModestTnySendQueuePrivate *priv; - TnyHeader *header; GList *item; + gchar *msg_id = NULL; priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); - header = tny_msg_get_header (msg); - - /* TODO: Use this version as soon as the msg-sending - * notification works */ -#if 0 - item = priv->current; - g_assert(item != NULL); -#else - item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id(header)); - g_assert(item != NULL); -#endif + /* Get message uid */ + msg_id = modest_tny_send_queue_get_msg_id (header); + + /* Get status info */ + item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id); + g_return_if_fail(item != NULL); + /* Remove status info */ modest_tny_send_queue_info_free (item->data); g_queue_delete_link (priv->queue, item); priv->current = NULL; + + /* free */ + g_free(msg_id); } -static void _on_msg_error_happened (TnySendQueue *self, - TnyHeader *header, - TnyMsg *msg, - GError *err, - gpointer user_data) +static void +_on_msg_error_happened (TnySendQueue *self, + TnyHeader *header, + TnyMsg *msg, + GError *err, + gpointer user_data) { ModestTnySendQueuePrivate *priv = NULL; SendInfo *info = NULL;