Revision: 1558
http://geeqie.svn.sourceforge.net/geeqie/?rev=1558&view=rev
Author: nadvornik
Date: 2009-03-19 22:58:28 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
initialization clean-up
Modified Paths:
--------------
trunk/src/main.c
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-03-19 22:12:14 UTC (rev 1557)
+++ trunk/src/main.c 2009-03-19 22:58:28 UTC (rev 1558)
@@ -677,20 +677,10 @@
void init_after_global_options(void)
{
-
- mkdir_if_not_exists(get_rc_dir());
- mkdir_if_not_exists(get_collections_dir());
- mkdir_if_not_exists(get_thumbnails_cache_dir());
- mkdir_if_not_exists(get_metadata_cache_dir());
-
- keys_load();
-
filter_add_defaults();
filter_rebuild();
editor_load_descriptions();
-
- accel_map_load();
}
@@ -784,14 +774,24 @@
parse_command_line_for_debug_option(argc, argv);
parse_command_line(argc, argv);
+ /* these functions don't depend on config file */
+ mkdir_if_not_exists(get_rc_dir());
+ mkdir_if_not_exists(get_collections_dir());
+ mkdir_if_not_exists(get_thumbnails_cache_dir());
+ mkdir_if_not_exists(get_metadata_cache_dir());
+
+ keys_load();
+ accel_map_load();
+
+ /* restore session from the config file */
+
options = init_options(NULL);
setup_default_options(options);
-
-
/* load_options calls init_after_global_options() after it parses
global options, we have to call it here if it fails*/
if (!load_options(options)) init_after_global_options();
+ /* handle missing config file and commandline additions*/
if (!layout_window_list)
{
/* broken or no config file */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
