From 43e956d16b989cac49a4e9aa11fc257869e59686 Mon Sep 17 00:00:00 2001
From: altffour <altffour@protonmail.com>
Date: Wed, 6 Jan 2021 19:28:11 +0300
Subject: [PATCH] fix xdg support missing in one theme file

- fix some missed get_irssi_dir() usages
- fix comment in src/core/settings.c refering to ~/.irssi
---
 src/core/settings.c         | 2 +-
 src/fe-common/core/themes.c | 7 ++++---
 src/perl/perl-fe.c          | 5 ++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/settings.c b/src/core/settings.c
index f8c0b9df..fedc527c 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -768,7 +768,7 @@ static void init_configfile(void)
 	char *str;
 
 	if (stat(get_irssi_dir(), &statbuf) != 0) {
-		/* ~/.irssi not found, create it. */
+		/* irssi folder not found, create it. */
 		if (g_mkdir_with_parents(get_irssi_dir(), 0700) != 0) {
 			g_error("Couldn't create %s directory: %s",
 			        get_irssi_dir(), g_strerror(errno));
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index e5f11008..f1939e2a 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -936,7 +936,7 @@ THEME_REC *theme_load(const char *setname)
 		fname = g_build_filename(g_get_user_data_dir(), "irssi",
 		                         g_strdup_printf("%s.theme", name), NULL);
 	else
-		fname = g_strdup_printf("%s/%s.theme", get_irssi_dir(), name);
+		fname = g_strdup_printf("%s/%s.theme", get_irssi_dir(), name, NULL);
 	if (stat(fname, &statbuf) != 0) {
 		/* check global config dir */
 		g_free(fname);
@@ -1264,7 +1264,7 @@ static void theme_save(THEME_REC *theme, int save_all)
 	if (is_xdg_supported())
 		path = g_build_filename(g_get_user_data_dir(), "irssi", basename, NULL);
 	else
-		path = g_strdup_printf("%s/%s", get_irssi_dir(), basename);
+		path = g_strdup_printf("%s/%s", get_irssi_dir(), basename, NULL);
 	ok = config_write(config, path, 0660) == 0;
 	g_free(basename);
 
@@ -1421,7 +1421,8 @@ void themes_reload(void)
 	current_theme = theme_load("default");
 	if (current_theme == NULL) {
 		if (is_xdg_supported())
-			fname = g_build_filename(g_get_user_data_dir(), "irssi", "default.theme");
+			fname =
+			    g_build_filename(g_get_user_data_dir(), "irssi", "default.theme", NULL);
 		else
 			fname = g_strdup_printf("%s/default.theme", get_irssi_dir());
 		current_theme = theme_create(fname, "default");
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index ac84d67a..a0658ca0 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -209,7 +209,10 @@ static void sig_complete_load(GList **list, WINDOW_REC *window,
 		return;
 
 	/* completing filename parameter for /SCRIPT LOAD */
-	user_dir = g_strdup_printf("%s/scripts", get_irssi_dir());
+	if (is_xdg_supported())
+		user_dir = g_build_filename(g_get_user_data_dir(), "scripts", NULL);
+	else
+		user_dir = g_strdup_printf("%s/scripts", get_irssi_dir());
 	*list = filename_complete(word, user_dir);
 	*list = g_list_concat(*list, filename_complete(word, SCRIPTDIR));
         g_free(user_dir);