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

Merge pull request #317 from icarito/master

Browse Source 
Fix regression for GTK2 activities caused by 2f2b2d2
This commit is contained in:
Sebastian Silva 2016-05-22 16:33:15 -05:00
commit 632fff1278
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/sugar-activity
View File

@ -35,11 +35,15 @@ DBusGMainLoop(set_as_default=True)
from sugar3.activity import activityhandle from sugar3.activity import activityhandle
from sugar3 import config from sugar3 import config
from sugar3.bundle.activitybundle import ActivityBundle from sugar3.bundle.activitybundle import ActivityBundle
from sugar3.activity.activityfactory import get_environment
from sugar3 import logger from sugar3 import logger
from sugar3.bundle.bundle import MalformedBundleException from sugar3.bundle.bundle import MalformedBundleException
from distutils.dir_util import mkpath
import time
import hashlib
import random
def create_activity_instance(constructor, handle): def create_activity_instance(constructor, handle):
activity = constructor(handle) activity = constructor(handle)
activity.show() activity.show()
@ -124,7 +128,22 @@ def main():
activity_class = bundle.get_command().split(" ")[1] activity_class = bundle.get_command().split(" ")[1]
if 'SUGAR_VERSION' not in os.environ: if 'SUGAR_VERSION' not in os.environ:
environ = get_environment(bundle) profile_id = os.environ.get('SUGAR_PROFILE', 'default')
home_dir = os.environ.get('SUGAR_HOME', os.path.expanduser('~/.sugar'))
base = os.path.join(home_dir, profile_id)
activity_root = os.path.join(base, bundle.get_bundle_id())
instance_dir = os.path.join(activity_root, 'instance')
mkpath(instance_dir)
data_dir = os.path.join(activity_root, 'data')
mkpath(data_dir)
tmp_dir = os.path.join(activity_root, 'tmp')
mkpath(tmp_dir)
os.environ['SUGAR_ACTIVITY_ROOT'] = activity_root
os.environ['SUGAR_BUNDLE_PATH'] = bundle.get_path()
os.environ['SUGAR_BUNDLE_ID'] = bundle.get_bundle_id() os.environ['SUGAR_BUNDLE_ID'] = bundle.get_bundle_id()
os.environ['SUGAR_BUNDLE_NAME'] = bundle.get_name() os.environ['SUGAR_BUNDLE_NAME'] = bundle.get_name()
@ -149,7 +168,10 @@ def main():
activity_constructor = getattr(module, class_name) activity_constructor = getattr(module, class_name)
if not options.activity_id: if not options.activity_id:
options.activity_id = bundle.get_name() # Generate random hash
data = '%s%s' % (time.time(), random.randint(10000, 100000))
random_hash = hashlib.sha1(data).hexdigest()
options.activity_id = random_hash
options.bundle_id = bundle.get_bundle_id() options.bundle_id = bundle.get_bundle_id()
activity_handle = activityhandle.ActivityHandle( activity_handle = activityhandle.ActivityHandle(