#include <modest-runtime.h>
#include <glib/gi18n.h>
#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;
-}
-
+#include <string.h>
static GdkPixbuf*
get_pixbuf_for_flag (TnyHeaderFlags flag)
static GdkPixbuf *low_attachments_pixbuf = NULL;
static GdkPixbuf *high_pixbuf = NULL;
static GdkPixbuf *low_pixbuf = NULL;
-
- if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+ static GdkPixbuf *normal_pixbuf = NULL;
+
+ TnyHeaderPriorityFlags prior;
+
+ prior = flags & TNY_HEADER_FLAG_PRIORITY;
+ switch (prior) {
+ case TNY_HEADER_FLAG_HIGH_PRIORITY:
+ if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
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 (G_UNLIKELY(!high_pixbuf))
+ high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+ return high_pixbuf;
}
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) {
+ break;
+ case TNY_HEADER_FLAG_LOW_PRIORITY:
+ if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
if (G_UNLIKELY(!low_attachments_pixbuf))
low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY);
return low_attachments_pixbuf;
+ } else {
+ if (G_UNLIKELY(!low_pixbuf))
+ low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+ return low_pixbuf;
}
- else {
+ break;
+ default:
+ if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
if (G_UNLIKELY(!normal_attachments_pixbuf))
normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY);
return normal_attachments_pixbuf;
+ } else {
+ if (G_UNLIKELY(!normal_pixbuf))
+ normal_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_NORM_PRIORITY);
+ return normal_pixbuf;
}
}
- 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 (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;
- }
-
-
return NULL;
}
&flags, -1);
pixbuf = get_pixbuf_for_compact_flag (flags);
- if (pixbuf != NULL)
- g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
-
+ g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
}
void
tmp_date = modest_text_utils_get_display_date (date);
display_date = g_strdup_printf ("\n<small>%s</small>", tmp_date);
- g_object_set (G_OBJECT(renderer), "markup", display_date, NULL);
+ g_object_set (G_OBJECT(renderer),
+ "markup", display_date,
+ NULL);
set_common_flags (renderer, flags);
g_free (tmp_date);
{
GObject *rendobj;
TnyHeaderFlags flags;
- gchar *address, *subject, *header, *display_address;
- gchar *parsed_address, *parsed_subject;
+ gchar *address, *subject, *header;
time_t date;
gboolean is_incoming;
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
-1);
-
- rendobj = G_OBJECT(renderer);
- /* 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);
+ rendobj = G_OBJECT(renderer);
+ header = g_markup_printf_escaped ("%s\n<small>%s</small>",
+ (subject && strlen(subject)) ? subject : _("mail_va_no_subject"),
+ modest_text_utils_get_display_address(address));
g_free (address);
g_free (subject);
- g_free(parsed_subject);
- g_free(parsed_address);
g_object_set (rendobj, "markup", header, NULL);
set_common_flags (renderer, flags);
void
_modest_header_view_status_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter,
- gpointer user_data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter,
+ gpointer user_data)
{
TnyHeaderFlags flags;
- guint status;
+ //guint status;
gchar *status_str;
gtk_tree_model_get (tree_model, iter,
- TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ // TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
-1);
-/* size_str = modest_text_utils_get_display_size (size); */
status_str = g_strdup(_("mcen_li_outbox_waiting"));
g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
projects / modest / blobdiff