From 02219366c60b833fbc32136f29be6eee0b1699fc Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 3 Mar 2006 10:07:11 +0000 Subject: [PATCH] don't spawn esd, already done by libesound. 2006-03-02 Rodrigo Moya * gnome-settings-sound.c (start_esd): don't spawn esd, already done by libesound. --- gnome-settings-daemon/ChangeLog | 5 ++++ gnome-settings-daemon/gnome-settings-sound.c | 26 +------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 0aaa9c976..1e1420678 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,8 @@ +2006-03-02 Rodrigo Moya + + * gnome-settings-sound.c (start_esd): don't spawn esd, already done + by libesound. + 2006-02-15 Jens Granseuer Fixes #331168 diff --git a/gnome-settings-daemon/gnome-settings-sound.c b/gnome-settings-daemon/gnome-settings-sound.c index abc59d018..d037dc7f3 100644 --- a/gnome-settings-daemon/gnome-settings-sound.c +++ b/gnome-settings-daemon/gnome-settings-sound.c @@ -50,33 +50,9 @@ static void start_esd (void) { - int esdpid; - static const char *esd_cmdline[] = {ESD_SERVER, "-nobeeps", NULL}; - char *tmpargv[3]; - char argbuf[32]; - time_t starttime; - gnome_sound_init (NULL); if (gnome_sound_connection_get () < 0) - { - GnomeClient *client = gnome_master_client (); - - esdpid = gnome_execute_async (NULL, 2, (char **)esd_cmdline); - g_snprintf (argbuf, sizeof (argbuf), "%d", esdpid); - tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL; - gnome_client_set_shutdown_command (client, 2, tmpargv); - starttime = time (NULL); - gnome_sound_init (NULL); - - while (gnome_sound_connection_get () < 0 - && ((time(NULL) - starttime) < 4)) - { -#ifdef HAVE_USLEEP - usleep(1000); -#endif - gnome_sound_init(NULL); - } - } + g_warning ("Could not connect to the ESD daemon\n"); } static gboolean set_standby = TRUE;