#include <tny-simple-list.h>
#include <modest-header-view.h>
#include <modest-header-view-priv.h>
+#include <modest-defs.h>
#include <modest-icon-names.h>
#include <modest-text-utils.h>
#include <modest-tny-account-store.h>
#include <modest-platform.h>
#include <string.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#else
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#endif
+
+#define MODEST_HEADER_VIEW_MAX_TEXT_LENGTH 128
static const gchar *
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;
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);
+ 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);
+ 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;
}
}
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
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);
}
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
date_col, &date,
-1);
-
- g_object_set (G_OBJECT(renderer), "text", modest_text_utils_get_display_date (date),
- NULL);
- set_common_flags (renderer, flags);
+#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
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);
-
+
modest_text_utils_get_display_address (address); /* string is changed in-place */
- g_object_set (G_OBJECT(renderer),
- "text",
- address,
- NULL);
- g_free (address);
- set_common_flags (renderer, flags);
+ set_cell_text (renderer, (address && address[0] != '\0')?address:_("mail_va_no_to"),
+ flags);
+ g_free (address);
}
/*
* this for both incoming and outgoing mail, depending on the the user_data
_modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- /* 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 *recipients = NULL, *addresses;
gchar *subject = NULL;
- gchar *header = NULL;
time_t date;
-
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
*recipient_box, *subject_box = NULL;
TnyHeader *msg_header = NULL;
- gchar *display_date = NULL, *tmp_date = 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"));
priority_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "priority-renderer"));
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_INSTANCE_COLUMN, &msg_header,
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,
/* 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 (msg_header)
+ is_calendar = tny_header_get_user_flag (msg_header, "calendar");
+ if (msg_header) {
prio = tny_header_get_priority (msg_header);
+ }
+
g_object_set (G_OBJECT (priority_cell), "pixbuf",
- get_pixbuf_for_flag (prio),
+ get_pixbuf_for_flag (prio, is_calendar),
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);
- }
-
+ set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"),
+ flags);
g_free (subject);
- set_common_flags (subject_cell, flags);
- /* FIXME: we hardcode the color to #666666; instead we should use SecondaryTextColour from the
- * theme (gtkrc file) */
- 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,
- NULL);
- g_free (header);
- header = NULL;
- set_common_flags (recipient_cell, flags);
-
+ /* 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_UNKNOWN;
const gchar *status_str = "";
tny_header_set_flag (msg_header, TNY_HEADER_FLAG_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);
- 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,
- NULL);
- g_free (tmp_date);
- tmp_date = NULL;
- g_free (display_date);
- display_date = NULL;
+ set_cell_text (date_or_status_cell, status_str, flags);
+ } else {
+#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
}
-
if (msg_header != NULL)
g_object_unref (msg_header);
-
- set_common_flags (date_or_status_cell, flags);
}
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);
}
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);
}
projects / modest / blobdiff