Mercurial > geeqie.yaz

changeset 1321:50b325a2386e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed filter initialization
author nadvornik
date Wed, 25 Feb 2009 18:21:20 +0000
parents 055ed09d5a03
children 4370b90fa774
files src/main.c src/rcfile.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c	Tue Feb 24 22:21:28 2009 +0000
+++ b/src/main.c	Wed Feb 25 18:21:20 2009 +0000
@@ -684,6 +684,9 @@
 
 	keys_load();
 
+	filter_add_defaults();
+	filter_rebuild(); 
+
 	editor_load_descriptions();
 
 	accel_map_load();
--- a/src/rcfile.c	Tue Feb 24 22:21:28 2009 +0000
+++ b/src/rcfile.c	Wed Feb 25 18:21:20 2009 +0000
@@ -811,9 +811,8 @@
 
 static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
 {
-	DEBUG_1(" filter end");
-	filter_add_defaults();
-	filter_rebuild();
+	if (!parser_data->startup) filter_rebuild(); 
+	/* else this is called in init_after_global_options */
 }
 
 static void options_parse_global(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)