sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the confusion when running multiple instances on the

Browse Source 
same box by passing the nick name in the message.
This commit is contained in:
Marco Pesenti Gritti 2006-06-18 14:14:59 -04:00
parent 51ea9eedba
commit 9d7a7f8050
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sugar/chat/Chat.py
View File

@ -184,6 +184,11 @@ class Chat(gtk.VBox):
if not buddy:
return
# FIXME a better way to compare buddies?
owner = PresenceService.get_instance().get_owner()
if buddy.get_nick_name() == owner.get_nick_name():
return
chunk = self._get_first_richtext_chunk(msg)
if chunk:
self._insert_rich_message(buddy, chunk)
@ -205,6 +210,13 @@ class Chat(gtk.VBox):
"""Send a chat message and insert it into the local buffer."""
if len(text) <= 0:
return
self._stream_writer.write(text)
self._stream_writer.write(self.serialize_message(text))
owner = PresenceService.get_instance().get_owner()
self._insert_rich_message(owner, text)
def serialize_message(self, message):
owner = PresenceService.get_instance().get_owner()
return owner.get_nick_name() + '||' + message
def deserialize_message(self, message):
return message.split('||', 1)

5
sugar/chat/GroupChat.py
View File

@ -39,8 +39,9 @@ class GroupChat(Chat):
def _group_recv_message(self, address, msg):
pservice = PresenceService.get_instance()
buddy = pservice.get_buddy_by_address(address)
[nick, msg] = self.deserialize_message(msg)
buddy = pservice.get_buddy_by_nick_name(nick)
if buddy:
self.recv_message(buddy, msg)
else:
logging.error('Cannot map %s to a buddy.' % (address))
logging.error('The buddy %s is not present.' % (nick))