diff options
author | Jean-Christophe Savard <savard.jean.christophe@gmail.com> | 2009-04-16 20:29:54 (GMT) |
---|---|---|
committer | Jean-Christophe Savard <savard.jean.christophe@gmail.com> | 2009-04-16 20:29:54 (GMT) |
commit | 97b111acee9f613289950ce6904c010e86aa3fb8 (patch) | |
tree | 228daebaaf3c58cfbf0c96e86def18ce1ee54f1f /src/sugar/activity/activity.py | |
parent | 1b582880e9c1f85350165913d08aac2f1e1e934f (diff) | |
parent | 291f5314c1dccbaf721f5de7425e3930fdf79575 (diff) |
Merge of jc and origin jc
Merge branch 'jc' of ssh://bobthebuilder.mine.nu:8080/home/git into jc
Conflicts:
source/external/source/sugar-toolkit/src/sugar/activity/activity.py
source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
Diffstat (limited to 'src/sugar/activity/activity.py')
-rw-r--r-- | src/sugar/activity/activity.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 3e2d3d4..a5188fd 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -77,7 +77,6 @@ from sugar.datastore import datastore from sugar.session import XSMPClient from sugar import wm from sugar.tutorius.services import ObjectStore -from sugar.tutorius.tutoserialize import TutoSerializer _ = lambda msg: gettext.dgettext('sugar-toolkit', msg) @@ -129,14 +128,15 @@ class ActivityToolbar(gtk.Toolbar): self.tutorials.combo.connect('changed', self.__tutorial_changed_cb) # Get tutorial list by file logging.debug("************************************ before creating serialize") - serialize = TutoSerializer() - logging.debug("************************************ before calling load_tuto_list()") - - #tutorials = self._activity.get_tutorials() - if getattr(self._activity,"_tutorials",None) is None: - tutorials = serialize.load_tuto_list() +## serialize = TutoSerializer() +## logging.debug("************************************ before calling load_tuto_list()") +## +## #tutorials = self._activity.get_tutorials() +## if getattr(self._activity,"_tutorials",None) is None: +## tutorials = serialize.load_tuto_list() self._current_tutorial = None + tutorials = None if tutorials: for key, tutorial in tutorials.items(): # self.tutorials.combo.append_item(key, _(tutorial.name)) |