* modest-tny-account-store.c:

[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 f4292a5..47c97b5 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>
@@ -39,7 +38,7 @@ static GdkPixbuf*
 get_cached_icon (const gchar *name)
 {
        GError *err = NULL;
-       GdkPixbuf *pixbuf;
+       gpointer pixbuf;
        gpointer orig_key;
        static GHashTable *icon_cache = NULL;
        
@@ -49,10 +48,10 @@ get_cached_icon (const gchar *name)
                icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
                                                         MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
        
-       if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key,(gpointer*)&pixbuf)) {
-               pixbuf = gdk_pixbuf_new_from_file (name, &err);
+       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);
                }
@@ -61,7 +60,7 @@ get_cached_icon (const gchar *name)
                if (icon_cache)
                        g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
        }
-       return pixbuf;
+       return GDK_PIXBUF(pixbuf);
 }
 
 
@@ -157,6 +156,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 +168,15 @@ _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);
+       g_free (display_date);
 }
 
 
@@ -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,13 +242,14 @@ _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,