#include <modest-platform.h>
+static gchar *
+_pango_replace_string (const gchar *string,
+ const gchar *in,
+ const gchar *out)
+{
+ gchar **tmp = NULL;
+ gchar *new_string = NULL;
+ gchar *tmp_string = NULL;
+ guint i = 0;
+
+ /* Split data */
+ if (string == NULL) return g_strdup("");
+ tmp = g_strsplit(string, in, 0);
+ if (tmp[0] == NULL) return g_strdup(string);
+
+ /* Replace and concat data*/
+ new_string = g_strdup(tmp[0]);
+ for (i = 1; tmp[i] != NULL; i++) {
+ tmp_string = g_strconcat (new_string, out, tmp[i], NULL);
+ g_free(new_string);
+ new_string = g_strdup(tmp_string);
+ g_free(tmp_string);
+ }
+
+ /* Free */
+ g_strfreev(tmp);
+
+ return new_string;
+}
+
+static gchar *
+_pango_parse_string (const gchar *string)
+{
+ gchar *parsed_string = NULL;
+ gchar *tmp = NULL;
+
+ if (string == NULL) return g_strdup("");
+ parsed_string = g_strdup(string);
+
+ /* Check for '&' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "&", "&");
+ g_free(tmp);
+
+ /* Check for '<' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "<", "<");
+ g_free(tmp);
+
+ /* Check for '>' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, ">", ">");
+ g_free(tmp);
+
+ /* Check for ''' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "'", "'");
+ g_free(tmp);
+
+ return parsed_string;
+}
+
+
static GdkPixbuf*
get_pixbuf_for_flag (TnyHeaderFlags flag)
{
}
static GdkPixbuf*
-get_pixbuf_for_compact_flag (TnyHeaderFlags flag)
+get_pixbuf_for_compact_flag (TnyHeaderFlags flags)
{
/* optimization */
static GdkPixbuf *high_attachments_pixbuf = NULL;
static GdkPixbuf *high_pixbuf = NULL;
static GdkPixbuf *low_pixbuf = NULL;
- if (flag & TNY_HEADER_FLAG_ATTACHMENTS) {
- if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+ if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
+ if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) {
if (G_UNLIKELY(!high_attachments_pixbuf))
high_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY);
return high_attachments_pixbuf;
}
- else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+ else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) {
if (G_UNLIKELY(!low_attachments_pixbuf))
low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY);
return low_attachments_pixbuf;
return normal_attachments_pixbuf;
}
}
- else if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+ else if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) {
if (G_UNLIKELY(!high_pixbuf))
high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
return high_pixbuf;
}
- else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+ else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) {
if (G_UNLIKELY(!low_pixbuf))
low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
return low_pixbuf;
set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags)
{
g_object_set (G_OBJECT(renderer),
- "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
+ "weight", (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD,
"strikethrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE,
NULL);
}
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
TnyHeaderFlags flags;
+ GdkPixbuf* pixbuf = NULL;
gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
&flags, -1);
-
- flags = TNY_HEADER_FLAG_ATTACHMENTS;
- if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- }
- else {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- }
+
+ pixbuf = get_pixbuf_for_compact_flag (flags);
+ if (pixbuf != NULL)
+ g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
+
}
void
{
TnyHeaderFlags flags;
guint date, date_col;
+ gchar *display_date = NULL;
+ gboolean received = GPOINTER_TO_INT(user_data);
+
+ if (received)
+ date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
+ else
+ date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
+
+ gtk_tree_model_get (tree_model, iter,
+ 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);
+
+ set_common_flags (renderer, flags);
+ g_free (display_date);
+}
+
+void
+_modest_header_view_compact_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter,
+ gpointer user_data)
+{
+ TnyHeaderFlags flags;
+ guint date, date_col;
gchar *display_date = NULL, *tmp_date = NULL;
gboolean received = GPOINTER_TO_INT(user_data);
g_free (display_date);
}
-
void
_modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
{
GObject *rendobj;
TnyHeaderFlags flags;
- gchar *address, *subject, *header;
+ gchar *address, *subject, *header, *display_address;
+ gchar *parsed_address, *parsed_subject;
time_t date;
gboolean is_incoming;
-1);
rendobj = G_OBJECT(renderer);
- if (flags & TNY_HEADER_FLAG_SEEN)
- header = g_strdup_printf ("<b>%s</b>\n<small>%s</small>",
- subject,
- modest_text_utils_get_display_address (address));
- else
- header = g_strdup_printf ("<i>%s</i>\n<small>%s</small>",
- subject,
- modest_text_utils_get_display_address (address));
+
+ /* deal with empty subjects */
+ if (!subject)
+ subject = g_strdup (_("mail_va_no_subject"));
+
+ /* Escape special characteres to allow pango makup`*/
+ display_address = modest_text_utils_get_display_address (address);
+ parsed_address = _pango_parse_string (display_address);
+ parsed_subject = _pango_parse_string (subject);
+
+ header = g_strdup_printf ("%s\n<small>%s</small>",
+ parsed_subject,
+ parsed_address);
g_free (address);
g_free (subject);
-
- g_object_set (G_OBJECT(renderer), "markup", header, NULL);
-/* set_common_flags (renderer, flags); */
+ g_free(parsed_subject);
+ g_free(parsed_address);
+
+ g_object_set (rendobj, "markup", header, NULL);
+ set_common_flags (renderer, flags);
g_free (header);
}
-1);
/* size_str = modest_text_utils_get_display_size (size); */
- status_str = g_strdup(_("Wating ..."));
+ status_str = g_strdup(_("mcen_li_outbox_waiting"));
g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
set_common_flags (renderer, flags);
g_free (status_str);
}
+
projects / modest / blobdiff