diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-26 11:41:49 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-26 11:41:49 (GMT) |
| commit | 5f628f1a4fcb006afd006a459bd14f05e9ce18c5 (patch) | |
| tree | f8135f9eebf154d8457db86b15e15806e85ad10f /sugar/chat | |
| parent | 0947581a113af6eaa3660ae37b2720c4806ab0e8 (diff) | |
Get presence to work on the chat window
Diffstat (limited to 'sugar/chat')
| -rw-r--r-- | sugar/chat/ActivityChat.py | 3 | ||||
| -rw-r--r-- | sugar/chat/Chat.py | 2 | ||||
| -rw-r--r-- | sugar/chat/GroupChat.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py index 645b5e4..1411565 100644 --- a/sugar/chat/ActivityChat.py +++ b/sugar/chat/ActivityChat.py @@ -34,8 +34,7 @@ class ActivityChat(GroupChat): addr = service.get_address() port = service.get_port() self._chat_service = self._pservice.share_activity(self._activity, - stype=ActivityChat.SERVICE_TYPE, properties=None, - address=addr, port=port) + stype=ActivityChat.SERVICE_TYPE, address=addr, port=port) self._setup_stream(self._chat_service) def share(self): diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py index db4255f..058cac5 100644 --- a/sugar/chat/Chat.py +++ b/sugar/chat/Chat.py @@ -209,7 +209,7 @@ class Chat(gtk.VBox): def recv_message(self, message): """Insert a remote chat message into the chat buffer.""" [nick, msg] = Chat.deserialize_message(message) - buddy = self._pservice.get_buddy_by_nick_name(nick) + buddy = self._pservice.get_buddy_by_name(nick) if not buddy: logging.error('The buddy %s is not present.' % (nick)) return diff --git a/sugar/chat/GroupChat.py b/sugar/chat/GroupChat.py index 41ee5bd..4f12daf 100644 --- a/sugar/chat/GroupChat.py +++ b/sugar/chat/GroupChat.py @@ -13,7 +13,7 @@ class GroupChat(Chat): def _setup_stream(self, service): self._group_stream = Stream.new_from_service(service) self._group_stream.set_data_listener(self._group_recv_message) - self._stream_writer = self._group_stream.new_writer() + self._stream_writer = self._group_stream.new_writer(service) def _group_recv_message(self, address, msg): logging.debug('Group chat received from %s message %s' % (address, msg)) |