#485 call "gtk.gdk.threads_init()" before gtk.main but not too early

git-svn-id: https://xpra.org/svn/Xpra/trunk@5115 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jan 4, 2014 · ad9d6cc · ad9d6cc
1 parent ff310aa
commit ad9d6cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/xpra/gtk_common/gtk2common.py b/src/xpra/gtk_common/gtk2common.py
@@ -9,8 +9,10 @@ def gtk2main():
     pygtk.require('2.0')
     import gtk
     if gtk.main_level()==0:
+        gtk.gdk.threads_init()
         try:
             gtk.threads_enter()
             gtk.main()
         finally:
             gtk.threads_leave()
+            pass
diff --git a/src/xpra/server/gtk_server_base.py b/src/xpra/server/gtk_server_base.py
@@ -9,7 +9,6 @@
 import gtk.gdk
 import gobject
 gobject.threads_init()
-gtk.gdk.threads_init()
 
 from xpra.log import Logger
 log = Logger()