Rework profiles code a bit, initialize gecko profile

1 files changed, 11 insertions, 5 deletions

diff --git a/sugar/env.py b/sugar/env.py
index 4db74e8..4b977d3 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -44,15 +44,21 @@ def setup():
 	registry = sugar.conf.get_activity_registry()
 	registry.scan_directory(get_activities_dir())
 
+	read_profile()
+
+def read_profile():
 	profile = sugar.conf.get_profile()
+	profile.set_path(get_profile_path())
+	profile.read()
+
+def get_profile_path():
 	if os.environ.has_key('SUGAR_PROFILE'):
-		profile.read(os.environ['SUGAR_PROFILE'])
+		profile_id = os.environ['SUGAR_PROFILE']
 	else:
-		profile.read('default')
+		profile_id = 'default'
+	path = os.path.expanduser('~/.sugar')
 
-def get_user_dir():
-	profile = sugar.conf.get_profile()
-	return profile.get_path()
+	return os.path.join(path, profile_id)
 
 def get_nick_name():
 	profile = sugar.conf.get_profile()