Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2006-05-22 16:52:07 (GMT)
committer Dan Williams <dcbw@redhat.com>2006-05-22 16:52:07 (GMT)
commitd4fb0608fdb152338707d047a594d1ed6a2a1c29 (patch)
tree4c9ece3a9fcab51545405e05ae696d212872a338 /sugar
parent6998f6b3a6051d555c93f3abeb3a869c7c23fed4 (diff)
Another try at not making dbus angry with threads.
Diffstat (limited to 'sugar')
-rwxr-xr-xsugar/chat/chat.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sugar/chat/chat.py b/sugar/chat/chat.py
index c712df7..c9b5688 100755
--- a/sugar/chat/chat.py
+++ b/sugar/chat/chat.py
@@ -452,7 +452,7 @@ class GroupChat(Chat):
buddy_service = Service(name, CHAT_SERVICE_TYPE, CHAT_SERVICE_PORT)
self._buddy_stream = Stream.new_from_service(buddy_service, self._group)
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)
# Group chat Stream
@@ -654,10 +654,12 @@ class ChatShell(dbus.service.Object):
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.stderr = LogWriter("Chat")
+ gtk.threads_init()
+ dbus.glib.threads_init()
ChatShell.get_instance().open_group_chat()
try:
gtk.main()