X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=0c8b199dafd0d06cd3b500777240113c93dba845;hp=281699cccdc07e8738191056c57439c8b0798d97;hb=9f4ac039eb47915ec367a05d893c871a077c9390;hpb=362784ce756b3f0e31cd451d9ac5e69b909d4053 diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 281699c..0c8b199 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -33,8 +33,11 @@ #include #include #include +#include +#include #include #include +#include #include #include #include /* strcmp */ @@ -45,12 +48,28 @@ 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, 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); -static TnyFolder*modest_tny_send_queue_get_sentbox (TnySendQueue *self); +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); +static TnyFolder* modest_tny_send_queue_get_sentbox (TnySendQueue *self); /* list my signals */ enum { @@ -93,6 +112,8 @@ static guint signals[LAST_SIGNAL] = {0}; static int on_modest_tny_send_queue_compare_id(gconstpointer info, gconstpointer msg_id) { + g_return_val_if_fail (info && ((SendInfo*)info)->msg_id && msg_id, -1); + return strcmp( ((SendInfo*)info)->msg_id, msg_id); } @@ -138,14 +159,17 @@ 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) { outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self)); + if (!outbox) { + g_warning ("%s: modest_tny_send_queue_get_outbox(..) returned NULL\n", __FUNCTION__); + goto frees; + } 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); + if (header) { + tny_header_set_flag (header, TNY_HEADER_FLAG_SUSPENDED); tny_iterator_next (iter); g_object_unref (header); } @@ -169,9 +193,9 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err) } static void -modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) +_on_added_to_outbox (TnySendQueue *self, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data) { - ModestTnySendQueuePrivate *priv; + ModestTnySendQueuePrivate *priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE(self); TnyHeader *header = NULL; SendInfo *info = NULL; GList* existing = NULL; @@ -180,23 +204,15 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) 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); - - /* 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 = modest_tny_send_queue_get_msg_id (header); /* msg_id = tny_header_get_message_id (header); */ - msg_id = tny_header_get_uid (header); - g_return_if_fail (msg_id != NULL); + g_return_if_fail(msg_id != NULL); + + /* Put newly added message in WAITING state */ 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); - info = existing->data; info->status = MODEST_TNY_SEND_QUEUE_WAITING; } @@ -212,10 +228,23 @@ 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); + g_object_unref(G_OBJECT(header)); } +void +modest_tny_send_queue_add (ModestTnySendQueue *self, TnyMsg *msg, GError **err) +{ + g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE(self)); + g_return_if_fail (TNY_IS_CAMEL_MSG(msg)); + + tny_camel_send_queue_add_async (TNY_CAMEL_SEND_QUEUE(self), + msg, + _on_added_to_outbox, + NULL, + NULL); +} + + static void _add_message (ModestTnySendQueue *self, TnyHeader *header) { @@ -224,7 +253,7 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header) SendInfo *info = NULL; GList* existing = NULL; gchar* msg_uid = NULL; - ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING; + ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN; gboolean editing = FALSE; g_return_if_fail (TNY_IS_SEND_QUEUE(self)); @@ -235,20 +264,20 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header) msg_uid = modest_tny_send_queue_get_msg_id (header); status = modest_tny_send_queue_get_msg_status (self, msg_uid); switch (status) { - case MODEST_TNY_SEND_QUEUE_UNKNONW: + case MODEST_TNY_SEND_QUEUE_UNKNOWN: case MODEST_TNY_SEND_QUEUE_SUSPENDED: 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; - + if(existing != NULL) + break; + /* Check if its being edited */ mgr = modest_runtime_get_window_mgr (); editing = modest_window_mgr_find_registered_header (mgr, header, NULL); - if (editing) return; + if (editing) + break; /* Add new meesage info */ info = g_slice_new (SendInfo); @@ -257,11 +286,10 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header) g_queue_push_tail (priv->queue, info); break; default: - goto frees; + break; } /* Free */ - frees: g_free(msg_uid); } @@ -330,6 +358,7 @@ modest_tny_send_queue_get_type (void) (GInstanceInitFunc) modest_tny_send_queue_instance_init, NULL }; + my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE, "ModestTnySendQueue", &my_info, 0); @@ -348,7 +377,6 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_tny_send_queue_finalize; - TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_func = modest_tny_send_queue_add; TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func = modest_tny_send_queue_get_outbox; TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox; TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel_func = modest_tny_send_queue_cancel; @@ -482,27 +510,22 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg { GList *item; item = modest_tny_send_queue_lookup_info (self, msg_id); - if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNONW; + if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNOWN; return ((SendInfo*)item->data)->status; } gchar * modest_tny_send_queue_get_msg_id (TnyHeader *header) { - const gchar *uid = NULL; gchar* msg_uid = NULL; - gchar **tmp = NULL; + const gchar *subject; + time_t date_received; /* Get message uid */ - uid = tny_header_get_uid (header); - tmp = g_strsplit (uid, "__", 2); - if (tmp[1] != NULL) - msg_uid = g_strconcat (tmp[0], "_", NULL); - else - msg_uid = g_strdup(tmp[0]); + subject = tny_header_get_subject (header); + date_received = tny_header_get_date_received (header); - /* free */ - g_strfreev(tmp); + msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received); return msg_uid; } @@ -528,13 +551,16 @@ _on_msg_start_sending (TnySendQueue *self, /* 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; + if (!item) + g_warning ("%s: item should not be NULL", __FUNCTION__); + else { + 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; + } /* free */ g_free (msg_id); @@ -549,22 +575,26 @@ _on_msg_has_been_sent (TnySendQueue *self, gpointer user_data) { ModestTnySendQueuePrivate *priv; - GList *item; gchar *msg_id = NULL; - + GList *item; priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); /* Get message uid */ msg_id = modest_tny_send_queue_get_msg_id (header); - + + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); + /* 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; + if (item) { + + /* 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); @@ -590,16 +620,15 @@ _on_msg_error_happened (TnySendQueue *self, msg_uid); if (item == NULL) { info = g_slice_new (SendInfo); - info->msg_id = strdup(msg_uid); + info->msg_id = (msg_uid != NULL)? strdup(msg_uid) : NULL; g_queue_push_tail (priv->queue, info); - } - else { + } else info = item->data; - } /* Keep in queue so that we remember that the opertion has failed */ /* and was not just cancelled */ info->status = MODEST_TNY_SEND_QUEUE_FAILED; + priv->current = NULL; /* Notify status has changed */ g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); @@ -607,3 +636,72 @@ _on_msg_error_happened (TnySendQueue *self, /* free */ g_free(msg_uid); } + +static void +fill_list_of_caches (gpointer key, gpointer value, gpointer userdata) +{ + GSList **send_queues = (GSList **) userdata; + *send_queues = g_slist_prepend (*send_queues, value); +} + +ModestTnySendQueueStatus +modest_tny_all_send_queues_get_msg_status (TnyHeader *header) +{ + ModestCacheMgr *cache_mgr = NULL; + GHashTable *send_queue_cache = NULL; + ModestTnyAccountStore *accounts_store = NULL; + TnyList *accounts = NULL; + TnyIterator *iter = NULL; + TnyTransportAccount *account = NULL; + GSList *send_queues = NULL, *node; + /* get_msg_status returns suspended by default, so we want to detect changes */ + ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN; + ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_UNKNOWN; + gchar *msg_uid = NULL; + ModestTnySendQueue *send_queue = NULL; + + msg_uid = modest_tny_send_queue_get_msg_id (header); + cache_mgr = modest_runtime_get_cache_mgr (); + send_queue_cache = modest_cache_mgr_get_cache (cache_mgr, + MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE); + + g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues); + if (send_queues == NULL) { + accounts = tny_simple_list_new (); + accounts_store = modest_runtime_get_account_store (); + tny_account_store_get_accounts (TNY_ACCOUNT_STORE(accounts_store), + accounts, + TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + + iter = tny_list_create_iterator (accounts); + while (!tny_iterator_is_done (iter)) { + account = TNY_TRANSPORT_ACCOUNT(tny_iterator_get_current (iter)); + send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account)); + g_object_unref(account); + + queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid); + if (queue_status != MODEST_TNY_SEND_QUEUE_UNKNOWN) { + status = queue_status; + break; + } + tny_iterator_next (iter); + } + g_object_unref (iter); + g_object_unref (accounts); + } + else { + for (node = send_queues; node != NULL; node = g_slist_next (node)) { + send_queue = MODEST_TNY_SEND_QUEUE (node->data); + + queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid); + if (queue_status != MODEST_TNY_SEND_QUEUE_UNKNOWN) { + status = queue_status; + break; + } + } + } + + g_free(msg_uid); + g_slist_free (send_queues); + return status; +}