[java-atk-wrapper] fix imcompatable pointer w in set_extents



commit 6a3f1b622c46691e5ffb4dee531b69d0c115a2c6
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sun Jan 4 01:18:44 2015 +0000

    fix imcompatable pointer w in set_extents
    
    Bug https://bugzilla.gnome.org/show_bug.cgi?id=742290

 jni/src/jawcomponent.c |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/jni/src/jawcomponent.c b/jni/src/jawcomponent.c
index 67352b4..e276c2a 100644
--- a/jni/src/jawcomponent.c
+++ b/jni/src/jawcomponent.c
@@ -44,10 +44,10 @@ static void jaw_component_get_extents(AtkComponent *component,
                                       AtkCoordType coord_type);
 
 static gboolean jaw_component_set_extents(AtkComponent *component,
-                                          gint         *x,
-                                          gint         *y,
-                                          gint         *width,
-                                          gint         *height,
+                                          gint         x,
+                                          gint         y,
+                                          gint         width,
+                                          gint         height,
                                           AtkCoordType coord_type);
 
 static gboolean jaw_component_grab_focus(AtkComponent *component);
@@ -192,14 +192,14 @@ jaw_component_ref_accessible_at_point (AtkComponent *component, gint x, gint y,
 
 static gboolean
 jaw_component_set_extents (AtkComponent *component,
-                           gint         *x,
-                           gint         *y,
-                           gint         *width,
-                           gint         *height,
+                           gint         x,
+                           gint         y,
+                           gint         width,
+                           gint         height,
                            AtkCoordType coord_type)
 {
 
-  if (x == NULL || y == NULL || width == NULL || height == NULL)
+  if (&x == NULL || &y == NULL || &width == NULL || &height == NULL)
   {
     return FALSE;
   }
@@ -221,10 +221,10 @@ jaw_component_set_extents (AtkComponent *component,
 
   if (jrectangle == NULL)
   {
-    (*width) = 0;
-    (*height) = 0;
-    (*x) = 0;
-    (*y) = 0;
+    width = 0;
+    height = 0;
+    x = 0;
+    y = 0;
     return FALSE;
   }
 
@@ -252,10 +252,10 @@ jaw_component_set_extents (AtkComponent *component,
   jint jx = (*jniEnv)->GetIntField(jniEnv, rectangle_class, jfidX);
   jint jy = (*jniEnv)->GetIntField(jniEnv, rectangle_class, jfidY);
 
-  (*width) = (gint)jwidth;
-  (*height) = (gint)jheight;
-  (*x) = (gint)jx;
-  (*y) = (gint)jy;
+  width = (gint)jwidth;
+  height = (gint)jheight;
+  x = (gint)jx;
+  y = (gint)jy;
 
   return TRUE;
 }


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