1.1 --- a/src/config.c Mon Jul 21 01:01:39 2008 +0000
1.2 +++ b/src/config.c Sat Feb 28 06:26:48 2009 +0000
1.4 lxdream_config_save_filename = g_strdup_printf("%s/.%s", home, DEFAULT_CONFIG_FILENAME);
1.6 if( lxdream_config_load_filename == NULL ) {
1.7 + char *sysconfig = g_strdup_printf("%s/%s", get_sysconf_path(), DEFAULT_CONFIG_FILENAME);
1.8 if( access(lxdream_config_save_filename, R_OK) == 0 ) {
1.9 lxdream_config_load_filename = g_strdup(lxdream_config_save_filename);
1.10 - } else if( access( PACKAGE_CONF_DIR "/" DEFAULT_CONFIG_FILENAME, R_OK ) == 0 ) {
1.11 - lxdream_config_load_filename = g_strdup(PACKAGE_CONF_DIR "/" DEFAULT_CONFIG_FILENAME);
1.12 + g_free(sysconfig);
1.13 + } else if( access( sysconfig, R_OK ) == 0 ) {
1.14 + lxdream_config_load_filename = sysconfig;
1.15 } else if( access( "./" DEFAULT_CONFIG_FILENAME, R_OK ) == 0 ) {
1.16 lxdream_config_load_filename = g_strdup("./" DEFAULT_CONFIG_FILENAME);
1.17 + g_free(sysconfig);
1.19 lxdream_config_load_filename = g_strdup(lxdream_config_save_filename);
1.20 + g_free(sysconfig);