applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't spawn esd, already done by libesound.

Browse source 
2006-03-02  Rodrigo Moya <rodrigo@novell.com>

	* gnome-settings-sound.c (start_esd): don't spawn esd, already done
	by libesound.
This commit is contained in:
Rodrigo Moya 2006-03-03 10:07:11 +00:00 • committed by Rodrigo Moya
parent b91c72111f
commit 02219366c6
2 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,8 @@
2006-03-02 Rodrigo Moya <rodrigo@novell.com>
* gnome-settings-sound.c (start_esd): don't spawn esd, already done
by libesound.
2006-02-15 Jens Granseuer <jensgr@gmx.net> 2006-02-15 Jens Granseuer <jensgr@gmx.net>
Fixes #331168 Fixes #331168

26
gnome-settings-daemon/gnome-settings-sound.c
View file

@ -50,33 +50,9 @@
static void static void
start_esd (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); gnome_sound_init (NULL);
if (gnome_sound_connection_get () < 0) if (gnome_sound_connection_get () < 0)
{ g_warning ("Could not connect to the ESD daemon\n");
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);
}
}
} }
static gboolean set_standby = TRUE; static gboolean set_standby = TRUE;