#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:
}
static void
-set_cell_text (GtkCellRenderer *renderer,
- const gchar *text,
+set_cell_text (GtkCellRenderer *renderer,
+ const gchar *text,
TnyHeaderFlags flags)
{
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;
+ }
+ }
bold_is_active_color = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), BOLD_IS_ACTIVE_COLOR));
if (bold_is_active_color) {
NULL);
}
}
+
+ if (newtext)
+ g_free (newtext);
+
g_object_thaw_notify (G_OBJECT (renderer));
}
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);
}
{
TnyHeaderFlags flags = 0;
gchar *recipients = NULL, *addresses;
- GSList *recipient_list;
gchar *subject = NULL;
time_t date;
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*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
/* 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);
set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"),
g_free (subject);
/* Show the list of senders/recipients */
- addresses = NULL;
- recipient_list = modest_text_utils_split_addresses_list (recipients);
- if (recipient_list) {
- GString *add_string = g_string_sized_new (strlen (recipients));
- GSList *iter = recipient_list;
- gboolean first = TRUE;
-
- while (iter) {
- /* Strings are changed in place */
- modest_text_utils_get_display_address ((gchar *) iter->data);
- if (G_UNLIKELY (first)) {
- g_string_append_printf (add_string, "%s", (gchar *) iter->data);
- first = FALSE;
- } else {
- g_string_append_printf (add_string, ", %s", (gchar *) iter->data);
- }
- iter = g_slist_next (iter);
- }
- g_slist_foreach (recipient_list, (GFunc) g_free, NULL);
- g_slist_free (recipient_list);
- addresses = g_string_free (add_string, FALSE);
- }
-
+ 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);