Make ishidden() static to filedata.c and rename it is_hidden_file().

diff --git a/src/filedata.c b/src/filedata.c
index b2b3eea..a7036d2 100644 (file)
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -829,6 +829,13 @@ static GList *filelist_filter_out_sidecars(GList *flist)
        return flist_filtered;
 }
 
+static gboolean is_hidden_file(const gchar *name)
+{
+       if (name[0] != '.') return FALSE;
+       if (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')) return FALSE;
+       return TRUE;
+}
+
 static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs, gboolean follow_symlinks)
 {
        DIR *dp;
@@ -864,7 +871,7 @@ static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs
                const gchar *name = dir->d_name;
                gchar *filepath;
 
-               if (!options->file_filter.show_hidden_files && ishidden(name))
+               if (!options->file_filter.show_hidden_files && is_hidden_file(name))
                        continue;
 
                filepath = g_build_filename(pathl, name, NULL);
@@ -997,7 +1004,7 @@ GList *filelist_filter(GList *list, gboolean is_dir_list)
                FileData *fd = (FileData *)(work->data);
                const gchar *name = fd->name;
 
-               if ((!options->file_filter.show_hidden_files && ishidden(name)) ||
+               if ((!options->file_filter.show_hidden_files && is_hidden_file(name)) ||
                    (!is_dir_list && !filter_name_exists(name)) ||
                    (is_dir_list && name[0] == '.' && (strcmp(name, GQ_CACHE_LOCAL_THUMB) == 0 ||
                                                       strcmp(name, GQ_CACHE_LOCAL_METADATA) == 0)) )

diff --git a/src/filefilter.c b/src/filefilter.c
index 604238a..5dc6e7f 100644 (file)
--- a/src/filefilter.c
+++ b/src/filefilter.c
@@ -37,13 +37,6 @@ static GList *file_writable_list = NULL; /* writable files */
 static GList *file_sidecar_list = NULL; /* files with allowed sidecar */
 
 
-gint ishidden(const gchar *name)
-{
-       if (name[0] != '.') return FALSE;
-       if (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')) return FALSE;
-       return TRUE;
-}
-
 static FilterEntry *filter_entry_new(const gchar *key, const gchar *description,
                                     const gchar *extensions, FileFormatClass file_class, 
                                     gboolean writable, gboolean allow_sidecar, gboolean enabled)

diff --git a/src/filefilter.h b/src/filefilter.h
index e1e109c..9628a29 100644 (file)
--- a/src/filefilter.h
+++ b/src/filefilter.h
@@ -50,7 +50,5 @@ void sidecar_ext_parse(const gchar *text);
 gchar *sidecar_ext_to_string(void);
 GList *sidecar_ext_get_list(void);
 
-gint ishidden(const gchar *name);
-
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */