diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-09 13:53:10 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-09 13:53:10 (GMT) |
| commit | 95d9b7fe8e7cbde413ef5f937cc1dda2b7fa8813 (patch) | |
| tree | 733abfdda232625b72d52cc92929fc8d78ff5696 /activities | |
| parent | a9a65f42dfe4f0ca4eb7c916ec4afc9b3e376c69 (diff) | |
More work on the chat. Fix terminal api
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/chat/ChatActivity.py | 21 | ||||
| -rw-r--r-- | activities/chat/chat.activity | 1 | ||||
| -rw-r--r-- | activities/terminal/TerminalActivity.py | 4 | ||||
| -rw-r--r-- | activities/terminal/terminal.activity | 1 |
4 files changed, 18 insertions, 9 deletions
diff --git a/activities/chat/ChatActivity.py b/activities/chat/ChatActivity.py index ab661d1..4661eb5 100644 --- a/activities/chat/ChatActivity.py +++ b/activities/chat/ChatActivity.py @@ -2,16 +2,27 @@ from gettext import gettext as _ from sugar.activity.Activity import Activity from sugar.chat.BuddyChat import BuddyChat +from sugar.presence.PresenceService import PresenceService class ChatActivity(Activity): - def __init__(self, service): + def __init__(self): Activity.__init__(self) self.set_title(_('Private chat')) - self._service = service - self._chat = BuddyChat(self._service) + def cmd_connect(self, args): + pservice = PresenceService() + service = pservice.get(args[0]) + + self._chat = BuddyChat(service) self.add(self._chat) self._chat.show() - def recv_message(self, message): - self._chat.recv_message(message) + def cmd_message(self, args): + self._chat.recv_message(args[0]) + + def execute(self, command, args): + if command == 'connect': + self.cmd_connect(args) + elif command == 'message': + self.cmd_mesage(args) + diff --git a/activities/chat/chat.activity b/activities/chat/chat.activity index b42ba8a..9726f38 100644 --- a/activities/chat/chat.activity +++ b/activities/chat/chat.activity @@ -2,4 +2,3 @@ name = Chat id = com.redhat.Sugar.ChatActivity python_module = chat.ChatActivity.ChatActivity -default_type = _chat_activity._tcp diff --git a/activities/terminal/TerminalActivity.py b/activities/terminal/TerminalActivity.py index 0c1fde1..e2e02ed 100644 --- a/activities/terminal/TerminalActivity.py +++ b/activities/terminal/TerminalActivity.py @@ -51,8 +51,8 @@ class Terminal(gtk.HBox): pass class TerminalActivity(Activity): - def __init__(self, service): - Activity.__init__(self, service) + def __init__(self): + Activity.__init__(self) self.set_title("Terminal") diff --git a/activities/terminal/terminal.activity b/activities/terminal/terminal.activity index 5421e6f..1f3e1e5 100644 --- a/activities/terminal/terminal.activity +++ b/activities/terminal/terminal.activity @@ -1,5 +1,4 @@ [Activity] name = Terminal id = org.sugar.Terminal -default_type = _terminal_olpc._udp python_module = terminal.TerminalActivity.TerminalActivity |