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

[epiotr svn gnome org]

Author: epiotr
Date: Mon Sep 29 20:59:17 2008
New Revision: 2133
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2133&view=rev

Log:
Simplify and speedup GnomeCmdFileList::file_is_wanted()

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-file-list.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	Mon Sep 29 20:59:17 2008
@@ -2199,34 +2199,14 @@
 
     GnomeVFSFileInfo *info = f->info;
 
-    if (info->type == GNOME_VFS_FILE_TYPE_UNKNOWN
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_UNKNOWN))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_REGULAR
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_REGULAR))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_DIRECTORY
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_DIRECTORY))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_FIFO
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_FIFO))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_SOCKET
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SOCKET))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE))
-        return FALSE;
-    if (info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_BLOCK_DEVICE))
-        return FALSE;
-    if ((info->flags == GNOME_VFS_FILE_FLAGS_SYMLINK || info->symlink_name != NULL)
-        && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK))
-        return FALSE;
     if (strcmp (info->name, ".") == 0)
         return FALSE;
     if (strcmp (info->name, "..") == 0)
         return FALSE;
+    if (gnome_cmd_data.hide_type(info->type))
+        return FALSE;
+    if (info->symlink_name && gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK))
+        return FALSE;
     if (info->name[0] == '.' && gnome_cmd_data.filter_settings.hidden)
         return FALSE;
     if (gnome_cmd_data.filter_settings.backup && patlist_matches (gnome_cmd_data_get_backup_pattern_list (), info->name))