diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-24 22:36:42 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-24 22:36:42 (GMT) |
| commit | 03d82108d71e4cbc0b8e32ef83d9dcca8a6277a6 (patch) | |
| tree | 66f3d984e3d8314d47e2fd9b7309de36cff9b8d0 /activities | |
| parent | bae47abd09dde8e6700646a8911c3b0e0b470cd6 (diff) | |
Write a chat activity, remove some unused code
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/chat/Makefile.am | 2 | ||||
| -rw-r--r-- | activities/chat/chat.activity | 2 | ||||
| -rw-r--r-- | activities/chat/chatactivity.py | 27 |
3 files changed, 28 insertions, 3 deletions
diff --git a/activities/chat/Makefile.am b/activities/chat/Makefile.am index e77c345..9030e74 100644 --- a/activities/chat/Makefile.am +++ b/activities/chat/Makefile.am @@ -1,6 +1,6 @@ sugardir = $(pkgdatadir)/activities/chat sugar_PYTHON = \ __init__.py \ - ChatActivity.py + chatactivity.py EXTRA_DIST = chat.activity diff --git a/activities/chat/chat.activity b/activities/chat/chat.activity index b0b8ea7..0cbda51 100644 --- a/activities/chat/chat.activity +++ b/activities/chat/chat.activity @@ -3,4 +3,4 @@ name = GroupChat icon = activity-chat id = org.laptop.ChatActivity python_module = chat.chatactivity.ChatActivity -show_launcher = no +show_launcher = yes diff --git a/activities/chat/chatactivity.py b/activities/chat/chatactivity.py index 264311b..374351f 100644 --- a/activities/chat/chatactivity.py +++ b/activities/chat/chatactivity.py @@ -17,8 +17,33 @@ from gettext import gettext as _ from sugar.activity.Activity import Activity +from sugar.chat.Chat import Chat +from sugar.p2p.Stream import Stream -class GroupChatActivity(Activity): +class ChatActivity(Activity): def __init__(self): Activity.__init__(self) + + self._group_stream = None + self.set_title(_('Group chat')) + + self._chat = Chat() + self.add(self._chat) + self._chat.show() + + def join(self, activity_ps): + Activity.join(self, activity_ps) + self._setup_stream() + + def share(self): + Activity.share(self) + self._setup_stream() + + def _setup_stream(self): + self._group_stream = Stream.new_from_service(self._service) + self._group_stream.set_data_listener(self._group_recv_message) + self._chat.set_stream_writer(self._group_stream.new_writer()) + + def _group_recv_message(self, address, msg): + self._chat.recv_message(msg) |