Updated translatable strings

[modest] / src / widgets / modest-header-view-render.c

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index b5aeace..2b2d6ad 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -27,7 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-icon-names.h>
@@ -52,7 +51,7 @@ get_cached_icon (const gchar *name)
        if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key,&pixbuf)) {
                pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err);
                if (!pixbuf) {
-                       g_printerr ("modest: error in icon factory while loading '%s': %s\n",
+                       g_printerr ("modest: error while loading '%s': %s\n",
                                    name, err->message);
                        g_error_free (err);
                }
@@ -98,6 +97,15 @@ get_pixbuf_for_flag (TnyHeaderFlags flag)
        }
 }
 
+static void
+set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags)
+{
+       g_object_set (G_OBJECT(renderer),
+                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
+                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ?  TRUE:FALSE,
+                     NULL);    
+}
+
 
 void
 _modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
@@ -142,11 +150,7 @@ _modest_header_view_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRender
        
        gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                            &flags, -1);
-
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ?  TRUE:FALSE,
-                     NULL);    
+       set_common_flags (renderer, flags);
 }
 
 
@@ -157,6 +161,7 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 {
        TnyHeaderFlags flags;
        guint date, date_col;
+       gchar *display_date;
        gboolean received = GPOINTER_TO_INT(user_data);
 
        if (received)
@@ -168,13 +173,14 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
                            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),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     "text",    modest_text_utils_get_display_date (date),
+                     "text",    display_date,
                      NULL);
+
+       set_common_flags (renderer, flags);
+       g_free (display_date);
 }
 
 
@@ -199,13 +205,9 @@ _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkC
        g_object_set (G_OBJECT(renderer),
                      "text",
                      modest_text_utils_get_display_address (address),
-                     "weight",
-                     (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
-                     "style",
-                     (flags & TNY_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL,
                      NULL);
-
-       g_free (address);       
+       g_free (address);
+       set_common_flags (renderer, flags);
 }
 /*
  * this for both incoming and outgoing mail, depending on the the user_data
@@ -218,7 +220,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 {
        GObject *rendobj;
        TnyHeaderFlags flags;
-       gchar *address, *subject, *header;
+       gchar *address, *subject, *header, *display_date;
        time_t date;
        gboolean is_incoming;
 
@@ -240,20 +242,18 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,   
                                    -1);
        
-       rendobj = G_OBJECT(renderer);                   
+       rendobj = G_OBJECT(renderer);
+       display_date = modest_text_utils_get_display_date (date);
        header = g_strdup_printf ("%s %s\n%s",
                                  modest_text_utils_get_display_address (address),
-                                 modest_text_utils_get_display_date (date),
-                                 subject);
+                                 display_date, subject);
        g_free (address);
        g_free (subject);
+       g_free (display_date);
+       
+       g_object_set (G_OBJECT(renderer), "text", header, NULL);        
+       set_common_flags (renderer, flags);
        
-       g_object_set (G_OBJECT(renderer),
-                     "text",  header,
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
        g_free (header);
 }
 
@@ -274,12 +274,8 @@ _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        
        size_str = modest_text_utils_get_display_size (size);
        
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                     PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     "text",    size_str,       
-                      NULL);
-       g_free (size_str);
+       g_object_set (G_OBJECT(renderer), "text", size_str, NULL);
+       set_common_flags (renderer, flags);
 
+       g_free (size_str);
  }