* Define a new mail-operation to remove several messages.

[modest] / src / widgets / modest-header-view-render.c

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index cbe0051..3a0b66c 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -27,10 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <tny-simple-list.h>
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-icon-names.h>
 #include <modest-text-utils.h>
+#include <modest-tny-account-store.h>
 #include <modest-tny-send-queue.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
@@ -50,13 +52,18 @@ fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
 static ModestTnySendQueueStatus
 get_status_of_uid (TnyHeader *header)
 {
-       ModestCacheMgr *cache_mgr;
-       GHashTable     *send_queue_cache;
+       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_SUSPENDED;
        ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
        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 ();
@@ -64,14 +71,38 @@ get_status_of_uid (TnyHeader *header)
                                                       MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
        
        g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
-       
-       for (node = send_queues; node != NULL; node = g_slist_next (node)) {
-               ModestTnySendQueue *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_UNKNONW) {
-                       status = queue_status;
-                       break;
+       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_UNKNONW) {
+                               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_UNKNONW) {
+                               status = queue_status;
+                               break;
+                       }
                }
        }