? stamp-h1
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomeui/ChangeLog,v
retrieving revision 1.171
diff -u -r1.171 ChangeLog
--- ChangeLog	13 May 2002 20:18:39 -0000	1.171
+++ ChangeLog	14 May 2002 17:47:58 -0000
@@ -1,3 +1,8 @@
+2002-05-14  Jorn Baayen  <jorn@nl.linux.org>
+
+	* configure.in:
+	* libgnomeui/gnome-ui-init.c: remove esd stuff
+
 2002-05-13  Anders Carlsson  <andersca@gnu.org>
 
 	* configure.in: Release 1.117.0
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeui/configure.in,v
retrieving revision 1.94
diff -u -r1.94 configure.in
--- configure.in	13 May 2002 20:18:39 -0000	1.94
+++ configure.in	14 May 2002 17:47:58 -0000
@@ -54,20 +54,7 @@
 dnl Start of pkg-config checks
 dnl
 
-dnl We first check for esound and audiofile (which has conditional
-dnl support built in)
-dnl
-AUDIOFILE_MODULE="audiofile >= 0.2.3"
-ESOUND_MODULE="esound >= 0.2.25"
-PKG_CHECK_MODULES(SOUND_TEST, $ESOUND_MODULE $AUDIOFILE_MODULE, [
-	AC_DEFINE(HAVE_LIBAUDIOFILE)
-	AC_DEFINE(HAVE_ESD)
-],[
-	AUDIOFILE_MODULE=""
-	ESOUND_MODULE=""
-])
-
-GNOMEUI_MODULES="libgnome-2.0 >= 1.116.0 libgnomecanvas-2.0 >= 1.116.0 libbonoboui-2.0 >= 1.116.0 gconf-2.0 >= 1.1.10"
+GNOMEUI_MODULES="libgnome-2.0 >= 1.116.0 libgnomecanvas-2.0 >= 1.116.0 libbonoboui-2.0 >= 1.116.0 gconf-2.0 >= 1.1.10 monkey-media >= 0.5.0"
 PKG_CHECK_MODULES(LIBGNOMEUI, $GNOMEUI_MODULES)
 AC_SUBST(LIBGNOMEUI_CFLAGS)
 AC_SUBST(LIBGNOMEUI_LIBS)
Index: libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.178
diff -u -r1.178 gnome-ui-init.c
--- libgnomeui/gnome-ui-init.c	14 Mar 2002 00:23:01 -0000	1.178
+++ libgnomeui/gnome-ui-init.c	14 May 2002 17:47:59 -0000
@@ -276,7 +276,6 @@
                 libgnomeui_segv_setup (app, FALSE);
 }
 
-#ifdef HAVE_ESD
 static gboolean
 relay_gtk_signal(GSignalInvocationHint *hint,
 		 guint n_param_values,
@@ -307,19 +306,14 @@
 
   return TRUE;
 }
-#endif
 
 static void
 initialize_gtk_signal_relay (void)
 {
-#ifdef HAVE_ESD
 	gpointer iter_signames;
 	char *signame;
 	char *ctmp, *ctmp2;
 	
-	if (gnome_sound_connection_get () < 0)
-		return;
-	
 	if (!gnome_config_get_bool ("/sound/system/settings/event_sounds=true"))
 		return;
 	
@@ -381,7 +375,6 @@
                         g_free(signame);
 	}
 	gnome_config_pop_prefix ();
-#endif
 }
 
 static void
