#include <modest-header-view-priv.h>
#include <modest-icon-names.h>
#include <modest-text-utils.h>
+#include <modest-tny-send-queue.h>
+#include <modest-tny-folder.h>
+#include <modest-tny-account.h>
#include <modest-runtime.h>
#include <glib/gi18n.h>
#include <modest-platform.h>
#include <string.h>
+
+void
+fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
+{
+ GSList **send_queues = (GSList **) userdata;
+ *send_queues = g_slist_prepend (*send_queues, value);
+}
+
+static ModestTnySendQueueStatus
+get_status_of_uid (const gchar *uid)
+{
+ ModestCacheMgr *cache_mgr;
+ GHashTable *send_queue_cache;
+ 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;
+
+ 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);
+
+ for (node = send_queues; node != NULL; node = g_slist_next (node)) {
+ ModestTnySendQueueStatus queue_status = modest_tny_send_queue_get_msg_status (
+ MODEST_TNY_SEND_QUEUE (node->data), uid);
+ if (queue_status != MODEST_TNY_SEND_QUEUE_SUSPENDED)
+ status = queue_status;
+ break;
+ }
+ g_slist_free (send_queues);
+ return status;
+}
+
+static const gchar *
+get_status_string (ModestTnySendQueueStatus status)
+{
+ switch (status) {
+ case MODEST_TNY_SEND_QUEUE_WAITING:
+ return _("mcen_li_outbox_waiting");
+ break;
+ case MODEST_TNY_SEND_QUEUE_SENDING:
+ return _("mcen_li_outbox_sending");
+ break;
+ case MODEST_TNY_SEND_QUEUE_SUSPENDED:
+ return _("mcen_li_outbox_suspended");
+ break;
+ case MODEST_TNY_SEND_QUEUE_FAILED:
+ return _("mcen_li_outbox_failed");
+ break;
+ default:
+ return "";
+ break;
+ }
+}
+
static GdkPixbuf*
get_pixbuf_for_flag (TnyHeaderFlags flag)
{
TnyHeaderFlags flags;
gchar *address, *subject, *header;
time_t date;
- gboolean is_incoming;
- GtkCellRenderer *recipient_cell, *date_cell, *subject_cell,
+ ModestHeaderViewCompactHeaderMode header_mode;
+ GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
*recipient_box, *subject_box;
+ TnyHeader *msg_header;
gchar *display_date = NULL, *tmp_date = NULL;
recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
subject_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "subject-renderer"));
attach_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "attach-renderer"));
recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
- date_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
+ date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
- is_incoming = GPOINTER_TO_INT(user_data); /* GPOINTER_TO_BOOLEAN is not available
- * in older versions of glib...*/
+ header_mode = GPOINTER_TO_INT (user_data);
- if (is_incoming)
+ if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN)
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &address,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &address,
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
+ TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
+ TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
-1);
/* flags */
g_free (header);
set_common_flags (recipient_cell, flags);
- /* in some rare cases, mail might have no Date: field. it case,
- * don't show the date, instead of bogus 1/1/1970
- */
- if (date)
- tmp_date = modest_text_utils_get_display_date (date);
- else
- tmp_date = g_strdup ("");
-
- display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
- g_object_set (G_OBJECT (date_cell), "markup", display_date, NULL);
- g_free (tmp_date);
- g_free (display_date);
- set_common_flags (date_cell, flags);
+ if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
+ ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING;
+ const gchar *status_str = "";
+ if (msg_header != NULL) {
+ status = get_status_of_uid (tny_header_get_message_id (msg_header));
+ }
+ status_str = get_status_string (status);
+ /* TODO: for now we set the status to waiting always, we need a way to
+ * retrieve the current send status of a message */
+ status_str = get_status_string (MODEST_TNY_SEND_QUEUE_WAITING);
+ display_date = g_strdup_printf("<small>%s</small>", status_str);
+ g_object_set (G_OBJECT (date_or_status_cell), "markup", display_date, NULL);
+ g_free (display_date);
+ } else {
+ /* in some rare cases, mail might have no Date: field. it case,
+ * don't show the date, instead of bogus 1/1/1970
+ */
+ if (date)
+ tmp_date = modest_text_utils_get_display_date (date);
+ else
+ tmp_date = g_strdup ("");
+
+ display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+ g_object_set (G_OBJECT (date_or_status_cell), "markup", display_date, NULL);
+ g_free (tmp_date);
+ g_free (display_date);
+ }
+ set_common_flags (date_or_status_cell, flags);
}
GtkTreeViewColumn *column=NULL;
GtkTreeSelection *selection = NULL;
GtkCellRenderer *renderer_msgtype,*renderer_header,
- *renderer_attach, *renderer_compact_date;
+ *renderer_attach, *renderer_compact_date_or_status;
GtkCellRenderer *renderer_compact_header, *renderer_recpt_box,
*renderer_subject, *renderer_subject_box, *renderer_recpt,
*renderer_priority;
renderer_subject_box = modest_hbox_cell_renderer_new ();
renderer_recpt = gtk_cell_renderer_text_new ();
renderer_subject = gtk_cell_renderer_text_new ();
- renderer_compact_date = gtk_cell_renderer_text_new ();
+ renderer_compact_date_or_status = gtk_cell_renderer_text_new ();
modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt);
- modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date, FALSE);
- g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
+ g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
g_object_set(G_OBJECT(renderer_header),
"ellipsize", PANGO_ELLIPSIZE_END,
g_object_set (G_OBJECT (renderer_recpt),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
- g_object_set(G_OBJECT(renderer_compact_date),
+ g_object_set(G_OBJECT(renderer_compact_date_or_status),
"xalign", 1.0,
NULL);
TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
FALSE,
(GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(TRUE));
+ GINT_TO_POINTER(MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN));
compact_column = column;
break;
case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
column = get_new_column (_("Header"), renderer_compact_header, TRUE,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
- FALSE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(FALSE));
+ TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+ FALSE,
+ (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+ GINT_TO_POINTER((type == TNY_FOLDER_TYPE_OUTBOX)?
+ MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX:
+ MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUT));
compact_column = column;
break;
NULL);
break;
case MODEST_HEADER_VIEW_COLUMN_STATUS:
- column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+ column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE,
TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
FALSE,
(GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
projects / modest / commitdiff