From 688d1c4e029e60a0e158fb4e0ec786a3bb4f5c0d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 14 May 2015 09:39:35 +0530 Subject: [PATCH] On linux also search XDG_DATA_HOME for application icons --- src/calibre/utils/open_with/linux.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/open_with/linux.py b/src/calibre/utils/open_with/linux.py index 3b6c1197af..c5f6495235 100644 --- a/src/calibre/utils/open_with/linux.py +++ b/src/calibre/utils/open_with/linux.py @@ -76,7 +76,9 @@ def find_icons(): global icon_data if icon_data is not None: return icon_data - base_dirs = [os.path.expanduser('~/.icons')] + [ + base_dirs = [(os.environ.get('XDG_DATA_HOME') or os.path.expanduser('~/.local/share')) + '/icons'] + base_dirs += [os.path.expanduser('~/.icons')] + base_dirs += [ os.path.join(b, 'icons') for b in os.environ.get( 'XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(os.pathsep)] + [ '/usr/share/pixmaps']