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

Another try at not making dbus angry with threads.

Browse Source
This commit is contained in:
Dan Williams 2006-05-22 12:52:07 -04:00
parent 6998f6b3a6
commit d4fb0608fd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sugar/chat/chat.py
View File

@ -452,7 +452,7 @@ class GroupChat(Chat):
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 = Stream.new_from_service(buddy_service, self._group)
self._buddy_icon_handler = BuddyIconRequestHandler(self._group, self._buddy_stream) self._buddy_icon_handler = BuddyIconRequestHandler(self._group, self._buddy_stream)
self._buddy_stream.set_data_listener(self._buddy_recv_message) self._buddy_stream.set_data_listener(getattr(self, "_buddy_recv_message"))
buddy_service.register(self._group) buddy_service.register(self._group)
# Group chat Stream # Group chat Stream
@ -654,10 +654,12 @@ class ChatShell(dbus.service.Object):
def main(): def main():
if len(sys.argv) > 1 and sys.argv[1] == "--console": if len(sys.argv) > 1 and sys.argv[1] == "--console":
sys.stdout = LogWriter("Chat") sys.stdout = LogWriter("Chat")
sys.stderr = LogWriter("Chat") sys.stderr = LogWriter("Chat")
gtk.threads_init()
dbus.glib.threads_init()
ChatShell.get_instance().open_group_chat() ChatShell.get_instance().open_group_chat()
try: try:
gtk.main() gtk.main()