[gnome-commander] Use GnomeCmdFileList (instead of previous GnomeCmdData) sorting criteria for saving them on exit.

[Piotr Eljasiak <epiotr src gnome org>]

commit be3827813b7b920b0b7f3063c728ae0edf8de514
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Jul 18 00:27:32 2010 +0200

    Use GnomeCmdFileList (instead of previous GnomeCmdData) sorting criteria for saving them on exit.
    
    This allows to remove code for copying sort params from GnomeCmdFileList to GnomeCmdData on every sort change.

 src/gnome-cmd-data.cc      |   24 ++++--------------------
 src/gnome-cmd-data.h       |    1 -
 src/gnome-cmd-file-list.cc |    2 --
 3 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index d09a82a..afe3576 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1609,10 +1609,10 @@ void GnomeCmdData::save()
     gnome_cmd_data_set_int    ("/options/main_win_pos_x", priv->main_win_pos[0]);
     gnome_cmd_data_set_int    ("/options/main_win_pos_y", priv->main_win_pos[1]);
 
-    gnome_cmd_data_set_int    ("/options/sort_column_left", priv->sort_column[LEFT]);
-    gnome_cmd_data_set_bool   ("/options/sort_direction_left", priv->sort_direction[LEFT]);
-    gnome_cmd_data_set_int    ("/options/sort_column_right", priv->sort_column[RIGHT]);
-    gnome_cmd_data_set_bool   ("/options/sort_direction_right", priv->sort_direction[RIGHT]);
+    gnome_cmd_data_set_int    ("/options/sort_column_left", main_win->fs(LEFT)->file_list()->get_sort_column());
+    gnome_cmd_data_set_bool   ("/options/sort_direction_left", main_win->fs(LEFT)->file_list()->get_sort_order());
+    gnome_cmd_data_set_int    ("/options/sort_column_right", main_win->fs(RIGHT)->file_list()->get_sort_column());
+    gnome_cmd_data_set_bool   ("/options/sort_direction_right", main_win->fs(RIGHT)->file_list()->get_sort_order());
 
     gnome_cmd_data_set_string ("/programs/viewer", viewer);
     gnome_cmd_data_set_string ("/programs/editor", editor);
@@ -1888,22 +1888,6 @@ void gnome_cmd_data_get_sort_params (GnomeCmdFileList *fl, gint &col, gboolean &
 }
 
 
-void gnome_cmd_data_set_sort_params (GnomeCmdFileList *fl, gint col, gboolean direction)
-{
-    if (main_win->fs(LEFT)->file_list()==fl)
-    {
-        gnome_cmd_data.priv->sort_column[LEFT] = col;
-        gnome_cmd_data.priv->sort_direction[LEFT] = direction;
-    }
-    else
-        if (main_win->fs(RIGHT)->file_list()==fl)
-        {
-            gnome_cmd_data.priv->sort_column[RIGHT] = col;
-            gnome_cmd_data.priv->sort_direction[RIGHT] = direction;
-        }
-}
-
-
 void gnome_cmd_data_set_main_win_pos (gint x, gint y)
 {
     gnome_cmd_data.priv->main_win_pos[0] = x;
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 81cddbe..d0b5360 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -282,7 +282,6 @@ GnomeCmdColorTheme *gnome_cmd_data_get_current_color_theme ();
 GnomeCmdLsColorsPalette *gnome_cmd_data_get_ls_colors_palette ();
 
 void gnome_cmd_data_get_sort_params (GnomeCmdFileList *fl, gint &col, gboolean &direction);
-void gnome_cmd_data_set_sort_params (GnomeCmdFileList *fl, gint col, gboolean direction);
 
 inline void GnomeCmdData::set_viewer(const gchar *command)
 {
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 62a3e14..887bc5d 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1041,8 +1041,6 @@ static gint sort_by_group (GnomeCmdFile *f1, GnomeCmdFile *f2, GnomeCmdFileList
     update_column_sort_arrows (fl);
 
     fl->sort();
-
-    gnome_cmd_data_set_sort_params (fl, col, fl->priv->sort_raising[col]);
 }