summaryrefslogtreecommitdiff
path: root/src/core/settings.c
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-01-11 10:15:34 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-01-11 10:15:34 +0000
commit1a3c700838fa1cbfab750dc317ee41e68d77cc31 (patch)
treeaf161205e02e782b8bdf891ee656be3f25b65abb /src/core/settings.c
parent348060073d06ffe312c6f54007f835aa9a8dec58 (diff)
downloadirssi-1a3c700838fa1cbfab750dc317ee41e68d77cc31.zip
Some signed/unsigned warnings removed. Don't call fe_exec_init/deinit in win32
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1104 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/settings.c')
-rw-r--r--src/core/settings.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/settings.c b/src/core/settings.c
index 7f33ae77..065c70ea 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -442,7 +442,8 @@ static CONFIG_REC *parse_configfile(const char *fname)
char *real_fname;
real_fname = fname != NULL ? g_strdup(fname) :
- g_strdup_printf("%s/.irssi/config", g_get_home_dir());
+ g_strdup_printf("%s"G_DIR_SEPARATOR_S".irssi"
+ G_DIR_SEPARATOR_S"config", g_get_home_dir());
config = config_open(real_fname, -1);
if (config != NULL)
@@ -473,17 +474,16 @@ static void init_configfile(void)
struct stat statbuf;
char *str;
- str = g_strdup_printf("%s/.irssi", g_get_home_dir());
+ str = g_strdup_printf("%s"G_DIR_SEPARATOR_S".irssi", g_get_home_dir());
if (stat(str, &statbuf) != 0) {
/* ~/.irssi not found, create it. */
if (mkpath(str, 0700) != 0) {
- g_error(_("Couldn't create %s/.irssi directory"),
- g_get_home_dir());
+ g_error(_("Couldn't create %s directory"), str);
}
} else if (!S_ISDIR(statbuf.st_mode)) {
- g_error(_("%s/.irssi is not a directory.\n"
+ g_error(_("%s is not a directory.\n"
"You should remove it with command: rm ~/.irssi"),
- g_get_home_dir());
+ str);
}
g_free(str);