From 687eec3da07ef38568a310b402149ef5a8f5ba51 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 06 Feb 2009 13:50:12 +0000
Subject: Do not pronounce arrived messages in face mode

---
diff --git a/Speak.activity/chat.py b/Speak.activity/chat.py
index 3f4901b..a27d493 100644
--- a/Speak.activity/chat.py
+++ b/Speak.activity/chat.py
@@ -132,7 +132,8 @@ class Chat(hippo.Canvas):
             face.update(status)
         if text:
             self._chat.add_text(buddy, text)
-            face.say(text)
+            if self.props.window and self.props.window.is_visible():
+                face.say(text)
 
     def farewell(self, buddy):
         i = self._buddies.get(buddy)
diff --git a/Speak.activity/messenger.py b/Speak.activity/messenger.py
index cf19701..3de3fd3 100644
--- a/Speak.activity/messenger.py
+++ b/Speak.activity/messenger.py
@@ -80,7 +80,8 @@ class Messenger(ExportedGObject):
         tp_handle = self._tube.bus_name_to_handle[sender]
         buddy = self._buddies[tp_handle] = self._tube.get_buddy(tp_handle)
 
-        logger.debug('pong received from %s(%s)' % (sender, buddy.props.nick))
+        logger.debug('pong received from %s(%s) status=%s' \
+                % (sender, buddy.props.nick, sender_status))
 
         self.chat.post(buddy, face.Status().deserialize(sender_status), None)
 
@@ -89,9 +90,12 @@ class Messenger(ExportedGObject):
             return
 
         tp_handle = self._tube.bus_name_to_handle[sender]
-        buddy = self._buddies[tp_handle] = self._tube.get_buddy(tp_handle)
+        buddy = self._tube.get_buddy(tp_handle)
+        if not buddy: return
+        self._buddies[tp_handle] = buddy
 
-        logger.debug('ping received from %s(%s)' % (sender, buddy.props.nick))
+        logger.debug('ping received from %s(%s) status=%s' \
+                % (sender, buddy.props.nick, sender_status))
 
         self.chat.post(buddy, face.Status().deserialize(sender_status), None)
         remote_object = self._tube.get_object(sender, PATH)
--
cgit v0.9.1