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

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

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-08-14 00:26:51 +02:00
commit 6debe0c34d
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,3 +1,5 @@
Snapshot 040c94d181
* #2099 Tweak a color pair as requested by Walter. (marco) * #2099 Tweak a color pair as requested by Walter. (marco)
* Draw an invoker that is connected with the palette for toolbuttons. (benzea) * Draw an invoker that is connected with the palette for toolbuttons. (benzea)
* Fix traceback when reading in saved WPA2 network configs (dcbw) * Fix traceback when reading in saved WPA2 network configs (dcbw)

12
sugar/activity/activity.py
View File

@ -305,6 +305,18 @@ class Activity(Window, gtk.Container):
def _internal_jobject_error_cb(self, err): def _internal_jobject_error_cb(self, err):
logging.debug("Error creating activity datastore object: %s" % err) logging.debug("Error creating activity datastore object: %s" % err)
def get_activity_root(self):
"""
Return the appropriate location in the fs where to store activity related
data that doesn't pertain to the current execution of the activity and
thus cannot go into the DataStore.
"""
if os.environ.has_key('SUGAR_ACTIVITY_ROOT') and \
os.environ['SUGAR_ACTIVITY_ROOT']:
return os.environ['SUGAR_ACTIVITY_ROOT']
else:
return '/'
def read_file(self, file_path): def read_file(self, file_path):
""" """
Subclasses implement this method if they support resuming objects from Subclasses implement this method if they support resuming objects from

2
sugar/activity/activityfactoryservice.py
View File

@ -30,6 +30,7 @@ from sugar.activity.bundle import Bundle
from sugar.activity import activityhandle from sugar.activity import activityhandle
from sugar import logger from sugar import logger
from sugar import _sugarext from sugar import _sugarext
from sugar import env
# Work around for dbus mutex locking issue # Work around for dbus mutex locking issue
gobject.threads_init() gobject.threads_init()
@ -156,6 +157,7 @@ def run(bundle_path):
gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path()) gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
os.environ['SUGAR_BUNDLE_PATH'] = bundle_path os.environ['SUGAR_BUNDLE_PATH'] = bundle_path
os.environ['SUGAR_ACTIVITY_ROOT'] = env.get_profile_path(bundle.get_service_name())
_sugarext.set_prgname(bundle.get_service_name()) _sugarext.set_prgname(bundle.get_service_name())
_sugarext.set_application_name(bundle.get_name()) _sugarext.set_application_name(bundle.get_name())

2
sugar/datastore/datastore.py
View File

@ -140,14 +140,12 @@ class DSObject(object):
activityfactory.create_with_object_id(service_name, object_id) activityfactory.create_with_object_id(service_name, object_id)
def destroy(self): def destroy(self):
logging.debug('DSObject.destroy() file_path: %r.' % self._file_path)
if self._destroyed: if self._destroyed:
logging.warning('This DSObject has already been destroyed!.') logging.warning('This DSObject has already been destroyed!.')
import pdb;pdb.set_trace() import pdb;pdb.set_trace()
return return
self._destroyed = True self._destroyed = True
if self._file_path and self._owns_file: if self._file_path and self._owns_file:
logging.debug('Removing temp file: %r' % self._file_path)
if os.path.isfile(self._file_path): if os.path.isfile(self._file_path):
os.remove(self._file_path) os.remove(self._file_path)
self._owns_file = False self._owns_file = False