* 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>
#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)
{
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;
+ case TNY_HEADER_FLAG_NORMAL_PRIORITY:
+ return NULL;
default:
if (G_UNLIKELY(!unread_pixbuf))
unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
{
TnyHeaderFlags flags;
guint date, date_col;
- gchar *display_date = NULL;
gboolean received = GPOINTER_TO_INT(user_data);
if (received)
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
date_col, &date,
-1);
-
- display_date = modest_text_utils_get_display_date (date);
- g_object_set (G_OBJECT(renderer), "text", display_date, NULL);
+
+ g_object_set (G_OBJECT(renderer), "text", modest_text_utils_get_display_date (date),
+ NULL);
set_common_flags (renderer, flags);
- g_free (display_date);
}
void
-_modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
+_modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gboolean is_sender)
{
TnyHeaderFlags flags;
gchar *address;
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
+ modest_text_utils_get_display_address (address); /* string is changed in-place */
g_object_set (G_OBJECT(renderer),
"text",
- modest_text_utils_get_display_address (address),
+ address,
NULL);
g_free (address);
+
set_common_flags (renderer, flags);
}
/*
_modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- TnyHeaderFlags flags, prior_flags;
- gchar *address, *subject, *header;
+ /* Note that GtkTreeModel is a GtkTreeModelFilter. */
+
+ /* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
+
+ TnyHeaderFlags flags = 0;
+ gchar *address = NULL;
+ gchar *subject = NULL;
+ gchar *header = NULL;
time_t date;
- ModestHeaderViewCompactHeaderMode header_mode;
+
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
- *recipient_box, *subject_box;
- TnyHeader *msg_header;
+ *recipient_box, *subject_box = NULL;
+ TnyHeader *msg_header = NULL;
gchar *display_date = NULL, *tmp_date = NULL;
+ TnyHeaderFlags prio = 0;
+
+ g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
+ g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
+ g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
+
recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
priority_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "priority-renderer"));
recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
- header_mode = GPOINTER_TO_INT (user_data);
+ ModestHeaderViewCompactHeaderMode header_mode = GPOINTER_TO_INT (user_data);
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_SUBJECT_COLUMN, &subject,
- TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
+ TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
+ TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
-1);
else
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
- -1);
-
+ -1);
/* flags */
- prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
+ /* FIXME: we might gain something by doing all the g_object_set's at once */
if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
g_object_set (G_OBJECT (attach_cell), "pixbuf",
get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS),
else
g_object_set (G_OBJECT (attach_cell), "pixbuf",
NULL, NULL);
- if (flags & TNY_HEADER_FLAG_PRIORITY)
- g_object_set (G_OBJECT (priority_cell), "pixbuf",
- 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",
- NULL, NULL);
- header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject"));
+
+ if (msg_header)
+ prio = tny_header_get_priority (msg_header);
+ g_object_set (G_OBJECT (priority_cell), "pixbuf",
+ get_pixbuf_for_flag (prio),
+ NULL);
+
+ if (subject && strlen (subject)) {
+ gchar* escaped_subject = g_markup_escape_text (subject, -1);
+ g_object_set (G_OBJECT (subject_cell), "markup",
+ escaped_subject, NULL);
+ g_free (escaped_subject);
+ } else {
+ g_object_set (G_OBJECT (subject_cell), "markup",
+ _("mail_va_no_subject"), NULL);
+ }
+
g_free (subject);
- g_object_set (G_OBJECT (subject_cell), "markup", header, NULL);
- g_free (header);
set_common_flags (subject_cell, flags);
-
- /* fixme: we hardcode the color to #666666; instead we should use SecundaryTextColour from the
+ /* FIXME: we hardcode the color to #666666; instead we should use SecondaryTextColour from the
* theme (gtkrc file) */
-
- header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
+ modest_text_utils_get_display_address (address); /* changed in-place */
+ header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>",
+ address);
g_free (address);
g_object_set (G_OBJECT (recipient_cell),
"markup", header,
- "foreground", "#666666",
NULL);
g_free (header);
+ header = NULL;
set_common_flags (recipient_cell, flags);
-
+
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
- ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING;
+ ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
const gchar *status_str = "";
if (msg_header != NULL) {
- /* TODO: ask send queue for msg sending status */
-/* status = get_status_of_uid (tny_header_get_message_id (msg_header)); */
- if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY)
- status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+ status = modest_tny_all_send_queues_get_msg_status (msg_header);
+ if (status == MODEST_TNY_SEND_QUEUE_SUSPENDED) {
+ tny_header_set_flag (msg_header, TNY_HEADER_FLAG_SUSPENDED);
+ }
}
+
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);
+ 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,
- "foreground", "#666666",
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);
+ display_date = NULL;
+ } else {
+ display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>",
+ date ? modest_text_utils_get_display_date (date) : "");
g_object_set (G_OBJECT (date_or_status_cell),
"markup", display_date,
- "foreground", "#666666",
NULL);
g_free (tmp_date);
+ tmp_date = NULL;
g_free (display_date);
+ display_date = NULL;
}
+
+ 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, prior_flags;
+ TnyHeaderFlags flags;
//guint status;
gchar *status_str;
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
-
- prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
- if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY)
+
+ if (flags & TNY_HEADER_FLAG_SUSPENDED)
status_str = g_strdup(_("mcen_li_outbox_suspended"));
else
status_str = g_strdup(_("mcen_li_outbox_waiting"));