Add a sample activity. Too bad gmail crashes the

sugar/session/session.py

@@ -14,8 +14,15 @@ def start(console):
 
 	activities = []
 	
+	activities_dirs = []
+	
 	for data_dir in env.get_data_dirs():
-		activities_dir = os.path.join(data_dir, env.get_activities_dir())
+		act_dir = os.path.join(data_dir, env.get_activities_dir())
+		activities_dirs.append(act_dir)
+
+	activities_dirs.append(os.path.expanduser('~/.sugar/activities'))
+	
+	for activities_dir in activities_dirs:
 		for filename in os.listdir(activities_dir):
 			if filename.endswith(".activity"):
 				path = os.path.join(activities_dir, filename)

sugar/sugar

@@ -18,10 +18,12 @@ if os.path.isfile(os.path.join(curdir, '__uninstalled__.py')):
 	else:
 		print 'Running sugar from ' + basedir + ' ...'
 	sys.path.insert(0, basedir)
-	os.environ['PYTHONPATH'] = basedir
+	os.environ['PYTHONPATH'] += ':' + basedir
 	console = True
 else:
 	print 'Running the installed sugar...'
+	
+os.environ['PYTHONPATH'] += ':' + os.path.expanduser('~/.sugar/activities')
 
 if console:
 	print 'Redirecting output to the console, press ctrl+d to open it.'
@@ -29,4 +31,3 @@ if console:
 from sugar.session import session
 
 session.start(console)
-