#include <string.h>
#ifdef MODEST_TOOLKIT_HILDON2
-#define SMALL_ICON_SIZE MODEST_ICON_SIZE_XSMALL
+#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 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;
+ 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));
}
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 */
-
+
set_cell_text (renderer, (address && address[0] != '\0')?address:_("mail_va_no_to"),
flags);
g_free (address);
_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;
time_t date;
-
-#ifdef MAEMO_CHANGES
-#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
- GtkTreeCellDataHint hint;
-#endif
-#endif
-
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
*recipient_box, *subject_box = NULL;
TnyHeader *msg_header = NULL;
TnyHeaderFlags prio = 0;
+#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));
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,
flags);
g_free (subject);
- /* 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 */
- set_cell_text (recipient_cell, (address && address[0] != '\0')?address:_("mail_va_no_to"), flags);
- g_free (address);
-
+ /* 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);
set_cell_text (date_or_status_cell, status_str, flags);
} else {
projects / modest / blobdiff