changeset 9528eb6f8432 in /home/hg/repos/gajim

author: Fedor Brunner fedor.brunner@azet.sk branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9528eb6f8432 description: XTLS keys will be stored separate for each profile. Fixes #7735.

diffstat:

src/common/configpaths.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 46f319807a21 -r 9528eb6f8432 src/common/configpaths.py --- a/src/common/configpaths.py Wed Apr 09 18:02:30 2014 +0200 +++ b/src/common/configpaths.py Tue Apr 15 12:42:09 2014 +0200 @@ -141,7 +141,7 @@ d = {'MY_DATA': '', 'LOG_DB': u'logs.db', 'MY_CACERTS': u'cacerts.pem', 'MY_EMOTS': u'emoticons', 'MY_ICONSETS': u'iconsets', 'MY_MOOD_ICONSETS': u'moods', 'MY_ACTIVITY_ICONSETS': u'activities', - 'PLUGINS_USER': u'plugins', 'MY_PEER_CERTS': u'certs', + 'PLUGINS_USER': u'plugins', 'RNG_SEED': u'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) @@ -152,7 +152,6 @@ self.add(name, TYPE_CACHE, windowsify(d[name]))

self.add('MY_CONFIG', TYPE_CONFIG, '') - self.add('MY_CERT', TYPE_CONFIG, '')

basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify(u'data'))) @@ -178,16 +177,24 @@ pidfile = windowsify(u'gajim') secretsfile = windowsify(u'secrets') pluginsconfdir = windowsify(u'pluginsconfig') + certsdir = windowsify(u'certs') + localcertsdir = windowsify(u'localcerts') +

if len(profile) > 0: conffile += u'.' + profile pidfile += u'.' + profile secretsfile += u'.' + profile pluginsconfdir += u'.' + profile + certsdir += u'.' + profile + localcertsdir += u'.' + profile + pidfile += u'.pid' self.add('CONFIG_FILE', TYPE_CONFIG, conffile) self.add('PID_FILE', TYPE_CACHE, pidfile) self.add('SECRETS_FILE', TYPE_DATA, secretsfile) self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) + self.add('MY_PEER_CERTS', TYPE_DATA, certsdir) + self.add('MY_CERT', TYPE_CONFIG, localcertsdir)

gajimpaths = ConfigPaths()