gnome-commander r1733 - in trunk: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Apr 28 22:41:30 2008
New Revision: 1733
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1733&view=rev

Log:
Fixed problem #499761 (search window cleared when column sorted)

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/gnome-cmd-file-list.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Apr 28 22:41:30 2008
@@ -4,6 +4,7 @@
 
 Bug fixes:
  * Fixed problem #392959 (dynamically changing user to root)
+ * Fixed problem #499761 (search window cleared when column sorted)
  * Fixed problem #499764 (multiple selection problem)
  * Fixed problem with sorting of UTF-8 encoded file names
  * Fixed problem with copying files to symlinked directories

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Mon Apr 28 22:41:30 2008
@@ -5824,6 +5824,9 @@
                             <para>Fixed problem #392959 (dynamically changing user to root)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #499761 (search window cleared when column sorted)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem #499764 (multiple selection problem)</para>
                         </listitem>
                         <listitem>

Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc	(original)
+++ trunk/src/gnome-cmd-file-list.cc	Mon Apr 28 22:41:30 2008
@@ -1237,9 +1237,6 @@
 
 static void init (GnomeCmdFileList *fl)
 {
-    gint i;
-    gboolean b;
-
     fl->priv = g_new0 (GnomeCmdFileListPrivate, 1);
     fl->priv->shown_files = gnome_cmd_file_collection_new ();
     // fl->priv->selected_files = NULL;
@@ -1250,17 +1247,20 @@
     // fl->priv->quicksearch_popup = NULL;
     // fl->priv->focus_later = NULL;
 
-    for (i=0; i<FILE_LIST_NUM_COLUMNS; i++)
-        fl->priv->sort_raising[i] = FALSE;
+    // for (gint i=0; i<FILE_LIST_NUM_COLUMNS; i++)
+        // fl->priv->sort_raising[i] = FALSE;
+
+    gint col = FILE_LIST_COLUMN_NAME;       // defaults,
+    gboolean b = FILE_LIST_SORT_ASCENDING;  // used when not set by gnome_cmd_data_get_sort_params()
 
-    gnome_cmd_data_get_sort_params (fl, &i, &b);
-    fl->priv->current_col = i;
-    fl->priv->sort_raising[i] = b;
-    fl->priv->sort_func = file_list_column[i].sort_func;
+    gnome_cmd_data_get_sort_params (fl, &col, &b);
+    fl->priv->current_col = col;
+    fl->priv->sort_raising[col] = b;
+    fl->priv->sort_func = file_list_column[col].sort_func;
 
     init_dnd (fl);
 
-    for (i=0; i<FILE_LIST_NUM_COLUMNS; i++)
+    for (gint i=0; i<FILE_LIST_NUM_COLUMNS; i++)
         gtk_clist_set_column_resizeable (GTK_CLIST (fl), i, TRUE);
 
     gtk_signal_connect_after (GTK_OBJECT (fl), "scroll_vertical", GTK_SIGNAL_FUNC (on_scroll_vertical), fl);