Pick up system bundles even if xdg dir env is undefined
This commit is contained in:
parent
4b328c8417
commit
ee62ed69b4
@ -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,8 +41,7 @@ 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(':'):
|
||||
for path in env.get_data_dirs():
|
||||
bundles_path = os.path.join(path, 'activities')
|
||||
self._bundle_registry.add_search_path(bundles_path)
|
||||
|
||||
|
@ -60,6 +60,13 @@ def get_dbus_config_094():
|
||||
def get_shell_bin_dir():
|
||||
return sugar_shell_bin_dir
|
||||
|
||||
# http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
|
||||
def get_data_dirs():
|
||||
if os.environ.has_key('XDG_DATA_DIRS'):
|
||||
return os.environ['XDG_DATA_DIRS'].split(':')
|
||||
else:
|
||||
return [ '/usr/local/share/', '/usr/share/' ]
|
||||
|
||||
_dbus_version = None
|
||||
def get_dbus_version():
|
||||
global _dbus_version
|
||||
|
Loading…
Reference in New Issue
Block a user