Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Speak.activity/activity.py
diff options
context:
space:
mode:
Diffstat (limited to 'Speak.activity/activity.py')
-rwxr-xr-xSpeak.activity/activity.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/Speak.activity/activity.py b/Speak.activity/activity.py
index ddfcfd5..ca933e4 100755
--- a/Speak.activity/activity.py
+++ b/Speak.activity/activity.py
@@ -59,13 +59,15 @@ import voice
import face
from toolbars import ChatToolbar
from chat import Chat
+from collab import CollabActivity
+from messenger import Messenger, SERVICE
CHAT_TOOLBAR = 3
-class SpeakActivity(activity.Activity):
+class SpeakActivity(CollabActivity):
def __init__(self, handle):
- activity.Activity.__init__(self, handle)
+ CollabActivity.__init__(self, SERVICE, handle)
bounds = self.get_allocation()
# pick a voice that espeak supports
@@ -450,11 +452,14 @@ class SpeakActivity(activity.Activity):
def _toolbar_changed_cb(self, widget, index):
if index == CHAT_TOOLBAR:
- self.chat.update(self.face.status)
+ self.chat.me.update(self.face.status)
self.notebook.set_current_page(1)
else:
self.notebook.set_current_page(0)
+ def on_tube(self, tube_conn, initiating):
+ self.chat.messenger = Messenger(tube_conn, initiating, self.chat)
+
#def on_quit(self, data=None):
# self.audio.on_quit()