Changeset 9123 for branches/pep/src/common/configpaths.py

Timestamp:

12/12/07 09:44:46 (12 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/common/configpaths.py (modified) (2 diffs)

branches/pep/src/common/configpaths.py

@@ -80 +80 @@
                 # LOG is deprecated
                 k = ( 'LOG',   'LOG_DB',   'VCARD',   'AVATAR',   'MY_EMOTS',
-                        'MY_ICONSETS' )
+                        'MY_ICONSETS', 'MY_CACERTS')
                 v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons',
-                        u'iconsets')
+                        u'iconsets',  u'cacerts.pem')
 
                 if os.name == 'nt':
@@ -103 +103 @@
                 #       print "%s: %s" % (repr(k), repr(v))
 
-        def init_profile(self, profile):
+        def init_profile(self, profile = ''):
                 conffile = windowsify(u'config')
                 pidfile = windowsify(u'gajim')
+                secretsfile = windowsify(u'secrets')
 
                 if len(profile) > 0:
                         conffile += u'.' + profile
                         pidfile += u'.' + profile
+                        secretsfile += u'.' + profile
                 pidfile += u'.pid'
                 self.add_from_root('CONFIG_FILE', conffile)
                 self.add_from_root('PID_FILE', pidfile)
+                self.add_from_root('SECRETS_FILE', secretsfile)
 
                 # for k, v in paths.iteritems():