[java-atk-wrapper] removed JNI_TRUE/FALSE

[Samuel Thibault <sthibaul src gnome org>]

commit 4a31d24207a9a636b71d59d955a3fb443d51f46d
Author: giuseppe <giuseppe dhcp-64-136 muc redhat com>
Date:   Thu Jul 11 15:42:05 2019 +0200

    removed JNI_TRUE/FALSE

 jni/src/AtkWrapper.c      | 25 +++++++++----------------
 jni/src/jawaction.c       | 14 ++------------
 jni/src/jawcomponent.c    |  8 +-------
 jni/src/jaweditabletext.c |  5 +----
 jni/src/jawtablecell.c    | 11 ++---------
 5 files changed, 15 insertions(+), 48 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index 3079985..ac6e880 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -36,9 +36,6 @@ FILE *log_file;
 extern "C" {
 #endif
 
-#define JNI_FALSE 0
-#define JNI_TRUE 1
-
 #define KEY_DISPATCH_NOT_DISPATCHED 0
 #define KEY_DISPATCH_CONSUMED 1
 #define KEY_DISPATCH_NOT_CONSUMED 2
@@ -377,7 +374,7 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_windowOpen(JNIEnv *jniEnv,
   jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
   callback_para_process_frees();
   CallbackPara *para = alloc_callback_para(jniEnv, global_ac);
-  para->is_toplevel = (jIsToplevel == JNI_TRUE) ? TRUE : FALSE;
+  para->is_toplevel = jIsToplevel;
   jni_main_idle_add(window_open_handler, para);
 }
 
@@ -432,7 +429,7 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_windowClose(JNIEnv *jniEnv,
   jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
   callback_para_process_frees();
   CallbackPara *para = alloc_callback_para(jniEnv, global_ac);
-  para->is_toplevel = (jIsToplevel == JNI_TRUE) ? TRUE : FALSE;
+  para->is_toplevel = jIsToplevel;
   jni_main_idle_add(window_close_handler, para);
 }
 
@@ -950,11 +947,7 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_objectStateChange(JNIEnv *jniEnv
   CallbackPara *para = alloc_callback_para(jniEnv, global_ac);
   AtkStateType state_type = jaw_util_get_atk_state_type_from_java_state( jniEnv, state );
   para->atk_state = state_type;
-  if (value == JNI_TRUE) {
-    para->state_value = TRUE;
-  } else {
-    para->state_value = FALSE;
-  }
+  para->state_value = value;
   jni_main_idle_add(object_state_change_handler, para);
 }
 
@@ -1120,25 +1113,25 @@ key_dispatch_handler (gpointer p)
   // state
   jfieldID jfidShift = (*jniEnv)->GetFieldID(jniEnv, classAtkKeyEvent, "isShiftKeyDown", "Z");
   jboolean jShiftKeyDown = (*jniEnv)->GetBooleanField(jniEnv, jAtkKeyEvent, jfidShift);
-  if (jShiftKeyDown == JNI_TRUE) {
+  if (jShiftKeyDown) {
     event->state |= GDK_SHIFT_MASK;
   }
 
   jfieldID jfidCtrl = (*jniEnv)->GetFieldID(jniEnv, classAtkKeyEvent, "isCtrlKeyDown", "Z");
   jboolean jCtrlKeyDown = (*jniEnv)->GetBooleanField(jniEnv, jAtkKeyEvent, jfidCtrl);
-  if (jCtrlKeyDown == JNI_TRUE) {
+  if (jCtrlKeyDown) {
     event->state |= GDK_CONTROL_MASK;
   }
 
   jfieldID jfidAlt = (*jniEnv)->GetFieldID(jniEnv, classAtkKeyEvent, "isAltKeyDown", "Z");
   jboolean jAltKeyDown = (*jniEnv)->GetBooleanField(jniEnv, jAtkKeyEvent, jfidAlt);
-  if (jAltKeyDown == JNI_TRUE) {
+  if (jAltKeyDown) {
     event->state |= GDK_MOD1_MASK;
   }
 
   jfieldID jfidMeta = (*jniEnv)->GetFieldID(jniEnv, classAtkKeyEvent, "isMetaKeyDown", "Z");
   jboolean jMetaKeyDown = (*jniEnv)->GetBooleanField(jniEnv, jAtkKeyEvent, jfidMeta);
-  if (jMetaKeyDown == JNI_TRUE)
+  if (jMetaKeyDown)
   {
     event->state |= GDK_META_MASK;
   }
@@ -1192,10 +1185,10 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_dispatchKeyEvent(JNIEnv *jniEnv,
     printf("key_dispatch_result saved = %d\n ", key_dispatch_result);
   if (key_dispatch_result == KEY_DISPATCH_CONSUMED)
   {
-    key_consumed = JNI_TRUE;
+    key_consumed = TRUE;
   } else
   {
-    key_consumed = JNI_FALSE;
+    key_consumed = FALSE;
   }
 
   key_dispatch_result = KEY_DISPATCH_NOT_DISPATCHED;
diff --git a/jni/src/jawaction.c b/jni/src/jawaction.c
index adc66c3..0ac04da 100644
--- a/jni/src/jawaction.c
+++ b/jni/src/jawaction.c
@@ -138,11 +138,7 @@ jaw_action_do_action (AtkAction *action, gint i)
                                                   jmid,
                                                   (jint)i);
   (*jniEnv)->DeleteGlobalRef(jniEnv, atk_action);
-
-  if (jresult == JNI_TRUE)
-    return TRUE;
-
-  return FALSE;
+  return jresult;
 }
 
 static gint
@@ -229,13 +225,7 @@ jaw_action_set_description (AtkAction *action, gint i, const gchar *description)
                                                  (jint)i,
                                                  (jstring)description);
   (*jniEnv)->DeleteGlobalRef(jniEnv, atk_action);
-
-  if (jisset == JNI_TRUE)
-  {
-    return TRUE;
-  } else {
-    return FALSE;
-  }
+  return jisset;
 }
 
 static const gchar*
diff --git a/jni/src/jawcomponent.c b/jni/src/jawcomponent.c
index c4d6651..50130d8 100644
--- a/jni/src/jawcomponent.c
+++ b/jni/src/jawcomponent.c
@@ -258,13 +258,7 @@ jaw_component_grab_focus (AtkComponent *component)
                                           "()Z");
   jboolean jresult = (*jniEnv)->CallBooleanMethod(jniEnv, atk_component, jmid);
   (*jniEnv)->DeleteGlobalRef(jniEnv, atk_component);
