merge

2006-05-21 21:31:57 -04:00
parent 2c272cc892
commit 3841ac9983
9 changed files with 62 additions and 18 deletions
@@ -20,7 +20,7 @@ def start(console):
 		act_dir = os.path.join(data_dir, env.get_activities_dir())
 		activities_dirs.append(act_dir)

-	activities_dirs.append(os.path.expanduser('~/.sugar/activities'))
+	activities_dirs.append(os.path.join(env.get_user_dir(), 'activities'))
 	
 	for activities_dir in activities_dirs:
 		if os.path.isdir(activities_dir):