[java-atk-wrapper] Fix some debug inconsistencies



commit 3bf09c98e9c9e1620dd56bca87c99d47704ce730
Author: Magdalen Berns <m berns thismagpie com>
Date:   Mon Jan 19 18:49:48 2015 +0000

    Fix some debug inconsistencies
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743199

 jni/src/AtkWrapper.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index ace1c28..2d657f8 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -1080,7 +1080,6 @@ component_removed_handler (gpointer p)
   }
 
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, lock);
-
   if (!jaw_impl)
   {
     free_callback_para(para);
@@ -1138,8 +1137,11 @@ key_dispatch_handler (gpointer p)
   if (type == type_pressed)
   {
     event->type = ATK_KEY_EVENT_PRESS;
-  } else if (type == type_released) {
+  } else if (type == type_released)
+  {
     event->type = ATK_KEY_EVENT_RELEASE;
+  } else {
+    g_assert_not_reached();
   }
 
   // state
@@ -1187,18 +1189,14 @@ key_dispatch_handler (gpointer p)
   jfieldID jfidTimestamp = (*jniEnv)->GetFieldID(jniEnv, classAtkKeyEvent, "timestamp", "I");
   event->timestamp = (guint32)(*jniEnv)->GetIntField(jniEnv, jAtkKeyEvent, jfidTimestamp);
 
-  if(jaw_debug)
-    printf("key_dispatch_result = %d\n ",key_dispatch_result);
   gboolean b = jaw_util_dispatch_key_event (event); //FIXME
   if(jaw_debug)
-    printf("b = %s\n ",(char *)b);
+    printf("key_dispatch_result b = %d\n ", b);
   if (b) {
     key_dispatch_result = 1;
   } else {
     key_dispatch_result = 2;
   }
-  if(jaw_debug)
-    printf("key_dispatch_result = %d\n ",key_dispatch_result);
 
   (*jniEnv)->ReleaseStringUTFChars(jniEnv, jstr, event->string);
   g_free(event);
@@ -1218,6 +1216,8 @@ JNICALL Java_org_GNOME_Accessibility_AtkWrapper_dispatchKeyEvent(JNIEnv *jniEnv,
   gdk_threads_init();
   g_idle_add(key_dispatch_handler, (gpointer)global_key_event);
 
+  if(jaw_debug)
+    printf("key_dispatch_result saved = %d\n ", key_dispatch_result);
   if (key_dispatch_result == 1)
   {
     key_consumed = JNI_TRUE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]