diff -crN ./gnome-speech/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/configure.in
*** ./gnome-speech/configure.in	Mon Aug 25 23:34:16 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/configure.in	Mon Nov  3 16:37:22 2003
***************
*** 102,110 ****
  
  # Check to see if we should build the Viavoice driver
  
! AC_CHECK_LIB(ibmeci50, eciNew, viavoice_LIBS=-libmeci50)
  AC_SUBST(viavoice_LIBS)
! AM_CONDITIONAL(BUILD_VIAVOICE_DRIVER, test "x$viavoice_LIBS" = "x-libmeci50")
  
  # Check to see if we should build the Dectalk driver
  AC_ARG_WITH(dectalk_dir, {   --with-dectalk-dir=PATH	Specify path to DECTalk})
--- 102,110 ----
  
  # Check to see if we should build the Viavoice driver
  
! AC_CHECK_LIB(ibmeci, eciNew, viavoice_LIBS=-libmeci)
  AC_SUBST(viavoice_LIBS)
! AM_CONDITIONAL(BUILD_VIAVOICE_DRIVER, test x$viavoice_LIBS = x-libmeci)
  
  # Check to see if we should build the Dectalk driver
  AC_ARG_WITH(dectalk_dir, {   --with-dectalk-dir=PATH	Specify path to DECTalk})
diff -crN ./gnome-speech/drivers/viavoice/viavoicespeaker.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicespeaker.c
*** ./gnome-speech/drivers/viavoice/viavoicespeaker.c	Mon Aug 11 22:40:30 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicespeaker.c	Mon Nov  3 16:38:18 2003
***************
*** 46,52 ****
  static void
  viavoice_add_parameter (ECIHand handle,
  			ViavoiceSpeaker *viavoice_speaker,
! 			ECIVoiceParam param,
  			const gchar *parameter_name,
  			gdouble min,
  			gdouble max,
--- 46,52 ----
  static void
  viavoice_add_parameter (ECIHand handle,
  			ViavoiceSpeaker *viavoice_speaker,
! 			enum ECIVoiceParam param,
  			const gchar *parameter_name,
  			gdouble min,
  			gdouble max,
diff -crN ./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.c
*** ./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.c	Thu Aug 14 05:59:36 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.c	Mon Nov  3 16:38:55 2003
***************
*** 54,61 ****
  static void
  index_queue_entry_destroy (index_queue_entry *e)
  {
- 	g_return_if_fail (e);
  	CORBA_Environment ev;
  	CORBA_exception_init (&ev);
  	CORBA_Object_release (e->cb, &ev);
  	CORBA_exception_free (&ev);
--- 54,61 ----
  static void
  index_queue_entry_destroy (index_queue_entry *e)
  {
  	CORBA_Environment ev;
+ 	g_return_if_fail (e);
  	CORBA_exception_init (&ev);
  	CORBA_Object_release (e->cb, &ev);
  	CORBA_exception_free (&ev);
***************
*** 96,104 ****
  
  
  
! static ECICallbackReturn
  viavoice_synthesis_driver_index_callback (ECIHand handle,
! 			   ECIMessage msg,
  			   long param,
  			   void *data)
  {
--- 96,104 ----
  
  
  
! static enum ECICallbackReturn
  viavoice_synthesis_driver_index_callback (ECIHand handle,
! 			   enum ECIMessage msg,
  			   long param,
  			   void *data)
  {
***************
*** 566,572 ****
  
  void
  viavoice_synthesis_driver_set_voice_param (const ViavoiceSynthesisDriver *d,
! 					   ECIVoiceParam param,
  					   gint new_value)
  {
  	eciSetVoiceParam (d->handle, 0, param, new_value);
--- 566,572 ----
  
  void
  viavoice_synthesis_driver_set_voice_param (const ViavoiceSynthesisDriver *d,
! 					   enum ECIVoiceParam param,
  					   gint new_value)
  {
  	eciSetVoiceParam (d->handle, 0, param, new_value);
diff -crN ./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.h
*** ./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.h	Tue Jul 29 23:43:41 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/drivers/viavoice/viavoicesynthesisdriver.h	Mon Nov  3 16:39:31 2003
***************
*** 74,80 ****
  viavoice_synthesis_driver_is_speaking (ViavoiceSynthesisDriver *d);
  void
  viavoice_synthesis_driver_set_voice_param (const ViavoiceSynthesisDriver *d,
! 					   ECIVoiceParam param,
  					   gint new_value);
  gboolean
  viavoice_synthesis_driver_set_voice (const ViavoiceSynthesisDriver *d,
--- 74,80 ----
  viavoice_synthesis_driver_is_speaking (ViavoiceSynthesisDriver *d);
  void
  viavoice_synthesis_driver_set_voice_param (const ViavoiceSynthesisDriver *d,
! 					   enum ECIVoiceParam param,
  					   gint new_value);
  gboolean
  viavoice_synthesis_driver_set_voice (const ViavoiceSynthesisDriver *d,
diff -crN ./gnome-speech/gnome-speech/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/gnome-speech/Makefile.am
*** ./gnome-speech/gnome-speech/Makefile.am	Wed Aug 13 22:21:07 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/gnome-speech/Makefile.am	Mon Nov  3 16:55:40 2003
***************
*** 5,11 ****
  	-I$(top_builddir)        \
  	$(gnome_speech_CFLAGS)
  
! LDFLAGS = $(gnome_speech_LIBS) @LT_VERSION_INFO@
  
  IDL_OUT = \
  	GNOME_Speech.h \
--- 5,11 ----
  	-I$(top_builddir)        \
  	$(gnome_speech_CFLAGS)
  
! LDFLAGS = $(gnome_speech_LIBS) @LDFLAGS@ @LT_VERSION_INFO@
  
  IDL_OUT = \
  	GNOME_Speech.h \
diff -crN ./gnome-speech/gnome-speech/speaker.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/gnome-speech/speaker.c
*** ./gnome-speech/gnome-speech/speaker.c	Mon Aug 11 22:17:08 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-speech/gnome-speech/speaker.c	Mon Feb 23 18:10:17 2004
***************
*** 248,255 ****
  
  	/* Unref the callback */
  
! 	if (s->cb != CORBA_OBJECT_NIL)
! 		bonobo_object_release_unref (s->cb, NULL);
  
  	/* Destroy all the parameters */
  
--- 248,255 ----
  
  	/* Unref the callback */
  
! /*	if (s->cb != CORBA_OBJECT_NIL)
! 		bonobo_object_release_unref (s->cb, NULL);*/
  
  	/* Destroy all the parameters */