* Sets ASCENDING sort byt sent/received date as default.

* Remove unused code

pmo-trunk-r1700

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index e09e0a2..9afa6fe 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -286,7 +286,6 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                                                            MODEST_HEADER_VIEW_COLUMN));
                width = gtk_tree_view_column_get_width (col);
                sort = 0;
-/*             if (sort_colid == gtk_tree_view_column_get_sort_column_id(col)) */
                if (sort_colid == col_id)
                        sort = 1;
                        
@@ -344,7 +343,6 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                
                if (cols) {
                        GList *viewcolumns, *colcursor, *widthcursor, *sortablecursor;
-/*                     gint sort_colid = -1; */
                        modest_header_view_set_columns (header_view, cols, type);
                        sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
 
@@ -360,11 +358,6 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                                if (sort > 0) {
                                        int colid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colcursor->data), MODEST_HEADER_VIEW_COLUMN));
                                        modest_header_view_set_sort_column_id (header_view, colid, type);
-/*                                     sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(colcursor->data)); */
-/*                                     modest_header_view_set_sort_column_id (header_view, sort_colid, type); */
-/*                                     gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), */
-/*                                                                           sort_colid, */
-/*                                                                           GTK_SORT_DESCENDING); */
                                        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
                                                                              colid,
                                                                              GTK_SORT_DESCENDING);

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index c49b964..c677b18 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -384,15 +384,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                        g_return_val_if_reached(FALSE);
                }
 
-               if (sortable) {
-/*                     guint sort_colid = gtk_tree_view_column_get_sort_column_id (column); */
-/*                     gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), */
-/*                                                      sort_colid, (GtkTreeIterCompareFunc)cmp_rows, */
-/*                                                      column, NULL); */
-                       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
-                                                        col, (GtkTreeIterCompareFunc)cmp_rows,
-                                                        column, NULL);
-               }
                /* we keep the column id around */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
                                   GINT_TO_POINTER(col));
@@ -746,7 +737,7 @@ on_progress_changed (ModestMailOperation *mail_op,
        sort_colid = modest_header_view_get_sort_column_id (self, type); 
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
                                              sort_colid,
-                                             GTK_SORT_DESCENDING);
+                                             GTK_SORT_ASCENDING);
 
        /* Set new model */
        modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
@@ -823,7 +814,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        sort_colid = modest_header_view_get_sort_column_id (self, type); 
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
                                              sort_colid,
-                                             GTK_SORT_DESCENDING);
+                                             GTK_SORT_ASCENDING);
 
        /* Set new model */
        modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);