From 80b92fe2aa0b65b3d1f61199bb34232158160d95 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Wed, 26 Jul 2006 00:04:20 +0000
Subject: Merge branch 'master' of git+ssh://dcbw@dev.laptop.org/git/sugar

---
diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py
index a31d059..c5f4f1a 100644
--- a/sugar/activity/Activity.py
+++ b/sugar/activity/Activity.py
@@ -7,6 +7,10 @@ import dbus.glib
 import gtk
 import gobject
 
+# Work around for dbus mutex locking issue
+gtk.gdk.threads_init()
+dbus.glib.threads_init()
+
 from sugar.LogWriter import LogWriter
 import sugar.util
 
--
cgit v0.9.1