-
-  if (jresult == JNI_TRUE)
-  {
-    return TRUE;
-  }
-
-  return FALSE;
+  return jresult;
 }
 
 static AtkLayer
diff --git a/jni/src/jaweditabletext.c b/jni/src/jaweditabletext.c
index 03747d2..c37fd52 100644
--- a/jni/src/jaweditabletext.c
+++ b/jni/src/jaweditabletext.c
@@ -285,8 +285,5 @@ jaw_editable_text_set_run_attributes(AtkEditableText *text,
                                                (jint)start_offset,
                                                (jint)end_offset);
   (*env)->DeleteGlobalRef(env, atk_editable_text);
-  if (jresult == JNI_TRUE)
-    return TRUE;
-
-  return FALSE;
+  return jresult;
 }
diff --git a/jni/src/jawtablecell.c b/jni/src/jawtablecell.c
index bf3cf54..f65f509 100644
--- a/jni/src/jawtablecell.c
+++ b/jni/src/jawtablecell.c
@@ -134,11 +134,7 @@ jaw_table_cell_get_position(AtkTableCell *cell, gint *row, gint *column)
                                                    (jint)GPOINTER_TO_INT(row),
                                                    (jint)GPOINTER_TO_INT(column));
   (*jniEnv)->DeleteGlobalRef(jniEnv, jatk_table_cell);
-
-  if (jposition == JNI_TRUE)
-    return TRUE;
-
-  return FALSE;
+  return jposition;
 }
 
 static gboolean jaw_table_cell_get_row_column_span(AtkTableCell *cell,
@@ -170,10 +166,7 @@ static gboolean jaw_table_cell_get_row_column_span(AtkTableCell *cell,
                                                 (jint)GPOINTER_TO_INT(column_span)
                                                 );
   (*jniEnv)->DeleteGlobalRef(jniEnv, jatk_table_cell);
-  if (jspan == JNI_TRUE)
-    return TRUE;
-
-  return FALSE;
+  return jspan;
 }
 
 static gint