[gnome-commander] GnomeCmdData: replace hide_type() with direct access to options.filter.file_types[]

[Piotr Eljasiak <epiotr src gnome org>]

commit 02cd354ceae025c8853c8e24730380cfd0249a54
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Nov 12 22:40:47 2011 +0100

    GnomeCmdData: replace hide_type() with direct access to options.filter.file_types[]

 src/gnome-cmd-data.h            |    1 -
 src/gnome-cmd-file-list.cc      |    4 ++--
 src/gnome-cmd-options-dialog.cc |   16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 6f98e0a..01ae35d 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -429,7 +429,6 @@ struct GnomeCmdData
     void load_more();
     void save();
 
-    gboolean hide_type(GnomeVFSFileType type) const    {  return options.filter.file_types[type];   }
     GnomeCmdConRemote *get_quick_connect() const       {  return quick_connect;                     }
 
     GnomeCmdFileList::ColumnID get_sort_col(FileSelectorID id) const;
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 7997197..b6a0c28 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -2555,9 +2555,9 @@ gboolean GnomeCmdFileList::file_is_wanted(GnomeCmdFile *f)
         return FALSE;
     if (f->is_dotdot)
         return FALSE;
-    if (gnome_cmd_data.hide_type(info->type))
+    if (gnome_cmd_data.options.filter.file_types[info->type])
         return FALSE;
-    if (info->symlink_name && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK))
+    if (info->symlink_name && gnome_cmd_data.options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK])
         return FALSE;
     if (info->name[0] == '.' && gnome_cmd_data.options.filter.hidden)
         return FALSE;
diff --git a/src/gnome-cmd-options-dialog.cc b/src/gnome-cmd-options-dialog.cc
index e63b54e..c884d2d 100644
--- a/src/gnome-cmd-options-dialog.cc
+++ b/src/gnome-cmd-options-dialog.cc
@@ -1041,25 +1041,25 @@ inline GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData &cfg)
 
     check = create_check (parent, _("Unknown"), "hide_unknown_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_UNKNOWN));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_UNKNOWN]);
     check = create_check (parent, _("Regular files"), "hide_regular_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_REGULAR));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_REGULAR]);
     check = create_check (parent, _("Directories"), "hide_directory_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_DIRECTORY));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_DIRECTORY]);
     check = create_check (parent, _("Fifo files"), "hide_fifo_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_FIFO));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_FIFO]);
     check = create_check (parent, _("Socket files"), "hide_socket_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_SOCKET));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_SOCKET]);
     check = create_check (parent, _("Character devices"), "hide_char_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE]);
     check = create_check (parent, _("Block devices"), "hide_block_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_BLOCK_DEVICE));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_BLOCK_DEVICE]);
 
 
     cat_box = create_vbox (parent, FALSE, 0);
@@ -1074,7 +1074,7 @@ inline GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData &cfg)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (backup_check), cfg.options.filter.backup);
     check = create_check (parent, _("Symlinks"), "hide_symlink_check");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK]);
 
 
     cat_box = create_vbox (parent, FALSE, 0);