From 9d04cd0a82a89452ab4e00579429ef81ce2dcc55 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <bct@diffeq.com>
Date: Fri, 13 Jul 2007 22:52:23 +0000
Subject: [PATCH] a file for pickling retained secrets

---
 src/common/check_paths.py | 12 ++++++++++++
 src/common/configpaths.py |  4 ++--
 src/common/gajim.py       |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/common/check_paths.py b/src/common/check_paths.py
index 600855aab..3dfefe501 100644
--- a/src/common/check_paths.py
+++ b/src/common/check_paths.py
@@ -20,6 +20,8 @@ import stat
 from common import gajim
 import logger
 
+import pickle
+
 # DO NOT MOVE ABOVE OF import gajim
 try:
 	import sqlite3 as sqlite # python 2.5
@@ -84,6 +86,7 @@ def check_and_possibly_create_paths():
 	LOG_DB_PATH = logger.LOG_DB_PATH
 	VCARD_PATH = gajim.VCARD_PATH
 	AVATAR_PATH = gajim.AVATAR_PATH
+	SECRETS_PATH = gajim.SECRETS_PATH
 	dot_gajim = os.path.dirname(VCARD_PATH)
 	if os.path.isfile(dot_gajim):
 		print _('%s is a file but it should be a directory') % dot_gajim
@@ -115,6 +118,13 @@ def check_and_possibly_create_paths():
 			print _('%s is a directory but should be a file') % LOG_DB_PATH
 			print _('Gajim will now exit')
 			sys.exit()
+		
+		if not os.path.exists(SECRETS_PATH):
+			pickle.dump({}, SECRETS_PATH)
+		elif os.path.isdir(SECRETS_PATH):
+			print _('%s is a directory but should be a file') % SECRETS_PATH
+			print _('Gajim will now exit')
+			sys.exit()
 
 	else: # dot_gajim doesn't exist
 		if dot_gajim: # is '' on win9x so avoid that
@@ -126,6 +136,8 @@ def check_and_possibly_create_paths():
 		if not os.path.isfile(LOG_DB_PATH):
 			create_log_db()
 			gajim.logger.init_vars()
+		if not os.path.isfile(SECRETS_PATH):
+			pickle.dump({}, SECRETS_PATH)
 
 def create_path(directory):
 	print _('creating %s directory') % directory
diff --git a/src/common/configpaths.py b/src/common/configpaths.py
index f7e09a686..9350903c3 100644
--- a/src/common/configpaths.py
+++ b/src/common/configpaths.py
@@ -77,8 +77,8 @@ def init():
 	paths = ConfigPaths()
 
 	# LOG is deprecated
-	k = ( 'LOG',   'LOG_DB',   'VCARD',   'AVATAR',   'MY_EMOTS' )
-	v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons')
+	k = ( 'LOG',   'LOG_DB',   'VCARD',   'AVATAR',   'MY_EMOTS',   'SECRETS' )
+	v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons', u'secrets')
 
 	if os.name == 'nt':
 		v = map(lambda x: x.capitalize(), v)
diff --git a/src/common/gajim.py b/src/common/gajim.py
index fc109e8d0..cd7715592 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -71,6 +71,7 @@ LOGPATH = gajimpaths['LOG'] # deprecated
 VCARD_PATH = gajimpaths['VCARD']
 AVATAR_PATH = gajimpaths['AVATAR']
 MY_EMOTS_PATH = gajimpaths['MY_EMOTS']
+SECRETS_PATH = gajimpaths['SECRETS']
 TMP = gajimpaths['TMP']
 DATA_DIR = gajimpaths['DATA']
 HOME_DIR = gajimpaths['HOME']