18046
|
1 |
diff -ur at-spi-1.30.1-old/atk-bridge/bridge.c at-spi-1.30.1-new/atk-bridge/bridge.c
|
|
2 |
--- at-spi-1.30.1-old/atk-bridge/bridge.c 2010-03-12 18:34:17.000000000 +0800
|
18049
|
3 |
+++ at-spi-1.30.1-new/atk-bridge/bridge.c 2010-05-28 17:05:24.084309793 +0800
|
|
4 |
@@ -213,11 +213,22 @@
|
18046
|
5 |
if (debug_env_string)
|
|
6 |
_dbg = (int) g_ascii_strtod (debug_env_string, NULL);
|
|
7 |
|
|
8 |
+ GMainContext* orb_context = g_main_context_get_thread_default();
|
|
9 |
+ ORBit_set_giop_main_context (orb_context);
|
|
10 |
+
|
|
11 |
if (!bonobo_init (argc, argv ? *argv : NULL))
|
|
12 |
{
|
|
13 |
g_error ("Could not initialize Bonobo");
|
|
14 |
}
|
|
15 |
|
|
16 |
+ if ( orb_context != NULL ) {
|
|
17 |
+ CORBA_ORB orb = bonobo_activation_orb_get();
|
|
18 |
+ PortableServer_POA poa = (PortableServer_POA)
|
|
19 |
+ CORBA_ORB_resolve_initial_references (orb, "RootPOA", &ev);
|
|
20 |
+ ORBit_ObjectAdaptor_set_thread_hint((ORBit_ObjectAdaptor)poa,
|
|
21 |
+ ORBIT_THREAD_HINT_ON_CONTEXT, orb_context);
|
|
22 |
+ }
|
|
23 |
+
|
|
24 |
bonobo_activate ();
|
|
25 |
|
|
26 |
/* Create the accessible application server object */
|