fixed filter initialization
authorVladimir Nadvornik <nadvornik@suse.cz>
Wed, 25 Feb 2009 18:21:20 +0000 (18:21 +0000)
committerVladimir Nadvornik <nadvornik@suse.cz>
Wed, 25 Feb 2009 18:21:20 +0000 (18:21 +0000)
src/main.c
src/rcfile.c

index 129df4a..0e39d10 100644 (file)
@@ -684,6 +684,9 @@ void init_after_global_options(void)
 
        keys_load();
 
+       filter_add_defaults();
+       filter_rebuild(); 
+
        editor_load_descriptions();
 
        accel_map_load();
index 12cace5..1c4987c 100644 (file)
@@ -811,9 +811,8 @@ static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext
 
 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)