From ca85c2c4435707fa33a9576fa551cae161003900 Mon Sep 17 00:00:00 2001 From: haip Date: Thu, 22 Mar 2007 06:50:00 +0000 Subject: [PATCH] 2007-03-22 Li Yuan * atk-bridge/bridge.c: don't call threads_leave and enter if own the main context. Fix for #329454 git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@896 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 5 +++++ atk-bridge/bridge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d40e307..6ec0756 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-22 Li Yuan + + * atk-bridge/bridge.c: don't call threads_leave and enter if own the + main context. Fix for #329454. + 2007-03-12 Li Yuan * configure.in, NEWS: Uprev/release 1.18.0 for GNOME 2.18.0. diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index ef4bb40..6309fd7 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -47,9 +47,9 @@ #define DBG(a,b) if(_dbg>=(a))b #define bridge_threads_leave() \ - if (!during_init_shutdown) atk_misc_threads_leave(misc) + if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_leave(misc); #define bridge_threads_enter() \ - if (!during_init_shutdown) atk_misc_threads_enter(misc) + if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc); int _dbg = 0; static CORBA_Environment ev; -- 2.7.4