From a4114a946cc7a57c1cfce5760737c3f05425bc86 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Sun, 26 Apr 2009 18:55:55 +0000
Subject: Merge branch 'jc' of ssh://mike@bobthebuilder.mine.nu:8080/home/git into jc_support

---
(limited to 'src/sugar/activity/activity.py')

diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index a5188fd..3e2d3d4 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -77,6 +77,7 @@ 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)
 
@@ -128,15 +129,14 @@ 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))
--
cgit v0.9.1