From 5a616a58b52b2150d3113ac7059d20888e0a931f Mon Sep 17 00:00:00 2001
From: Vincent Vinet <vince.vinet@gmail.com>
Date: Thu, 05 Nov 2009 21:41:47 +0000
Subject: Merge dave's commits

---
(limited to 'tutorius')

diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
index f55547c..dbab86a 100644
--- a/tutorius/TProbe.py
+++ b/tutorius/TProbe.py
@@ -110,8 +110,8 @@ class TProbe(dbus.service.Object):
         if action._props:
             action._props.update(loaded_action._props)
 
-        action.do()
-       
+        action.do(activity=self._activity)
+        
         return address
 
     @dbus.service.method("org.tutorius.ProbeInterface",
diff --git a/tutorius/gtkutils.py b/tutorius/gtkutils.py
index 1a9cb0f..c96a73f 100644
--- a/tutorius/gtkutils.py
+++ b/tutorius/gtkutils.py
@@ -33,7 +33,7 @@ def raddr_lookup(widget):
     return ".".join(name)
 
 
-def find_widget(base, target_fqdn):
+def find_widget(base, target_fqdn, ignore_errors=True):
     """Find a widget by digging into a parent widget's children tree
     @param base the parent widget
     @param target_fqdn fqdn-style target object name
@@ -57,7 +57,9 @@ def find_widget(base, target_fqdn):
         try:
             obj = get_children(obj)[int(path.pop(0))]
         except:
-            break
+            if ignore_errors:
+                break
+            return None
 
     return obj
 
--
cgit v0.9.1