From ad9d6ccdf65176146044ecc87536808ed921d2b1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Jan 2014 14:06:39 +0000 Subject: [PATCH] #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 --- src/xpra/gtk_common/gtk2common.py | 2 ++ src/xpra/server/gtk_server_base.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xpra/gtk_common/gtk2common.py b/src/xpra/gtk_common/gtk2common.py index d378e478e8..07a7fd5ed8 100644 --- 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 index f9cd976cb4..68ab984319 100644 --- 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()