2007-03-22 Li Yuan <li.yuan@sun.com>

        * 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

diff --git a/ChangeLog b/ChangeLog
index d40e307..6ec0756 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22 Li Yuan <li.yuan@sun.com> 
+
+       * atk-bridge/bridge.c: don't call threads_leave and enter if own the 
+       main context. Fix for #329454.
+
 2007-03-12  Li Yuan <li.yuan@sun.com>
 
        * 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 (file)
--- 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;