* only use striketrough to mark deleted messages

pmo-trunk-r859

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index d3d903f..9c02bc8 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -234,10 +234,8 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                        }
                }
        } else if (folder && type == TNY_FOLDER_TYPE_ROOT) {
-               if (strcmp (fname, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0) {/* FIXME: hack */
-                       g_free (fname);
-                       fname = g_strdup (MODEST_LOCAL_FOLDERS_DISPLAY_NAME);
-               }
+               g_warning ("fname: %s", fname);
+               /* FIXME: todo */
        }
                        
        if (unread > 0) {
@@ -815,8 +813,7 @@ on_drag_data_get (GtkWidget *widget,
        gtk_tree_path_free (source_row);
 }
 
-typedef struct _DndHelper
-{
+typedef struct _DndHelper {
        gboolean delete_source;
        GtkWidget *source_widget;
        GtkWidget *dest_widget;

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 47c97b5..6e26192 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -172,8 +172,7 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        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,
+                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE,
                      "text",    display_date,
                      NULL);
        g_free (display_date);
@@ -203,8 +202,8 @@ _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkC
                      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,
+                     "striketrough",
+                     (flags & TNY_HEADER_FLAG_DELETED)?TRUE:FALSE,
                      NULL);
 
        g_free (address);       
@@ -254,8 +253,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        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,
+                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ? TRUE: FALSE,
                      NULL);    
        g_free (header);
 }
@@ -279,8 +277,7 @@ _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        
        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,
+                     "striketrough",  (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE,
                      "text",    size_str,       
                       NULL);
        g_free (size_str);