From 48c783d2ad109f772f09df441dd873682a7bf1b0 Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Wed, 02 Dec 2009 03:31:36 +0000
Subject: Reexposed explicitly the activity_name and unique_id used in probes for the dbus session as constructor arguments on probe

---
diff --git a/tests/probetests.py b/tests/probetests.py
index 37748d8..92d34a6 100644
--- a/tests/probetests.py
+++ b/tests/probetests.py
@@ -184,7 +184,8 @@ class ProbeTest(unittest.TestCase):
 
         #Setup the activity and probe
         self.activity = MockActivity()
-        self.probe = TProbe(self.activity, MockServiceProxy())
+        self.probe = TProbe(self.activity, self.activity.get_bundle_id(), 
+                            self.activity.get_id(), service_proxy=MockServiceProxy())
 
         #Override the eventOccured on the Probe...
         self.old_eO = self.probe.eventOccured
diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
index 4e458a0..06e4794 100644
--- a/tutorius/TProbe.py
+++ b/tutorius/TProbe.py
@@ -54,11 +54,13 @@ class TProbe(dbus.service.Object):
         a DBUS Interface.
     """
 
-    def __init__(self, activity, service_proxy=None):
+    def __init__(self, activity, activity_name, unique_id, service_proxy=None):
         """
         Create and register a TProbe for an activity.
 
         @param activity activity reference, must be a gtk container
+        @param activity_name generic name for the activity
+        @param unique_id specific name for this instance
         @param service_proxy A Service proxy object to do the registering 
         """
         # Moving the ObjectStore assignment here, in the meantime
@@ -74,8 +76,8 @@ class TProbe(dbus.service.Object):
 
         ObjectStore().activity = activity
 
-        self._activity_name = activity.get_bundle_id()
-        self._unique_id = activity.get_id()
+        self._activity_name = activity_name
+        self._unique_id = unique_id
 
         LOGGER.debug("TProbe :: Creating TProbe for %s (%d)", self._activity_name, os.getpid())
         LOGGER.debug("TProbe :: Current gobject context: %s", str(gobject.main_context_default()))
--
cgit v0.9.1