From b9f75c14727b30b9cd07b18c2c15f15d71201bb4 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Sun, 05 Nov 2006 17:51:05 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/sugar

---
(limited to 'shell')

diff --git a/shell/model/ShellModel.py b/shell/model/ShellModel.py
index e87dc12..54b7ebc 100644
--- a/shell/model/ShellModel.py
+++ b/shell/model/ShellModel.py
@@ -21,6 +21,7 @@ from sugar.activity.bundleregistry import BundleRegistry
 from model.Friends import Friends
 from model.MeshModel import MeshModel
 from model.Owner import ShellOwner
+from sugar import env
 
 class ShellModel:
 	def __init__(self):
@@ -40,10 +41,9 @@ class ShellModel:
 		path = os.path.expanduser('~/Activities')
 		self._bundle_registry.add_search_path(path)
 
-		if os.environ.has_key('XDG_DATA_DIRS'):
-			for path in os.environ['XDG_DATA_DIRS'].split(':'):
-				bundles_path = os.path.join(path, 'activities')
-				self._bundle_registry.add_search_path(bundles_path)
+		for path in env.get_data_dirs():
+			bundles_path = os.path.join(path, 'activities')
+			self._bundle_registry.add_search_path(bundles_path)
 
 	def get_bundle_registry(self):
 		return self._bundle_registry
--
cgit v0.9.1