diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-02-06 13:50:12 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-02-06 13:50:12 (GMT) |
| commit | 687eec3da07ef38568a310b402149ef5a8f5ba51 (patch) | |
| tree | 9b31cfdbb428ae199829e628a0be0f5888ff5487 /Speak.activity | |
| parent | 7d5905c18b02498c5904509859e6255a520e3cba (diff) | |
Do not pronounce arrived messages in face mode
Diffstat (limited to 'Speak.activity')
| -rw-r--r-- | Speak.activity/chat.py | 3 | ||||
| -rw-r--r-- | Speak.activity/messenger.py | 10 |
2 files changed, 9 insertions, 4 deletions
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) |