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

Merge branch 'master' of git://dev.laptop.org/sugar

Browse Source
This commit is contained in:
Tomeu Vizoso 2006-11-05 18:51:05 +01:00
commit b9f75c1472
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([Sugar],[0.48],[],[sugar])
AC_INIT([Sugar],[0.49],[],[sugar])
AC_PREREQ([2.59])

4
shell/model/ShellModel.py
View File

@ -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)

7
sugar/env.py
View File

@ -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