#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 (TnyHeader *header)
+{
+ 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;
+ ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+ gchar *msg_uid = 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);
+
+ 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;
+ }
+ }
+
+ g_free(msg_uid);
+ 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)
{
return attachments_pixbuf;
case TNY_HEADER_FLAG_HIGH_PRIORITY:
if (G_UNLIKELY(!high_pixbuf))
- high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+ high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH);
return high_pixbuf;
case TNY_HEADER_FLAG_LOW_PRIORITY:
if (G_UNLIKELY(!low_pixbuf))
- low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+ low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW);
return low_pixbuf;
default:
if (G_UNLIKELY(!unread_pixbuf))
_modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags, prior_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 = NULL;
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 */
+ prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
g_object_set (G_OBJECT (attach_cell), "pixbuf",
get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS),
NULL);
else
g_object_set (G_OBJECT (attach_cell), "pixbuf",
- get_pixbuf_for_flag (0), NULL);
+ NULL, NULL);
if (flags & TNY_HEADER_FLAG_PRIORITY)
g_object_set (G_OBJECT (priority_cell), "pixbuf",
- get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY),
+ get_pixbuf_for_flag (prior_flags),
+/* get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY), */
NULL);
else
g_object_set (G_OBJECT (priority_cell), "pixbuf",
- get_pixbuf_for_flag (0), NULL);
+ NULL, NULL);
header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject"));
g_free (subject);
g_object_set (G_OBJECT (subject_cell), "markup", header, NULL);
+ g_free (header);
set_common_flags (subject_cell, flags);
- header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
- g_free (address);
- g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);
- g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);
- set_common_flags (recipient_cell, flags);
-
- tmp_date = modest_text_utils_get_display_date (date);
- 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);
+ /* fixme: we hardcode the color to #666666; instead we should use SecundaryTextColour from the
+ * theme (gtkrc file) */
+ header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>", modest_text_utils_get_display_address (address));
+ g_free (address);
+ g_object_set (G_OBJECT (recipient_cell),
+ "markup", header,
+ NULL);
g_free (header);
+ set_common_flags (recipient_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 (msg_header);
+ if (status == MODEST_TNY_SEND_QUEUE_SUSPENDED) {
+ tny_header_unset_flags (msg_header, TNY_HEADER_FLAG_PRIORITY);
+ tny_header_set_flags (msg_header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+ }
+/* if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY) */
+/* status = MODEST_TNY_SEND_QUEUE_SUSPENDED; */
+ }
+ status_str = get_status_string (status);
+ display_date = g_strdup_printf("<span size='small' foreground='#666666'>%s</span>", 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 ("<span size='small' foreground='#666666'>%s</span>", tmp_date);
+ g_object_set (G_OBJECT (date_or_status_cell),
+ "markup", display_date,
+ NULL);
+ g_free (tmp_date);
+ g_free (display_date);
+ }
+ if (msg_header != NULL)
+ g_object_unref (msg_header);
+ set_common_flags (date_or_status_cell, flags);
}
GtkTreeModel *tree_model, GtkTreeIter *iter,
gpointer user_data)
{
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags, prior_flags;
//guint status;
gchar *status_str;
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- // TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
-1);
- status_str = g_strdup(_("mcen_li_outbox_waiting"));
-
+ prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
+ if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY)
+ status_str = g_strdup(_("mcen_li_outbox_suspended"));
+ else
+ status_str = g_strdup(_("mcen_li_outbox_waiting"));
+
g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
set_common_flags (renderer, flags);
projects / modest / blobdiff