gnome-commander r2114 - in branches/gcmd-1-3: . src

[epiotr svn gnome org]

Author: epiotr
Date: Thu Sep 25 20:48:54 2008
New Revision: 2114
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2114&view=rev

Log:
gnome_cmd_file_list_show_dir_size() -> GnomeCmdFileList::show_dir_size()

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-file-list.cc
   branches/gcmd-1-3/src/gnome-cmd-file-list.h
   branches/gcmd-1-3/src/gnome-cmd-file-selector.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.cc	Thu Sep 25 20:48:54 2008
@@ -1511,19 +1511,18 @@
 }
 
 
-void gnome_cmd_file_list_show_dir_size (GnomeCmdFileList *fl, GnomeCmdFile *finfo)
+void GnomeCmdFileList::show_dir_size(GnomeCmdFile *f)
 {
-    g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
-    g_return_if_fail (GNOME_CMD_IS_FILE (finfo));
+    g_return_if_fail (GNOME_CMD_IS_FILE (f));
 
-    gint row = get_row_from_file (fl, finfo);
+    gint row = get_row_from_file (this, f);
     if (row == -1)
         return;
 
-    FileFormatData data(finfo,TRUE);
+    FileFormatData data(f,TRUE);
 
-    for (gint i=1; i<GnomeCmdFileList::NUM_COLUMNS; i++)
-        gtk_clist_set_text (*fl, row, i, data.text[i]);
+    for (gint i=1; i<NUM_COLUMNS; i++)
+        gtk_clist_set_text (*this, row, i, data.text[i]);
 }
 
 

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.h	Thu Sep 25 20:48:54 2008
@@ -118,6 +118,7 @@
 
     void update_file(GnomeCmdFile *f);
     void show_files(GnomeCmdDir *dir);
+    void show_dir_size(GnomeCmdFile *f);
 
     void show_column(ColumnID col, gboolean value)     {  gtk_clist_set_column_visibility (GTK_CLIST (this), col, value); }
 
@@ -178,14 +179,13 @@
     return !f || strcmp (f->info->name, "..") == 0 ? NULL : f;
 }
 
-void gnome_cmd_file_list_show_dir_size (GnomeCmdFileList *fl, GnomeCmdFile *finfo);
-
 void gnome_cmd_file_list_focus_file (GnomeCmdFileList *fl, const gchar *focus_file, gboolean scroll_to_file);
 
 void gnome_cmd_file_list_compare_directories (GnomeCmdFileList *fl1, GnomeCmdFileList *fl2);
 
 GnomeCmdFile *gnome_cmd_file_list_get_file_at_row (GnomeCmdFileList *fl, gint row);
 gint gnome_cmd_file_list_get_row_from_file (GnomeCmdFileList *fl, GnomeCmdFile *finfo);
+
 void gnome_cmd_file_list_show_advrename_dialog (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_show_chmod_dialog (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_show_chown_dialog (GnomeCmdFileList *fl);

Modified: branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-selector.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-selector.cc	Thu Sep 25 20:48:54 2008
@@ -153,7 +153,7 @@
     g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
 
     GnomeCmdFile *f = fs->file_list()->get_selected_file();
-    gnome_cmd_file_list_show_dir_size (fs->file_list(), f);
+    fs->file_list()->show_dir_size(f);
 }
 
 
@@ -256,7 +256,7 @@
     fs->file_list()->invalidate_tree_size();
 
     for (GList *files = fs->file_list()->get_visible_files(); files; files = files->next)
-        gnome_cmd_file_list_show_dir_size (fs->file_list(), (GnomeCmdFile *) files->data);
+        fs->file_list()->show_dir_size((GnomeCmdFile *) files->data);
 
     update_selected_files_label (fs);
 }