at-spi r996 - in trunk: . libspi registryd

[liyuan svn gnome org]

Author: liyuan
Date: Wed Mar 19 07:09:37 2008
New Revision: 996
URL: http://svn.gnome.org/viewvc/at-spi?rev=996&view=rev

Log:
2008-03-19  Li Yuan  <li yuan sun com>

        * libspi/collection.c: (match_attributes_none_p), (inorder),
        (getMatchesInOrder):
        * registryd/deviceeventcontroller.c:
        (impl_generate_keyboard_event):
        Bug #521667. Patch from Jens Granseuer <jensgr gmx net>.
        Fixes several C99 idioms that lead to compilation errors
        with older compilers like gcc 2.x. Also removes a few unused
        variables.


Modified:
   trunk/ChangeLog
   trunk/libspi/collection.c
   trunk/registryd/deviceeventcontroller.c

Modified: trunk/libspi/collection.c
==============================================================================
--- trunk/libspi/collection.c	(original)
+++ trunk/libspi/collection.c	Wed Mar 19 07:09:37 2008
@@ -496,7 +496,6 @@
 
      int i, k;
      Accessibility_AttributeSet *oa;
-     gboolean flag = FALSE;
 
      if (attributes->_length == 0 || attributes == NULL)
 	  return TRUE;
@@ -758,10 +757,9 @@
   while ((max == 0 || kount < max) 
           && ! CORBA_Object_is_equivalent (obj, collection, ev))
   {
-
-    i = Accessibility_Accessible_getIndexInParent (obj, ev);
     Accessibility_Accessible parent =  
                                 Accessibility_Accessible__get_parent (obj, ev);
+    i = Accessibility_Accessible_getIndexInParent (obj, ev);
     kount  = sort_order_canonical (mrp, ls, kount, max, parent, 
                                    i+1, TRUE, FALSE, TRUE, TRUE, ev);
     obj = parent;
@@ -792,7 +790,7 @@
 		   CORBA_Environment *ev){
   GList *ls = NULL;
   AtkObject *aobj;
-  Accessibility_Accessible obj, collection;
+  Accessibility_Accessible obj;
   MatchRulePrivate *mrp;
   gint kount = 0;
 

Modified: trunk/registryd/deviceeventcontroller.c
==============================================================================
--- trunk/registryd/deviceeventcontroller.c	(original)
+++ trunk/registryd/deviceeventcontroller.c	Wed Mar 19 07:09:37 2008
@@ -2280,6 +2280,7 @@
 	SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant));
   gint err;
   KeySym keysym;
+  DEControllerPrivateData *priv;
 
 #ifdef SPI_DEBUG
 	fprintf (stderr, "synthesizing keystroke %ld, type %d\n",
@@ -2294,7 +2295,7 @@
   
   gdk_error_trap_push ();
 
-  DEControllerPrivateData *priv = (DEControllerPrivateData *) 
+  priv = (DEControllerPrivateData *) 
       g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark);
 
   if (!priv->have_xkb && xmkeymap==NULL) {