summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-11-15 11:43:00 +0100
committerCarlos Garnacho <mrgarnacho@gmail.com>2020-02-29 22:36:41 +0000
commit22b7d78c9a20dfdc05c9bd28f6b173bb0b8e1938 (patch)
tree10e2db388ff6065ee8e5465b407b56278080a827 /plugins
parent7b00240a88a70bfd28b36cfb74b7d5c0c9223fbe (diff)
downloadgnome-settings-daemon-22b7d78c9a20dfdc05c9bd28f6b173bb0b8e1938.tar.gz
xsettings: Install script to load Xresources
Since it's a bit iffy who should do that, just do it ourselves. This way old X11 clients will have the intended UI colors, etc.
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xsettings/00-xrdb9
-rw-r--r--plugins/xsettings/meson.build5
2 files changed, 14 insertions, 0 deletions
diff --git a/plugins/xsettings/00-xrdb b/plugins/xsettings/00-xrdb
new file mode 100755
index 00000000..a047e8b3
--- /dev/null
+++ b/plugins/xsettings/00-xrdb
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+sysresources=/etc/X11/Xresources
+
+# merge in defaults
+[ -r "$sysresources" ] && xrdb -nocpp -merge "$sysresources"
+[ -r "$userresources" ] && xrdb -merge "$userresources"
+
diff --git a/plugins/xsettings/meson.build b/plugins/xsettings/meson.build
index fb4ef4cf..f91b9637 100644
--- a/plugins/xsettings/meson.build
+++ b/plugins/xsettings/meson.build
@@ -46,6 +46,11 @@ foreach program: programs
)
endforeach
+install_data(
+ files('00-xrdb'),
+ install_dir: join_paths(gsd_sysconfdir, 'xdg/Xwayland-session.d')
+)
+
test_py = find_program('test.py')
envs = [