[java-atk-wrapper: 2/2] Merge branch 'init_fail' into 'master'

[Samuel Thibault <sthibaul src gnome org>]

commit d6b41fd5318d6504178b889e3ac064d21efb316f
Merge: acebb62 e81bfe9
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Wed May 1 22:07:18 2019 +0000

    Merge branch 'init_fail' into 'master'
    
    Gracefully abort initialization if at-spi fails
    
    See merge request GNOME/java-atk-wrapper!8

 jni/src/AtkWrapper.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --cc jni/src/AtkWrapper.c
index 9e9a4f5,203d91b..d190674
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@@ -138,10 -124,10 +139,12 @@@ JNICALL Java_org_GNOME_Accessibility_At
    jaw_initialized = jaw_accessibility_init();
    if (jaw_debug)
      printf("Jaw Initialization STATUS in loadAtkBridge: %d\n", jaw_initialized);
+   if (!jaw_initialized)
+     return;
  
 -  jni_main_loop = g_main_loop_new (NULL, FALSE); /*main loop NOT running*/
 +  jni_main_context = g_main_context_new();
 +  jni_main_loop = g_main_loop_new (jni_main_context, FALSE); /*main loop NOT running*/
 +  atk_bridge_set_event_context(jni_main_context);
    thread = g_thread_new(message, jni_loop_callback, (void *) jni_main_loop);
    if(thread == NULL)
    {