sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak activity search path. Use ~/Activities and XDG_DATA_DIRS/activities

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-10-31 13:10:34 +01:00
parent cb285aba06
commit 8571920734
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/model/ShellModel.py
View File

@ -14,9 +14,10 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import os
from sugar.presence import PresenceService from sugar.presence import PresenceService
from sugar.activity.bundleregistry import BundleRegistry from sugar.activity.bundleregistry import BundleRegistry
from sugar import env
from model.Friends import Friends from model.Friends import Friends
from model.MeshModel import MeshModel from model.MeshModel import MeshModel
from model.Owner import ShellOwner from model.Owner import ShellOwner
@ -35,7 +36,14 @@ class ShellModel:
self._mesh = MeshModel() self._mesh = MeshModel()
self._bundle_registry = BundleRegistry() self._bundle_registry = BundleRegistry()
self._bundle_registry.add_search_path(env.get_bundles_path())
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)
def get_bundle_registry(self): def get_bundle_registry(self):
return self._bundle_registry return self._bundle_registry

1
sugar/activity/bundleregistry.py
View File

@ -70,7 +70,6 @@ class BundleRegistry:
def _add_bundle(self, bundle_path): def _add_bundle(self, bundle_path):
bundle = Bundle(bundle_path) bundle = Bundle(bundle_path)
print bundle
if bundle.is_valid(): if bundle.is_valid():
self._bundles[bundle.get_service_name()] = bundle self._bundles[bundle.get_service_name()] = bundle
self._service_manager.add(bundle) self._service_manager.add(bundle)

3
sugar/env.py
View File

@ -54,8 +54,5 @@ def get_services_dir():
def get_dbus_config(): def get_dbus_config():
return sugar_dbus_config return sugar_dbus_config
def get_bundles_path():
return os.path.join(get_profile_path(), 'bundles')
def get_shell_bin_dir(): def get_shell_bin_dir():
return sugar_shell_bin_dir return sugar_shell_bin_dir