X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view-render.c;h=455c94ef15d72b6c1785300b74b2ec599c7606dc;hp=1d027f6d29078d4c16bc0a2d6a8c636d29da31dc;hb=HEAD;hpb=c5503361ea2bd6c0b45c1d6a22fe3f9a383c4d84 diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c index 1d027f6..455c94e 100644 --- a/src/widgets/modest-header-view-render.c +++ b/src/widgets/modest-header-view-render.c @@ -27,10 +27,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include +#include #include #include +#include #include #include #include @@ -39,39 +42,13 @@ #include #include +#ifdef MODEST_TOOLKIT_HILDON2 +#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL +#else +#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL +#endif -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; */ -/* } */ +#define MODEST_HEADER_VIEW_MAX_TEXT_LENGTH 128 static const gchar * get_status_string (ModestTnySendQueueStatus status) @@ -96,7 +73,7 @@ get_status_string (ModestTnySendQueueStatus status) } static GdkPixbuf* -get_pixbuf_for_flag (TnyHeaderFlags flag) +get_pixbuf_for_flag (TnyHeaderFlags flag, gboolean is_calendar) { /* optimization */ static GdkPixbuf *deleted_pixbuf = NULL; @@ -105,31 +82,47 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) static GdkPixbuf *attachments_pixbuf = NULL; static GdkPixbuf *high_pixbuf = NULL; static GdkPixbuf *low_pixbuf = NULL; + static GdkPixbuf *calendar_pixbuf = NULL; + + if (is_calendar) { + if (G_UNLIKELY(!calendar_pixbuf)) + calendar_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_CALENDAR, + SMALL_ICON_SIZE); + return calendar_pixbuf; + } switch (flag) { case TNY_HEADER_FLAG_DELETED: if (G_UNLIKELY(!deleted_pixbuf)) - deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED); + deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED, + SMALL_ICON_SIZE); return deleted_pixbuf; case TNY_HEADER_FLAG_SEEN: if (G_UNLIKELY(!seen_pixbuf)) - seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ); + seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ, + SMALL_ICON_SIZE); return seen_pixbuf; case TNY_HEADER_FLAG_ATTACHMENTS: if (G_UNLIKELY(!attachments_pixbuf)) - attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH); + attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH, + SMALL_ICON_SIZE); 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, + SMALL_ICON_SIZE); 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, + SMALL_ICON_SIZE); 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); + unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD, + SMALL_ICON_SIZE); return unread_pixbuf; } } @@ -143,25 +136,69 @@ set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags) NULL); } - -void -_modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) +static void +set_cell_text (GtkCellRenderer *renderer, + const gchar *text, + TnyHeaderFlags flags) { - TnyHeaderFlags flags; - - gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, - &flags, -1); + gboolean strikethrough; + gboolean bold_is_active_color; + GdkColor *color = NULL; + PangoWeight weight; + gchar *newtext = NULL; + + /* We have to limit the size of the text. Otherwise Pango + could cause freezes trying to render too large texts. This + prevents DoS attacks with specially malformed emails */ + if (g_utf8_validate(text, -1, NULL)) { + if (g_utf8_strlen (text, -1) > MODEST_HEADER_VIEW_MAX_TEXT_LENGTH) { + /* UTF-8 bytes are 4 bytes length in the worst case */ + newtext = g_malloc0 (MODEST_HEADER_VIEW_MAX_TEXT_LENGTH * 4); + g_utf8_strncpy (newtext, text, MODEST_HEADER_VIEW_MAX_TEXT_LENGTH); + text = newtext; + } + } else { + if (strlen (text) > MODEST_HEADER_VIEW_MAX_TEXT_LENGTH) { + newtext = g_malloc0 (MODEST_HEADER_VIEW_MAX_TEXT_LENGTH); + strncpy (newtext, text, MODEST_HEADER_VIEW_MAX_TEXT_LENGTH); + text = newtext; + } + } - if (flags & TNY_HEADER_FLAG_DELETED) - g_object_set (G_OBJECT (renderer), "pixbuf", - get_pixbuf_for_flag (TNY_HEADER_FLAG_DELETED), NULL); - else if (flags & TNY_HEADER_FLAG_SEEN) - g_object_set (G_OBJECT (renderer), "pixbuf", - get_pixbuf_for_flag (TNY_HEADER_FLAG_SEEN), NULL); - else - g_object_set (G_OBJECT (renderer), "pixbuf", - get_pixbuf_for_flag (0), NULL); /* ughh, FIXME */ + bold_is_active_color = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), BOLD_IS_ACTIVE_COLOR)); + if (bold_is_active_color) { + color = g_object_get_data (G_OBJECT (renderer), ACTIVE_COLOR); + } + +#ifdef MODEST_TOOLKIT_HILDON2 + weight = PANGO_WEIGHT_NORMAL; +#else + weight = (bold_is_active_color || (flags & TNY_HEADER_FLAG_SEEN)) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD; +#endif + strikethrough = (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE; + g_object_freeze_notify (G_OBJECT (renderer)); + g_object_set (G_OBJECT (renderer), + "text", text, + "weight", weight, + "strikethrough", (flags &TNY_HEADER_FLAG_DELETED) ? TRUE : FALSE, + NULL); + if (bold_is_active_color && color) { + if (flags & TNY_HEADER_FLAG_SEEN) { + g_object_set (G_OBJECT (renderer), + "foreground-set", FALSE, + NULL); + } else { + g_object_set (G_OBJECT (renderer), + "foreground-gdk", color, + "foreground-set", TRUE, + NULL); + } + } + + if (newtext) + g_free (newtext); + + g_object_thaw_notify (G_OBJECT (renderer)); } void @@ -175,7 +212,7 @@ _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer if (flags & TNY_HEADER_FLAG_ATTACHMENTS) g_object_set (G_OBJECT (renderer), "pixbuf", - get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS), + get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS, FALSE), NULL); } @@ -198,7 +235,6 @@ _modest_header_view_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer { TnyHeaderFlags flags; guint date, date_col; - gchar *display_date = NULL; gboolean received = GPOINTER_TO_INT(user_data); if (received) @@ -211,16 +247,24 @@ _modest_header_view_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer date_col, &date, -1); - display_date = modest_text_utils_get_display_date (date); - g_object_set (G_OBJECT(renderer), "text", display_date, NULL); - - set_common_flags (renderer, flags); - g_free (display_date); +#if GTK_CHECK_VERSION (2, 12, 0) + ModestHeaderView *header_view; + header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column)); + set_cell_text (renderer, + _modest_header_view_get_display_date (header_view, date), + flags); +#else + set_cell_text (renderer, modest_text_utils_get_display_date (date), + flags); +#endif } 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; @@ -230,18 +274,17 @@ _modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkC sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN; else sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN; - + gtk_tree_model_get (tree_model, iter, sender_receiver_col, &address, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - - g_object_set (G_OBJECT(renderer), - "text", - modest_text_utils_get_display_address (address), - NULL); + + modest_text_utils_get_display_address (address); /* string is changed in-place */ + + set_cell_text (renderer, (address && address[0] != '\0')?address:_("mail_va_no_to"), + flags); g_free (address); - set_common_flags (renderer, flags); } /* * this for both incoming and outgoing mail, depending on the the user_data @@ -252,15 +295,35 @@ void _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; + TnyHeaderFlags flags = 0; + gchar *recipients = NULL, *addresses; + gchar *subject = 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; - gchar *display_date = NULL, *tmp_date = NULL; + *recipient_box, *subject_box = NULL; + TnyHeader *msg_header = NULL; + TnyHeaderFlags prio = 0; + gboolean is_calendar = FALSE; + +#ifdef MAEMO_CHANGES +#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT + GtkTreeCellDataHint hint; +#endif +#endif + + 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)); + +#ifdef MAEMO_CHANGES +#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT + hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column)); + + if (hint != GTK_TREE_CELL_DATA_HINT_ALL) + return; +#endif +#endif 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")); @@ -270,98 +333,81 @@ _modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCe 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_FROM_COLUMN, &recipients, 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_FLAGS_COLUMN, &flags, - TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &address, + TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &recipients, 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 */ - flags = tny_header_get_flags (msg_header); - 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), + get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS, FALSE), NULL); 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")); - 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 - * theme (gtkrc file) */ + is_calendar = tny_header_get_user_flag (msg_header, "calendar"); + if (msg_header) { + prio = tny_header_get_priority (msg_header); + } - header = g_markup_printf_escaped ("%s", modest_text_utils_get_display_address (address)); - g_free (address); - g_object_set (G_OBJECT (recipient_cell), - "markup", header, - "foreground", "#666666", + g_object_set (G_OBJECT (priority_cell), "pixbuf", + get_pixbuf_for_flag (prio, is_calendar), NULL); - g_free (header); - set_common_flags (recipient_cell, flags); + set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"), + flags); + g_free (subject); + + /* Show the list of senders/recipients */ + addresses = modest_text_utils_get_display_addresses ((const gchar *) recipients); + set_cell_text (recipient_cell, (addresses) ? addresses : _("mail_va_no_to"), flags); + g_free (addresses); + g_free (recipients); + + /* Show status (outbox folder) or sent date */ 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("%s", status_str); - g_object_set (G_OBJECT (date_or_status_cell), - "markup", display_date, - "foreground", "#666666", - NULL); - g_free (display_date); + set_cell_text (date_or_status_cell, status_str, flags); } 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 ("%s", tmp_date); - g_object_set (G_OBJECT (date_or_status_cell), - "markup", display_date, - "foreground", "#666666", - NULL); - g_free (tmp_date); - g_free (display_date); +#if GTK_CHECK_VERSION (2, 12, 0) + ModestHeaderView *header_view; + header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column)); + set_cell_text (date_or_status_cell, + date ? _modest_header_view_get_display_date (header_view, date) : "", + flags); +#else + set_cell_text (date_or_status_cell, + date ? modest_text_utils_get_display_date (date) : "", + flags); +#endif } - set_common_flags (date_or_status_cell, flags); + if (msg_header != NULL) + g_object_unref (msg_header); } @@ -381,8 +427,7 @@ _modest_header_view_size_cell_data (GtkTreeViewColumn *column, GtkCellRenderer size_str = modest_text_utils_get_display_size (size); - g_object_set (G_OBJECT(renderer), "text", size_str, NULL); - set_common_flags (renderer, flags); + set_cell_text (renderer, size_str, flags); g_free (size_str); } @@ -392,22 +437,20 @@ _modest_header_view_status_cell_data (GtkTreeViewColumn *column, GtkCellRender 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")); - g_object_set (G_OBJECT(renderer), "text", status_str, NULL); - set_common_flags (renderer, flags); + set_cell_text (renderer, status_str, flags); g_free (status_str); }