diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.c | 2 | ||||
| -rw-r--r-- | src/fe-common/core/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-common/core/themes.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index 0169b268..d2482106 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -500,7 +500,7 @@ static CONFIG_REC *parse_configfile(const char *fname) else { /* user configuration file not found, use the default one from sysconfdir */ - path = SYSCONFDIR"/irssi/config"; + path = SYSCONFDIR"/irssi.conf"; if (stat(path, &statbuf) != 0) { /* no configuration file in sysconfdir .. use the build-in configuration */ diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index 9913cfe8..01c4f002 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" + -DTHEMESDIR=\""$(datadir)/irssi/themes"\" libfe_common_core_a_SOURCES = \ autorun.c \ diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index 6a8c42c4..7fcd31ac 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -705,7 +705,7 @@ THEME_REC *theme_load(const char *setname) if (stat(fname, &statbuf) != 0) { /* check global config dir */ g_free(fname); - fname = g_strdup_printf(SYSCONFDIR"/irssi/%s.theme", name); + fname = g_strdup_printf(THEMESDIR"/%s.theme", name); if (stat(fname, &statbuf) != 0) { /* theme not found */ g_free(fname); |