From 45831a03b566c72a81abd5723e8bc8a2658da47a Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 06 Feb 2009 18:00:19 +0000
Subject: Share face parameters between buddies

---
(limited to 'Speak.activity')

diff --git a/Speak.activity/activity.py b/Speak.activity/activity.py
index 2e503dc..70a0f2d 100755
--- a/Speak.activity/activity.py
+++ b/Speak.activity/activity.py
@@ -394,7 +394,7 @@ class SpeakActivity(CollabActivity):
     def _toolbar_changed_cb(self, widget, index):
         if index == CHAT_TOOLBAR:
             self.face.shut_up()
-            self.chat.me.update(self.face.status)
+            self.chat.update(self.face.status)
             self.notebook.set_current_page(1)
         else:
             self.chat.shut_up()
diff --git a/Speak.activity/chat.py b/Speak.activity/chat.py
index f313dbc..71503ce 100644
--- a/Speak.activity/chat.py
+++ b/Speak.activity/chat.py
@@ -140,6 +140,11 @@ class View(hippo.Canvas):
 
         self.set_root(self._desk)
 
+    def update(self, status):
+        self.me.update(status)
+        if self.messenger:
+            self.messenger.post(None)
+
     def post(self, buddy, status, text):
         i = self._buddies.get(buddy)
         if i:
diff --git a/Speak.activity/messenger.py b/Speak.activity/messenger.py
index 5c84387..427716c 100644
--- a/Speak.activity/messenger.py
+++ b/Speak.activity/messenger.py
@@ -40,6 +40,8 @@ class Messenger(ExportedGObject):
         self._tube.watch_participants(self._participant_change_cb)
 
     def post(self, text):
+        if text == None:
+            text = ''
         self._post(self.chat.me.status.serialize(), text)
 
     def _participant_change_cb(self, added, removed):
@@ -106,6 +108,8 @@ class Messenger(ExportedGObject):
     def _post_cb(self, sender_status, text, sender=None):
         if sender == self.me:
             return
+        if not text:
+            text = None
 
         tp_handle = self._tube.bus_name_to_handle[sender]
         buddy = self._buddies[tp_handle]
--
cgit v0.9.1