Revision: 1417
http://geeqie.svn.sourceforge.net/geeqie/?rev=1417&view=rev
Author: nadvornik
Date: 2009-02-25 18:21:20 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
fixed filter initialization
Modified Paths:
--------------
trunk/src/main.c
trunk/src/rcfile.c
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-02-24 22:21:28 UTC (rev 1416)
+++ trunk/src/main.c 2009-02-25 18:21:20 UTC (rev 1417)
@@ -684,6 +684,9 @@
keys_load();
+ filter_add_defaults();
+ filter_rebuild();
+
editor_load_descriptions();
accel_map_load();
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-02-24 22:21:28 UTC (rev 1416)
+++ trunk/src/rcfile.c 2009-02-25 18:21:20 UTC (rev 1417)
@@ -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)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
