diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-26 14:45:40 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-26 14:45:40 (GMT) |
| commit | b4b4c13c905a0c3d00021ba33f30fc7e960bca06 (patch) | |
| tree | 600650d4e955a166643a7982b3a9d155ee00d99f | |
| parent | 51c08af67c23f639b7f17f4de001e952f595950a (diff) | |
Get one-to-one chat back to work
| -rw-r--r-- | activities/chat/ChatActivity.py | 11 | ||||
| -rwxr-xr-x | shell/sugar-activity-factory | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/activities/chat/ChatActivity.py b/activities/chat/ChatActivity.py index 83c199f..64ff3a3 100644 --- a/activities/chat/ChatActivity.py +++ b/activities/chat/ChatActivity.py @@ -39,7 +39,7 @@ class ChatShellDbusService(dbus.service.Object): @dbus.service.method('com.redhat.Sugar.ChatShell') def open_chat(self, service_path): - self._parent.open_chat(service_path) + self._parent.open_chat_from_path(service_path) class ChatListener: def __init__(self): @@ -58,7 +58,7 @@ class ChatListener: def _recv_message(self, address, message): [nick, msg] = Chat.deserialize_message(message) - buddy = self._pservice.get_buddy_by_nick_name(nick) + buddy = self._pservice.get_buddy_by_name(nick) if buddy: if buddy == self._pservice.get_owner(): return @@ -73,9 +73,12 @@ class ChatListener: else: logging.error('The buddy %s is not present.' % (nick)) return - - def open_chat(self, service_path): + + def open_chat_from_path(self, service_path): service = self._pservice._new_object(service_path) + self.open_chat(service) + + def open_chat(self, service): chat = ChatActivity(service) self._chats[service.get_name()] = chat return chat diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory index 1b42fbf..53789d4 100755 --- a/shell/sugar-activity-factory +++ b/shell/sugar-activity-factory @@ -12,8 +12,8 @@ from sugar import theme theme.setup() -lw = LogWriter(sys.argv[1]) -lw.start() +#lw = LogWriter(sys.argv[1]) +#lw.start() if len(sys.argv) == 4: Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3]) |