diff src/filelist.c @ 332:3c4bad726e98

Rename file filtering options.

--- a/src/filelist.c	Sat Apr 12 08:59:52 2008 +0000
+++ b/src/filelist.c	Sat Apr 12 09:12:37 2008 +0000
@@ -318,7 +318,7 @@
 	GList *work;
 	gint ln;
 
-	if (!extension_list || options->file_filter_disable) return TRUE;
+	if (!extension_list || options->file_filter.disable) return TRUE;
 
 	ln = strlen(name);
 	work = extension_list;
@@ -378,7 +378,7 @@
 		gchar *extensions = escquote_value(fe->extensions);
 		gchar *description = escquote_value(fe->description);
 
-		secure_fprintf(ssi, "filter_ext: \"%s%s\" %s %s\n",
+		secure_fprintf(ssi, "file_filter.ext: \"%s%s\" %s %s\n",
 			       (fe->enabled) ? "" : "#",
 			       fe->key, extensions, description);
 		g_free(extensions);
@@ -423,7 +423,7 @@
 {
 	GList *work;
 
-	if (!is_dir_list && options->file_filter_disable && options->show_dot_files) return list;
+	if (!is_dir_list && options->file_filter.disable && options->file_filter.show_dot_files) return list;
 
 	work = list;
 	while (work)
@@ -433,7 +433,7 @@
 
 		base = filename_from_path(name);
 
-		if ((!options->show_dot_files && ishidden(base)) ||
+		if ((!options->file_filter.show_dot_files && ishidden(base)) ||
 		    (!is_dir_list && !filter_name_exists(base)) ||
 		    (is_dir_list && base[0] == '.' && (strcmp(base, GQ_CACHE_LOCAL_THUMB) == 0 ||
 						       strcmp(base, GQ_CACHE_LOCAL_METADATA) == 0)) )
@@ -1220,7 +1220,7 @@
 	while ((dir = readdir(dp)) != NULL)
 		{
 		gchar *name = dir->d_name;
-		if (options->show_dot_files || !ishidden(name))
+		if (options->file_filter.show_dot_files || !ishidden(name))
 			{
 			gchar *filepath = g_strconcat(pathl, "/", name, NULL);
 			if ((follow_symlinks ? 
@@ -1349,7 +1349,7 @@
 {
 	GList *work;
 
-	if (!is_dir_list && options->file_filter_disable && options->show_dot_files) return list;
+	if (!is_dir_list && options->file_filter.disable && options->file_filter.show_dot_files) return list;
 
 	work = list;
 	while (work)
@@ -1357,7 +1357,7 @@
 		FileData *fd = (FileData *)(work->data);
 		const gchar *name = fd->name;
 
-		if ((!options->show_dot_files && ishidden(name)) ||
+		if ((!options->file_filter.show_dot_files && ishidden(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)) )