From 93d489741d676d4ed3b3285bf732c614e6fff371 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sat, 26 Aug 2006 11:35:03 +0000
Subject: Automatically read the profile (lazily)

---
(limited to 'sugar/env.py')

diff --git a/sugar/env.py b/sugar/env.py
index 992bcf3..c11c83a 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -8,7 +8,6 @@ except ImportError:
 	from sugar.__installed__ import *
 
 import sugar.setup
-import sugar.conf
 
 def add_to_python_path(path):
 	sys.path.insert(0, path)
@@ -41,16 +40,6 @@ def setup():
 		sugar.setup.write_service('org.laptop.Presence', bin,
 								  sugar_activities_dir)
 
-	registry = sugar.conf.get_activity_registry()
-	registry.scan_directory(sugar_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_id = os.environ['SUGAR_PROFILE']
@@ -63,5 +52,8 @@ def get_profile_path():
 def get_data_dir():
 	return sugar_data_dir
 
+def get_activities_dir():
+	return sugar_activities_dir
+
 def get_dbus_config():
 	return sugar_dbus_config
--
cgit v0.9.1