Merge commit 'origin/mike' into mike

Conflicts:

	source/activities/Writus.activity/TAbiWordActivity.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py

1 files changed, 10 insertions, 1 deletions

diff --git a/src/sugar/tutorius/gtkutils.py b/src/sugar/tutorius/gtkutils.py
index 7196469..450872d 100644
--- a/src/sugar/tutorius/gtkutils.py
+++ b/src/sugar/tutorius/gtkutils.py
@@ -18,6 +18,12 @@
 Utility classes and functions that are gtk related
 """
 
+def activity(activity=None, singleton=[]):
+    if activity:
+        singleton.append(activity)
+    return singleton[0]
+
+
 def find_widget(base, target_fqdn):
     """Find a widget by digging into a parent widget's children tree
     @param base the parent widget
@@ -39,7 +45,10 @@ def find_widget(base, target_fqdn):
     path.pop(0)
 
     while len(path) > 0:
-        obj = obj.get_children()[int(path.pop(0))]
+        try:
+            obj = obj.get_children()[int(path.pop(0))]
+        except:
+            break
 
     return obj