From e710a65c7b307d236e7b9843cf2e50158b82ccfe Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Mon, 20 Jul 2020 08:53:06 +0200
Subject: [PATCH] Look for gtk settings.ini in all the expected places

This should help with loading system-level default theme.
Based on https://developer.gnome.org/gtk3/stable/GtkSettings.html, "Description".
---
 actions/icons.js         |  4 ++++
 utils/gtk-theme/index.js | 49 ++++++++++++++++++++++++++++------------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/actions/icons.js b/actions/icons.js
index f14898e..cc54533 100644
--- a/actions/icons.js
+++ b/actions/icons.js
@@ -34,6 +34,10 @@ const getIconWithFallback = async name => {
 		return getIconWithFallback(fallbacks.get(name));
 	}
 
+	if (!result) {
+		console.warn('icon missing', name);
+	}
+
 	cache.set(name, result);
 
 	return result;
diff --git a/utils/gtk-theme/index.js b/utils/gtk-theme/index.js
index 36ddcf6..e27f246 100644
--- a/utils/gtk-theme/index.js
+++ b/utils/gtk-theme/index.js
@@ -4,31 +4,52 @@ const path = require('path');
 
 const ini = require('ini');
 
-const gtkIniPath = path.join(
+const gtkIniPaths = [];
+
+gtkIniPaths.push('/etc/gtk-3.0/settings.ini');
+
+if (process.env.XDG_CONFIG_DIRS) {
+	gtkIniPaths.push(...process.env.XDG_CONFIG_DIRS.split(':')
+		.map(dir => path.join(dir, 'gtk-3.0', 'settings.ini')));
+}
+
+gtkIniPaths.push(path.join(
 	process.env.HOME,
 	process.env.XDG_CONFIG_HOME || '.config',
 	'gtk-3.0',
 	'settings.ini',
-);
+));
 
-let gtk;
+const gtkInis = [];
 try {
-	gtk = ini.parse(fs.readFileSync(gtkIniPath, 'utf-8'));
+	gtkIniPaths.forEach(path => {
+		const gtk = ini.parse(fs.readFileSync(path, 'utf-8'));
+		gtkInis.push(gtk);
+	});
 } catch (error) {
-	console.warn(error);
+	if (error.code !== 'ENOENT') {
+		console.warn(error);
+	}
 }
 
 let themeName = 'Adwaita';
-let iconThemeNames = [ 'Adwaita', 'hicolor' ];
+const iconThemeNames = [ 'Adwaita', 'hicolor' ];
 
-if (gtk) {
-	iconThemeNames = [
-		gtk.Settings['gtk-icon-theme-name'],
-		gtk.Settings['gtk-fallback-icon-theme'],
-		'hicolor',
-	].filter(Boolean);
-	themeName = gtk.Settings['gtk-theme-name'] || themeName;
-}
+gtkInis.forEach(gtk => {
+	if (gtk && gtk.Settings) {
+		if (gtk.Settings['gtk-icon-theme-name']) {
+			iconThemeNames[0] = gtk.Settings['gtk-icon-theme-name'];
+		}
+
+		if (gtk.Settings['gtk-fallback-icon-theme']) {
+			iconThemeNames[1] = gtk.Settings['gtk-fallback-icon-theme'];
+		}
+
+		if (gtk.Settings['gtk-theme-name']) {
+			themeName = gtk.Settings['gtk-theme-name'];
+		}
+	}
+});
 
 const themePaths = [
 	path.join(