diff options
Diffstat (limited to 'src/common/configpaths.py')
| -rw-r--r-- | src/common/configpaths.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/configpaths.py b/src/common/configpaths.py index ac21e42c6..25c0c8e2d 100644 --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -25,6 +25,7 @@ import os import sys import tempfile +import defs # Note on path and filename encodings: # @@ -46,7 +47,9 @@ import tempfile # not displayed to the user, Unicode is not really necessary here. def fse(s): - '''Convert from filesystem encoding if not already Unicode''' + """ + Convert from filesystem encoding if not already Unicode + """ return unicode(s, sys.getfilesystemencoding()) def windowsify(s): @@ -114,12 +117,9 @@ class ConfigPaths: for n, p in zip(k, v): self.add_from_root(n, p) - datadir = '' - if u'datadir' in os.environ: - datadir = fse(os.environ[u'datadir']) - if not datadir: - datadir = u'..' - self.add('DATA', os.path.join(datadir, windowsify(u'data'))) + basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) + self.add('DATA', os.path.join(basedir, windowsify(u'data'))) + self.add('ICONS', os.path.join(basedir, windowsify(u'icons'))) self.add('HOME', fse(os.path.expanduser('~'))) try: self.add('TMP', fse(tempfile.gettempdir())) |