* 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
+static void
fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
{
GSList **send_queues = (GSList **) 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;
+ ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
+ ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_UNKNONW;
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 ();
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;
+ }
}
}
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))
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);
}
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;
- time_t date;
- ModestHeaderViewCompactHeaderMode header_mode;
+ 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));
+
+ /* Note that GtkTreeModel is a GtkTreeModelFilter. */
+
+ /* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
+
+ TnyHeaderFlags flags = 0;
+ TnyHeaderFlags prior_flags = 0;
+ gchar *address = NULL;
+ gchar *subject = NULL;
+ gchar *header = NULL;
+ time_t date = 0;
+
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;
recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-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_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 */
+ /* FIXME: we might gain something by doing all the g_object_set's at once */
prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
g_object_set (G_OBJECT (attach_cell), "pixbuf",
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 (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_UNKNONW;
const gchar *status_str = "";
if (msg_header != NULL) {
status = get_status_of_uid (msg_header);
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("<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);
+ display_date = NULL;
} else {
/* in some rare cases, mail might have no Date: field. it case,
* don't show the date, instead of bogus 1/1/1970
else
tmp_date = g_strdup ("");
- display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+ 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,
- "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);
}
projects / modest / blobdiff