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@localhost.localdomain>2006-07-26 00:04:20 (GMT)
committer Dan Williams <dcbw@localhost.localdomain>2006-07-26 00:04:20 (GMT)
commit80b92fe2aa0b65b3d1f61199bb34232158160d95 (patch)
tree4b83c6fc47bd3b03c73c69a87662abc7286350db /sugar
parent164add907d263a39c8b4b90b0ac0b262445de7fd (diff)
parent2e58cc8786342daceea9a4f7bdddfafd6d0687e1 (diff)
Merge branch 'master' of git+ssh://dcbw@dev.laptop.org/git/sugar
Diffstat (limited to 'sugar')
-rw-r--r--sugar/activity/Activity.py4
1 files changed, 4 insertions, 0 deletions
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