sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get one-to-one chat back to work

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-07-26 16:45:40 +02:00
parent 51c08af67c
commit b4b4c13c90
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activities/chat/ChatActivity.py
View File

@ -39,7 +39,7 @@ class ChatShellDbusService(dbus.service.Object):
@dbus.service.method('com.redhat.Sugar.ChatShell') @dbus.service.method('com.redhat.Sugar.ChatShell')
def open_chat(self, service_path): def open_chat(self, service_path):
self._parent.open_chat(service_path) self._parent.open_chat_from_path(service_path)
class ChatListener: class ChatListener:
def __init__(self): def __init__(self):
@ -58,7 +58,7 @@ class ChatListener:
def _recv_message(self, address, message): def _recv_message(self, address, message):
[nick, msg] = Chat.deserialize_message(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:
if buddy == self._pservice.get_owner(): if buddy == self._pservice.get_owner():
return return
@ -74,8 +74,11 @@ class ChatListener:
logging.error('The buddy %s is not present.' % (nick)) logging.error('The buddy %s is not present.' % (nick))
return return
def open_chat(self, service_path): def open_chat_from_path(self, service_path):
service = self._pservice._new_object(service_path) service = self._pservice._new_object(service_path)
self.open_chat(service)
def open_chat(self, service):
chat = ChatActivity(service) chat = ChatActivity(service)
self._chats[service.get_name()] = chat self._chats[service.get_name()] = chat
return chat return chat

4
shell/sugar-activity-factory
View File

@ -12,8 +12,8 @@ from sugar import theme
theme.setup() theme.setup()
lw = LogWriter(sys.argv[1]) #lw = LogWriter(sys.argv[1])
lw.start() #lw.start()
if len(sys.argv) == 4: if len(sys.argv) == 4:
Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3]) Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3])