[java-atk-wrapper: 2/2] Merge branch 'main_context' into 'master'
- From: Samuel Thibault <sthibaul src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper: 2/2] Merge branch 'main_context' into 'master'
- Date: Wed, 1 May 2019 21:50:25 +0000 (UTC)
commit c0b83881ec507c07310cf6b10c897ecabe14ff8b
Merge: ca02948 37a9a39
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date: Wed May 1 21:50:05 2019 +0000
Merge branch 'main_context' into 'master'
Use a separate context for delivering events
See merge request GNOME/java-atk-wrapper!3
jni/src/AtkWrapper.c | 49 +++++++++++++++++++++++++++++++++----------------
1 file changed, 33 insertions(+), 16 deletions(-)
---
diff --cc jni/src/AtkWrapper.c
index de885d9,a5e8e64..b842213
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@@ -254,14 -271,9 +271,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(focus_notify_handler, para);
+ jni_main_idle_add(focus_notify_handler, para);
}
static gboolean
@@@ -472,14 -475,9 +489,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(window_minimize_handler, para);
+ jni_main_idle_add(window_minimize_handler, para);
}
static gboolean
@@@ -526,14 -524,9 +543,14 @@@ JNIEXPORT void JNICALL Java_org_GNOME_A
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac );
- g_idle_add(window_maximize_handler, para);
+ jni_main_idle_add(window_maximize_handler, para);
}
static gboolean
@@@ -580,14 -573,10 +597,14 @@@ JNIEXPORT void JNICALL Java_org_GNOME_A
jclass jClass,
jobject jAccContext)
{
-
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(window_restore_handler, para);
+ jni_main_idle_add(window_restore_handler, para);
}
static gboolean
@@@ -631,16 -620,11 +648,16 @@@ window_activate_handler (gpointer p
JNIEXPORT void JNICALL Java_org_GNOME_Accessibility_AtkWrapper_windowActivate(JNIEnv *jniEnv,
jclass jClass,
- jobject jAccContext) {
-
+ jobject jAccContext)
+{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(window_activate_handler, para);
+ jni_main_idle_add(window_activate_handler, para);
}
static gboolean
@@@ -687,14 -671,10 +704,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
-
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(window_deactivate_handler, para);
+ jni_main_idle_add(window_deactivate_handler, para);
}
static gboolean
@@@ -742,14 -722,10 +759,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
-
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(window_state_change_handler, para);
+ jni_main_idle_add(window_state_change_handler, para);
}
static gint
@@@ -1179,14 -1145,9 +1196,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(component_added_handler, para);
+ jni_main_idle_add(component_added_handler, para);
}
static gboolean
@@@ -1243,14 -1204,9 +1260,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(component_removed_handler, para);
+ jni_main_idle_add(component_removed_handler, para);
}
/**
@@@ -1309,14 -1265,9 +1326,14 @@@ JNICALL Java_org_GNOME_Accessibility_At
jclass jClass,
jobject jAccContext)
{
+ if (!jAccContext) {
+ if (jaw_debug)
+ g_warning("%s: jAccContext == NULL", __func__);
+ return;
+ }
jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext);
CallbackPara *para = alloc_callback_para(global_ac);
- g_idle_add(bounds_changed_handler, para);
+ jni_main_idle_add(bounds_changed_handler, para);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]