1
0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00

Added IRSSI_GLOBAL_CONFIG as well

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2420 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-02-10 14:35:21 +00:00 committed by cras
parent 464ff76954
commit 5fb5230963
2 changed files with 3 additions and 1 deletions

View File

@ -6,6 +6,8 @@
#define IRSSI_DIR_SHORT "~/.irssi"
#define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#ifdef HAVE_CONFIG_H

View File

@ -467,7 +467,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
else {
/* user configuration file not found, use the default one
from sysconfdir */
path = SYSCONFDIR"/irssi.conf";
path = SYSCONFDIR"/"IRSSI_GLOBAL_CONFIG;
if (stat(path, &statbuf) != 0) {
/* no configuration file in sysconfdir ..
use the build-in configuration */