zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-20 09:02:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added IRSSI_GLOBAL_CONFIG as well

Browse source 
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
commit 5fb5230963
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common.h
View file

@ -6,6 +6,8 @@
#define IRSSI_DIR_SHORT "~/.irssi" #define IRSSI_DIR_SHORT "~/.irssi"
#define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */ #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/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

2
src/core/settings.c
View file

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