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

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2008-06-05 13:39:04 +02:00
commit 285509c8c9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sugar/activity/bundlebuilder.py
View File

@ -168,7 +168,7 @@ def cmd_dev(config, options, args):
bundle_path = env.get_user_activities_path() bundle_path = env.get_user_activities_path()
if not os.path.isdir(bundle_path): if not os.path.isdir(bundle_path):
os.mkdir(bundle_path) os.mkdir(bundle_path)
bundle_path = os.path.join(bundle_path, config.bundle_top_dir) bundle_path = os.path.join(bundle_path, config.bundle_root_dir)
try: try:
os.symlink(config.source_dir, bundle_path) os.symlink(config.source_dir, bundle_path)
except OSError: except OSError:

1
src/sugar/graphics/palette.py
View File

@ -246,6 +246,7 @@ class Palette(gtk.Window):
self._palette_popup_sid = None self._palette_popup_sid = None
self._enter_invoker_hid = None self._enter_invoker_hid = None
self._leave_invoker_hid = None self._leave_invoker_hid = None
self._right_click_invoker_hid = None
# we set these for backward compatibility # we set these for backward compatibility
if label is not None: if label is not None: