summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2018-11-09 20:06:41 -0800
committerCosimo Cecchi <cosimoc@gnome.org>2018-11-09 20:06:41 -0800
commit2263c196cb0dcb8547b378df7b35f83b8b99c01e (patch)
tree1b6f2d0c8674096da543a17439d62e2929cf35f9
parentf64a8cc1a65dcad4294e2988b402a34175019663 (diff)
downloadxorg-lib-libXcursor-2263c196cb0dcb8547b378df7b35f83b8b99c01e.tar.gz
Support XDG user data dir location
Nowadays ~/.icons is not used anymore as the preferred location for custom user icon themes; XDG_DATA_HOME/icons (aka ~/.local/share/icons) is what toolkits like GTK prefer. Prepend that location to the default xcursor path, so that cursor themes installed there can be used by apps and toolkits that use libXcursor.
-rw-r--r--configure.ac2
-rw-r--r--src/library.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7e1aa45..00659ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_ARG_WITH(icondir,
[ICONDIR=${datadir}/icons])
AC_SUBST([ICONDIR])
-DEF_CURSORPATH="~/.icons:${datadir}/icons:${datadir}/pixmaps"
+DEF_CURSORPATH="~/.local/share/icons:~/.icons:${datadir}/icons:${datadir}/pixmaps"
if test "x${ICONDIR}" != "x${datadir}/icons"; then
DEF_CURSORPATH="${DEF_CURSORPATH}:${ICONDIR}"
fi
diff --git a/src/library.c b/src/library.c
index c6062f7..364703d 100644
--- a/src/library.c
+++ b/src/library.c
@@ -29,7 +29,7 @@
#endif
#ifndef XCURSORPATH
-#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
+#define XCURSORPATH "~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
#endif
const char *