2003-04-14 Padraig O'Briain <padraig.obriain@sun.com>

	* cspi/accessible.c:
	(cpi_initial_relation_type_table): New function which initializes
	mapping between Accessibility_RelationType and AccessibleRelationType.
	(cspi_relation_type_from_spi_relation_type): New function which
	translates an Accessibility_RelationType into an AccessibleRelationType.
	(AccessibleRelation_getRelationType): Use
	cpi_relation_type_get_spi_relation_type to return correct value.
	(spi_state_to_corba): Return correct type for default case.

	* cspi/spi_registry.c (SPI_registerAccessibleKeyStrokeListener):
	Use Accessibility_EventType instead of Accessibility_KeyEventType.

	* cspi/cspi-bonobo-listener.c:
	Remove semicolon after BONOBO_TYPE_FUNC. Add casts to avoid compiler
	warnings.

	* libspi/accessible.c, libspi/action.c, libspi/application.c,
	libspi/base.c, libspi/component.c, libspi.devicelistener.c,
	libspi/editabletable.c, libspi/hyperlink.c, libspi/hypertext.c,
	libspi/image.c, libspi/listener.c, libspi/selection.c,
	libspi/stateset.c, libspi/table, libspi/text.c, libspi/value.c,
	registryd/desktop.c, registryd/registry.c:
	Remove semicolon after BONOBO_TYPE_FUNC_FULL.

	* libspi/eventlistener.c
	Remove semicolon after BONOBO_TYPE_FUNC.

	* libspi/relation.c:
	Remove semicolon after BONOBO_TYPE_FUNC_FULL.
	(spi_init_relation_type_table): Initialize using correct type.

	* registryd/desktop.c:
	Remove semicolon after BONOBO_TYPE_FUNC_FULL.
	(spi_keystroke_from_x_key_event): Use Accessibility_EventType instead
	of Accessibility_KeyEventType.

	* test/key-listener-test.c (report_tab_key_event): Use fprintf
	instead of g_print.

	* tests/simple-at.c, tests/screen-review-test.c:
	Add include for <strings.h>.

	* tests.stress-test.c:
	Add includes for <unistd.h> and <bonobo/bonobo-main.h>

	These changes fix compiler warnings when using FORTE compiler on
	Solaris; fixes bug #107479.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@419 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 8c9bbe6..62ff5cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2003-04-14  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * cspi/accessible.c:
+       (cpi_initial_relation_type_table): New function which initializes 
+       mapping between Accessibility_RelationType and AccessibleRelationType.
+       (cspi_relation_type_from_spi_relation_type): New function which
+       translates an Accessibility_RelationType into an AccessibleRelationType.
+       (AccessibleRelation_getRelationType): Use 
+       cpi_relation_type_get_spi_relation_type to return correct value.
+       (spi_state_to_corba): Return correct type for default case.
+
+       * cspi/spi_registry.c (SPI_registerAccessibleKeyStrokeListener):
+       Use Accessibility_EventType instead of Accessibility_KeyEventType.
+
+       * cspi/cspi-bonobo-listener.c:
+       Remove semicolon after BONOBO_TYPE_FUNC. Add casts to avoid compiler
+       warnings.
+
+       * libspi/accessible.c, libspi/action.c, libspi/application.c,
+       libspi/base.c, libspi/component.c, libspi.devicelistener.c,
+       libspi/editabletable.c, libspi/hyperlink.c, libspi/hypertext.c,
+       libspi/image.c, libspi/listener.c, libspi/selection.c, 
+       libspi/stateset.c, libspi/table, libspi/text.c, libspi/value.c, 
+       registryd/desktop.c, registryd/registry.c:
+       Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+
+       * libspi/eventlistener.c
+       Remove semicolon after BONOBO_TYPE_FUNC.
+
+       * libspi/relation.c:
+       Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+       (spi_init_relation_type_table): Initialize using correct type.
+
+       * registryd/desktop.c:
+       Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+       (spi_keystroke_from_x_key_event): Use Accessibility_EventType instead 
+       of Accessibility_KeyEventType.
+
+       * test/key-listener-test.c (report_tab_key_event): Use fprintf
+       instead of g_print.
+
+       * tests/simple-at.c, tests/screen-review-test.c:
+       Add include for <strings.h>.
+
+       * tests.stress-test.c:
+       Add includes for <unistd.h> and <bonobo/bonobo-main.h>
+
+       These changes fix compiler warnings when using FORTE compiler on
+       Solaris; fixes bug #107479.
+
+       
 2003-04-10  Bill Haneman <bill.haneman@sun.com>
 
 

