diff options
| -rwxr-xr-x | shell/sugar-activity-factory | 5 | ||||
| -rw-r--r-- | sugar/activity/Activity.py | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory index b39d229..2ec6bb3 100755 --- a/shell/sugar-activity-factory +++ b/shell/sugar-activity-factory @@ -7,6 +7,11 @@ import pygtk pygtk.require('2.0') import gobject import gtk +import dbus.glib + +# Work around for dbus mutex locking issue +gtk.gdk.threads_init() +dbus.glib.threads_init() from sugar.activity import ActivityFactory from sugar.LogWriter import LogWriter diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py index e99da5a..339c085 100644 --- a/sugar/activity/Activity.py +++ b/sugar/activity/Activity.py @@ -1,15 +1,9 @@ import dbus import dbus.service -import dbus.glib import gtk import gobject from sugar.presence.PresenceService import PresenceService - -# Work around for dbus mutex locking issue -gtk.gdk.threads_init() -dbus.glib.threads_init() - import sugar.util ACTIVITY_SERVICE_NAME = "com.redhat.Sugar.Activity" |