diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-15 15:18:33 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-15 15:18:33 (GMT) |
| commit | f0af49616ca0b51336407b3bfc9ceff677178b7b (patch) | |
| tree | 7f7124893f384de9b38a58365bc976f86a966191 /sugar/chat/GroupChat.py | |
| parent | ecf81ba35fbfa91c6b45cf0ef892c1c13d0e2eaf (diff) | |
Fixed a bunch of issues reported by pylint
Diffstat (limited to 'sugar/chat/GroupChat.py')
| -rw-r--r-- | sugar/chat/GroupChat.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/sugar/chat/GroupChat.py b/sugar/chat/GroupChat.py index e5d3a00..3eb03d4 100644 --- a/sugar/chat/GroupChat.py +++ b/sugar/chat/GroupChat.py @@ -1,4 +1,10 @@ from sugar.chat.Chat import Chat +from sugar.presence.Service import Service +from sugar.p2p.Stream import Stream + +GROUP_CHAT_SERVICE_TYPE = "_olpc_group_chat._udp" +GROUP_CHAT_SERVICE_ADDRESS = "224.0.0.221" +GROUP_CHAT_SERVICE_PORT = 6200 class GroupChat(Chat): def __init__(self): @@ -9,7 +15,7 @@ class GroupChat(Chat): return self._group def new_buddy_writer(self, buddy): - service = buddy.get_service(CHAT_SERVICE_TYPE) + service = buddy.get_service(Chat.SERVICE_TYPE) return self._buddy_stream.new_writer(service) def _start(self): @@ -17,15 +23,16 @@ class GroupChat(Chat): # Group controls the Stream for incoming messages for # specific buddy chats - buddy_service = Service(name, CHAT_SERVICE_TYPE, CHAT_SERVICE_PORT) + buddy_service = Service(name, Chat.SERVICE_TYPE, Chat.SERVICE_PORT) self._buddy_stream = Stream.new_from_service(buddy_service, self._group) self._buddy_stream.set_data_listener(getattr(self, "_buddy_recv_message")) buddy_service.register(self._group) # Group chat Stream - group_service = Service(name, GROUP_CHAT_SERVICE_TYPE, - GROUP_CHAT_SERVICE_PORT, - GROUP_CHAT_SERVICE_ADDRESS) + group_service = Service(name, + GROUP_CHAT_SERVICE_TYPE, + GROUP_CHAT_SERVICE_PORT, + GROUP_CHAT_SERVICE_ADDRESS) self._group.add_service(group_service) self._group_stream = Stream.new_from_service(group_service, self._group) @@ -37,9 +44,10 @@ class GroupChat(Chat): def _buddy_recv_message(self, buddy, msg): if not self._chats.has_key(buddy): - chat = BuddyChat(self, buddy) - self._chats[buddy] = chat - chat.connect_to_shell() +# chat = BuddyChat(self, buddy) +# self._chats[buddy] = chat +# chat.connect_to_shell() + pass else: chat = self._chats[buddy] chat.recv_message(buddy, msg) |