X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=522a83a732d449991b4d544e86994f1d8397eabf;hp=76f9532825dd136198e7d66785f32179446cf6d7;hb=58862afe7770c07e425d5f893f552d0342b82fbe;hpb=51599182dd639c256fea10a3648db2c42baa677b diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 76f95328..522a83a 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -34,6 +34,9 @@ #include #include #include +#include +#include +#include #include #include /* strcmp */ @@ -43,8 +46,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); @@ -140,11 +143,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 +173,25 @@ 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) { @@ -208,16 +212,21 @@ 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 _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)); @@ -232,9 +241,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); @@ -387,14 +403,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); @@ -416,14 +427,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 */ @@ -490,65 +509,76 @@ 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; + + modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_sent")); + + /* 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;