Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tutorius/TProbe.py2
-rw-r--r--tutorius/creator.py4
-rw-r--r--tutorius/dbustools.py1
-rw-r--r--tutorius/engine.py6
4 files changed, 5 insertions, 8 deletions
diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
index 6d7b6e2..e18ed67 100644
--- a/tutorius/TProbe.py
+++ b/tutorius/TProbe.py
@@ -388,8 +388,6 @@ class ProbeProxy:
@return None
"""
LOGGER.debug("ProbeProxy :: Unregister adress %s issued", str(address))
- if not block:
- raise RuntimeError("This function does not allow non-blocking mode yet")
if address in self._subscribedEvents.keys():
remote_call(self._probe.unsubscribe, (address,),
return_cb=save_args(self.__clear_event, address),
diff --git a/tutorius/creator.py b/tutorius/creator.py
index efa17c3..d56fc72 100644
--- a/tutorius/creator.py
+++ b/tutorius/creator.py
@@ -27,7 +27,7 @@ from gettext import gettext as T
from sugar.graphics.toolbutton import ToolButton
-from sugar.tutorius import overlayer, gtkutils, actions, bundler, properties, addon
+from sugar.tutorius import overlayer, gtkutils, actions, vault, properties, addon
from sugar.tutorius import filters
from sugar.tutorius.services import ObjectStore
from sugar.tutorius.linear_creator import LinearCreator
@@ -257,7 +257,7 @@ class Creator(object):
# prepare tutorial for serialization
tuto = Tutorial(tutorialName, self._tutorial.fsm)
- bundle = bundler.TutorialBundler()
+ bundle = vault.TutorialBundler()
bundle.write_metadata_file(tuto)
bundle.write_fsm(self._tutorial.fsm)
diff --git a/tutorius/dbustools.py b/tutorius/dbustools.py
index 1b685d7..5d70d7b 100644
--- a/tutorius/dbustools.py
+++ b/tutorius/dbustools.py
@@ -25,6 +25,7 @@ def remote_call(callable, args, return_cb=None, error_cb=None, block=False):
except Exception, e:
#Use the specified error handler even for blocking calls
errhandler_cb(e)
+ return
#Return value signature might be :
if ret_val is None:
diff --git a/tutorius/engine.py b/tutorius/engine.py
index dda9f3f..9c1dae4 100644
--- a/tutorius/engine.py
+++ b/tutorius/engine.py
@@ -2,7 +2,7 @@ import logging
import dbus.mainloop.glib
from jarabe.model import shell
-from sugar.tutorius.bundler import TutorialStore
+from sugar.tutorius.vault import Vault
from sugar.bundle.activitybundle import ActivityBundle
class Engine:
@@ -25,11 +25,9 @@ class Engine:
self._tutorial.detach()
self._tutorial = None
- store = TutorialStore()
-
#Get the active activity from the shell
activity = self._shell.get_active_activity()
- self._tutorial = store.load_tutorial(tutorialID, bundle_path=activity.get_bundle_path())
+ self._tutorial = Vault.loadTutorial(tutorialID)
#TProbes automatically use the bundle id, available from the ActivityBundle
bundle = ActivityBundle(activity.get_bundle_path())