diff --git a/cspi/bonobo/cspi-bonobo-listener.c b/cspi/bonobo/cspi-bonobo-listener.c
index 61295a7..8011cfb 100644 (file)
--- a/cspi/bonobo/cspi-bonobo-listener.c
+++ b/cspi/bonobo/cspi-bonobo-listener.c
@@ -168,7 +168,7 @@ cspi_event_listener_add_cb (AccessibleEventListener  *al,
   g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
 
   listener->callbacks = g_list_prepend (listener->callbacks,
-                                       cspi_event_handler_new (callback, user_data));
+                                       cspi_event_handler_new ((void *) callback, user_data));
 }
 
 void
@@ -179,7 +179,7 @@ cspi_event_listener_remove_cb (AccessibleEventListener  *al,
 
   g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
 
-  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
+  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, (void *) callback);
 }
 
 /* 
@@ -266,7 +266,7 @@ cspi_device_listener_class_init (CSpiDeviceListenerClass *klass)
 
 BONOBO_TYPE_FUNC (CSpiDeviceListener, 
                  spi_device_listener_get_type (),
-                 cspi_device_listener);
+                 cspi_device_listener)
 
 gpointer
 cspi_device_listener_new (void)
@@ -286,7 +286,7 @@ cspi_device_listener_add_cb (AccessibleDeviceListener  *al,
   g_return_if_fail (CSPI_IS_DEVICE_LISTENER (listener));
 
   listener->callbacks = g_list_prepend (listener->callbacks,
-                                       cspi_event_handler_new (callback, user_data));
+                                       cspi_event_handler_new ((void *)callback, user_data));
 }
 
 void
@@ -297,7 +297,7 @@ cspi_device_listener_remove_cb (AccessibleDeviceListener  *al,
 
   g_return_if_fail (CSPI_IS_DEVICE_LISTENER (listener));
 
-  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
+  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, (void *) callback);
 }
 
 void

diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index 2230e50..1cffc74 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -964,6 +964,52 @@ AccessibleRelation_unref (AccessibleRelation *obj)
   cspi_object_unref (obj);
 }
 
+static SPIBoolean
+cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
+{
+  int i;
+  for (i = 0; i < Accessibility_RELATION_LAST_DEFINED; ++i)
+    {
+      relation_type_table [i] = SPI_RELATION_NULL;
+    }
+  relation_type_table [Accessibility_RELATION_NULL] = SPI_RELATION_NULL;
+  relation_type_table [Accessibility_RELATION_LABEL_FOR] = SPI_RELATION_LABEL_FOR;
+  relation_type_table [Accessibility_RELATION_LABELLED_BY] = SPI_RELATION_LABELED_BY;
+  relation_type_table [Accessibility_RELATION_CONTROLLER_FOR] = SPI_RELATION_CONTROLLER_FOR;
+  relation_type_table [Accessibility_RELATION_CONTROLLED_BY] = SPI_RELATION_CONTROLLED_BY;
+  relation_type_table [Accessibility_RELATION_MEMBER_OF] = SPI_RELATION_MEMBER_OF;
+  relation_type_table [Accessibility_RELATION_TOOLTIP_FOR] = SPI_RELATION_NULL;
+  relation_type_table [Accessibility_RELATION_NODE_CHILD_OF] = SPI_RELATION_NODE_CHILD_OF;
+  relation_type_table [Accessibility_RELATION_EXTENDED] = SPI_RELATION_EXTENDED;
+  relation_type_table [Accessibility_RELATION_FLOWS_TO] = SPI_RELATION_FLOWS_TO;
+  relation_type_table [Accessibility_RELATION_FLOWS_FROM] = SPI_RELATION_FLOWS_FROM;
+  relation_type_table [Accessibility_RELATION_SUBWINDOW_OF] = SPI_RELATION_SUBWINDOW_OF;
+  relation_type_table [Accessibility_RELATION_EMBEDS] = SPI_RELATION_EMBEDS;
+  relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY;
+  relation_type_table [Accessibility_RELATION_LAST_DEFINED] = SPI_RELATION_LAST_DEFINED;
+}
+
+static AccessibleRelationType
+cspi_relation_type_from_spi_relation_type (Accessibility_RelationType type)
+{
+  /* array is sized according to IDL RelationType because IDL RelationTypes are the index */   
+  static AccessibleRelationType cspi_relation_type_table [Accessibility_RELATION_LAST_DEFINED];
+  static SPIBoolean is_initialized = FALSE;
+  AccessibleRelationType cspi_type;
+  if (!is_initialized)
+    {
+      is_initialized = cspi_init_relation_type_table (cspi_relation_type_table);           
+    }
+  if (type >= 0 && type < Accessibility_RELATION_LAST_DEFINED)
+    {
+      cspi_type = cspi_relation_type_table [type];         
+    }
+  else
+    {
+      cspi_type = SPI_RELATION_NULL;
+    }
+  return cspi_type; 
+}
 /**
  * AccessibleRelation_getRelationType:
  * @obj: a pointer to the #AccessibleRelation object to query.
@@ -977,13 +1023,13 @@ AccessibleRelation_unref (AccessibleRelation *obj)
 AccessibleRelationType
 AccessibleRelation_getRelationType (AccessibleRelation *obj)
 {
-  AccessibleRelationType retval;
+  Accessibility_RelationType retval;
   
   cspi_return_val_if_fail (obj, SPI_RELATION_NULL);
   retval =
     Accessibility_Relation_getRelationType (CSPI_OBJREF (obj), cspi_ev());
   cspi_return_val_if_ev ("getRelationType", SPI_RELATION_NULL);
-  return retval;
+  return cspi_relation_type_from_spi_relation_type (retval);
 }
 
 /**
@@ -1101,7 +1147,7 @@ spi_state_to_corba (AccessibleState state)
       MAP_STATE (VISIBLE);
       MAP_STATE (MANAGES_DESCENDANTS);
     default:
-      return ATK_STATE_INVALID;
+      return Accessibility_STATE_INVALID;
   }
 #undef MAP_STATE
 }            

diff --git a/cspi/spi_registry.c b/cspi/spi_registry.c
index 91b1a0e..9a1310f 100644 (file)
--- a/cspi/spi_registry.c
+++ b/cspi/spi_registry.c
@@ -338,7 +338,7 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener  *listener,
   Accessibility_ControllerEventMask   controller_event_mask;
   Accessibility_DeviceEventController device_event_controller;
   Accessibility_EventListenerMode     listener_mode;
-  Accessibility_KeyEventType          key_event_types [2];
+  Accessibility_EventType             key_event_types [2];
   SPIBoolean                          retval = FALSE;
 
   if (!listener)
@@ -381,11 +381,11 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener  *listener,
   key_events._buffer = key_event_types;
   if (eventmask & SPI_KEY_PRESSED)
     {
-      key_events._buffer[i++] = Accessibility_KEY_PRESSED;
+      key_events._buffer[i++] = Accessibility_KEY_PRESSED_EVENT;
     }
   if (eventmask & SPI_KEY_RELEASED)
     {
-      key_events._buffer[i++] = Accessibility_KEY_RELEASED;
+      key_events._buffer[i++] = Accessibility_KEY_RELEASED_EVENT;
     }
   key_events._length = i;
   

diff --git a/libspi/accessible.c b/libspi/accessible.c
index e14c807..efd1e1d 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -432,7 +432,7 @@ spi_accessible_init (SpiAccessible *accessible)
 BONOBO_TYPE_FUNC_FULL (SpiAccessible,
                       Accessibility_Accessible,
                       PARENT_TYPE,
-                      spi_accessible);
+                      spi_accessible)
 
 static GHashTable *public_corba_refs = NULL;
 

diff --git a/libspi/action.c b/libspi/action.c
index 6f35731..d7865f3 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -58,7 +58,7 @@ impl_getKeyBinding (PortableServer_Servant servant,
 BONOBO_TYPE_FUNC_FULL (SpiAction,
                       Accessibility_Action,
                       SPI_TYPE_BASE,
-                      spi_action);
+                      spi_action)
 
 static void
 spi_action_class_init (SpiActionClass *klass)

diff --git a/libspi/application.c b/libspi/application.c
index 0667885..1d10074 100644 (file)
--- a/libspi/application.c
+++ b/libspi/application.c
@@ -254,7 +254,7 @@ spi_application_init (SpiApplication *application)
 
 BONOBO_TYPE_FUNC_FULL (SpiApplication,
                       Accessibility_Application,
-                      PARENT_TYPE, spi_application);
+                      PARENT_TYPE, spi_application)
 
 SpiApplication *
 spi_application_new (AtkObject *app_root)

diff --git a/libspi/base.c b/libspi/base.c
index 577a385..891f1e3 100644 (file)
--- a/libspi/base.c
+++ b/libspi/base.c
@@ -66,7 +66,7 @@ spi_base_init (SpiBase *object)
        object->gobj = NULL;
 }
 
-BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base);
+BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base)
 
 void
 spi_base_construct (SpiBase *object, GObject *gobject)

diff --git a/libspi/component.c b/libspi/component.c
index ee886b1..2f3c995 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -225,7 +225,7 @@ spi_component_init (SpiComponent *component)
 BONOBO_TYPE_FUNC_FULL (SpiComponent,
                       Accessibility_Component,
                       PARENT_TYPE,
-                      spi_component);
+                      spi_component)
 
 SpiComponent *
 spi_component_interface_new (AtkObject *o)

diff --git a/libspi/devicelistener.c b/libspi/devicelistener.c
index cdafb85..526cb4d 100644 (file)
--- a/libspi/devicelistener.c
+++ b/libspi/devicelistener.c
@@ -135,7 +135,7 @@ spi_device_listener_init (SpiDeviceListener *device_listener)
 BONOBO_TYPE_FUNC_FULL (SpiDeviceListener,
                       Accessibility_DeviceEventListener,
                       BONOBO_TYPE_OBJECT,
-                      spi_device_listener);
+                      spi_device_listener)
 
 SpiDeviceListener *
 spi_device_listener_new (void)

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index 2d1c03e..d63b3c6 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -69,7 +69,7 @@ impl_pasteText (PortableServer_Servant servant,
 BONOBO_TYPE_FUNC_FULL (SpiEditableText,
                       Accessibility_EditableText,
                       SPI_TEXT_TYPE,
-                      spi_editable_text);
+                      spi_editable_text)
 
 static void
 spi_editable_text_class_init (SpiEditableTextClass *klass)

diff --git a/libspi/eventlistener.c b/libspi/eventlistener.c
index 0d3d6a9..570f44d 100644 (file)
--- a/libspi/eventlistener.c
+++ b/libspi/eventlistener.c
@@ -78,7 +78,7 @@ spi_event_listener_init (SpiEventListener *listener)
 
 BONOBO_TYPE_FUNC (SpiEventListener,
                  PARENT_TYPE,
-                 spi_event_listener);
+                 spi_event_listener)
 
 SpiEventListener *
 spi_event_listener_new ()

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index b28a589..e123a84 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -58,7 +58,7 @@ impl_isValid (PortableServer_Servant _servant,
 BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
                       Accessibility_Hyperlink,
                       SPI_TYPE_BASE,
-                      spi_hyperlink);
+                      spi_hyperlink)
 
 
 static void

diff --git a/libspi/hypertext.c b/libspi/hypertext.c
index 7c5aae7..65d96d0 100644 (file)
--- a/libspi/hypertext.c
+++ b/libspi/hypertext.c
@@ -121,4 +121,4 @@ spi_hypertext_init (SpiHypertext *hypertext)
 BONOBO_TYPE_FUNC_FULL (SpiHypertext,
                       Accessibility_Hypertext,
                       PARENT_TYPE,
-                      spi_hypertext);
+                      spi_hypertext)

diff --git a/libspi/image.c b/libspi/image.c
index ca714cd..b6cb5a2 100644 (file)
--- a/libspi/image.c
+++ b/libspi/image.c
@@ -150,4 +150,4 @@ spi_image_init (SpiImage *image)
 BONOBO_TYPE_FUNC_FULL (SpiImage,
                       Accessibility_Image,
                       SPI_TYPE_BASE,
-                      spi_image);
+                      spi_image)

diff --git a/libspi/listener.c b/libspi/listener.c
index eb418f0..c969483 100644 (file)
--- a/libspi/listener.c
+++ b/libspi/listener.c
@@ -101,7 +101,7 @@ spi_listener_init (SpiListener *listener)
 BONOBO_TYPE_FUNC_FULL (SpiListener,
                       Accessibility_EventListener,
                       PARENT_TYPE,
-                      spi_listener);
+                      spi_listener)
 
 SpiListener *
 spi_listener_new (void)

diff --git a/libspi/relation.c b/libspi/relation.c
index 5595810..9da206d 100644 (file)
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -35,7 +35,7 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   gint i;
 
   for (i = 0; i < ATK_RELATION_LAST_DEFINED; i++)
-    types[i] = ATK_RELATION_NULL;
+    types[i] = Accessibility_RELATION_NULL;
 
   types[ATK_RELATION_CONTROLLED_BY] = Accessibility_RELATION_CONTROLLED_BY;
   types[ATK_RELATION_CONTROLLER_FOR] = Accessibility_RELATION_CONTROLLER_FOR;
@@ -158,4 +158,4 @@ spi_relation_init (SpiRelation *relation)
 BONOBO_TYPE_FUNC_FULL (SpiRelation,
                       Accessibility_Relation,
                       SPI_TYPE_BASE,
-                      spi_relation);
+                      spi_relation)

diff --git a/libspi/selection.c b/libspi/selection.c
index 0fc3de5..64deabc 100644 (file)
--- a/libspi/selection.c
+++ b/libspi/selection.c
@@ -181,4 +181,4 @@ spi_selection_init (SpiSelection *selection)
 BONOBO_TYPE_FUNC_FULL (SpiSelection,
                       Accessibility_Selection,
                       SPI_TYPE_BASE,
-                      spi_selection);
+                      spi_selection)

diff --git a/libspi/stateset.c b/libspi/stateset.c
index 69f68b2..491881d 100644 (file)
--- a/libspi/stateset.c
+++ b/libspi/stateset.c
@@ -393,4 +393,4 @@ spi_state_set_init (SpiStateSet *set)
 BONOBO_TYPE_FUNC_FULL (SpiStateSet,
                       Accessibility_StateSet,
                       SPI_TYPE_BASE,
-                      spi_state_set);
+                      spi_state_set)

diff --git a/libspi/table.c b/libspi/table.c
index 0efb135..75d3cec 100644 (file)
--- a/libspi/table.c
+++ b/libspi/table.c
@@ -462,4 +462,4 @@ spi_table_init (SpiTable *table)
 BONOBO_TYPE_FUNC_FULL (SpiTable,
                       Accessibility_Table,
                       SPI_TYPE_BASE,
-                      spi_table);
+                      spi_table)

diff --git a/libspi/text.c b/libspi/text.c
index c2fb75a..1ed2e7b 100644 (file)
--- a/libspi/text.c
+++ b/libspi/text.c
@@ -649,7 +649,7 @@ spi_text_init (SpiText *text)
 BONOBO_TYPE_FUNC_FULL (SpiText,
                       Accessibility_Text,
                       PARENT_TYPE,
-                      spi_text);
+                      spi_text)
 
 void
 spi_text_construct (SpiText *text, AtkObject *obj)

diff --git a/libspi/value.c b/libspi/value.c
index 412beeb..520b397 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -57,7 +57,7 @@ impl__set_currentValue (PortableServer_Servant _servant,
 BONOBO_TYPE_FUNC_FULL (SpiValue,
                       Accessibility_Value,
                       PARENT_TYPE,
-                      spi_value);
+                      spi_value)
 
 
 static void

diff --git a/registryd/desktop.c b/registryd/desktop.c
index 4d278dc..2d1af63 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -245,7 +245,7 @@ spi_desktop_class_init (SpiDesktopClass *klass)
 BONOBO_TYPE_FUNC_FULL (SpiDesktop,
                       Accessibility_Desktop,
                       PARENT_TYPE,
-                      spi_desktop);
+                      spi_desktop)
 
 SpiDesktop *
 spi_desktop_new (void)

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 4b6d508..7e84ebc 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1263,11 +1263,11 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event)
   key_event.hw_code = (CORBA_short) x_key_event->keycode;
   if (((XEvent *) x_key_event)->type == KeyPress)
     {
-      key_event.type = Accessibility_KEY_PRESSED;
+      key_event.type = Accessibility_KEY_PRESSED_EVENT;
     }
   else
     {
-      key_event.type = Accessibility_KEY_RELEASED;
+      key_event.type = Accessibility_KEY_RELEASED_EVENT;
     } 
   key_event.modifiers = (CORBA_unsigned_short)(x_key_event->state);
   key_event.is_text = CORBA_FALSE;
@@ -2076,4 +2076,4 @@ spi_device_event_controller_new (SpiRegistry *registry)
 BONOBO_TYPE_FUNC_FULL (SpiDEController,
                       Accessibility_DeviceEventController,
                       PARENT_TYPE,
-                      spi_device_event_controller);
+                      spi_device_event_controller)

diff --git a/registryd/registry.c b/registryd/registry.c
index 68380dc..44ca550 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -704,7 +704,7 @@ spi_registry_init (SpiRegistry *registry)
 BONOBO_TYPE_FUNC_FULL (SpiRegistry,
                       Accessibility_Registry,
                       PARENT_TYPE,
-                      spi_registry);
+                      spi_registry)
 
 SpiRegistry *
 spi_registry_new (void)

diff --git a/test/key-listener-test.c b/test/key-listener-test.c
index fc59fc0..254a751 100644 (file)
--- a/test/key-listener-test.c
+++ b/test/key-listener-test.c
@@ -195,7 +195,7 @@ report_tab_key_event (const AccessibleKeystroke *key, void *user_data)
 static SPIBoolean
 report_all_key_event (const AccessibleKeystroke *key, void *user_data)
 {
-  g_print("(%d)", key->keyID);
+  fprintf(stdout, "(%d)", key->keyID);
   return FALSE;
 }
 

diff --git a/test/screen-review-test.c b/test/screen-review-test.c
index d92fd4f..bfe037c 100644 (file)
--- a/test/screen-review-test.c
+++ b/test/screen-review-test.c
@@ -21,6 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <strings.h>
 #include <stdlib.h>
 #include "../cspi/spi-private.h"
 

diff --git a/test/simple-at.c b/test/simple-at.c
index 9f1327b..a23b79e 100644 (file)
--- a/test/simple-at.c
+++ b/test/simple-at.c
@@ -21,6 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <strings.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>

diff --git a/test/stress-test.c b/test/stress-test.c
index 864b210..a30dd40 100644 (file)
--- a/test/stress-test.c
+++ b/test/stress-test.c
@@ -21,6 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <unistd.h>
 #include <stdlib.h>
 #include "../cspi/spi-private.h" /* A hack for now */
 #include <glib-object.h>
@@ -28,6 +29,7 @@
 #include <atk/atk.h>
 #include <atk/atknoopobject.h>
 #include <bonobo-activation/bonobo-activation-register.h>
+#include <bonobo/bonobo-main.h>
 #include <libspi.h>
 
 int