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

Initialize libgnomeui, and load sounds.

Browse source 
2002-01-08  Richard Hestilow  <hestilow@ximian.com>

	* gnome-settings-daemon.c (main): Initialize libgnomeui,
	and load sounds.

	* gnome-settings-sound.c (stop_esd): Just tell esd to let go
	of /dev/dsp.
This commit is contained in:
Richard Hestilow 2002-01-08 14:54:35 +00:00 • committed by Rachel Hestilow
parent 7100bcf73f
commit 93763d7ddb
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,11 @@
2002-01-08 Richard Hestilow <hestilow@ximian.com>
* gnome-settings-daemon.c (main): Initialize libgnomeui,
and load sounds.
* gnome-settings-sound.c (stop_esd): Just tell esd to let go
of /dev/dsp.
2002-01-04 Bradford Hovinen <hovinen@ximian.com> 2002-01-04 Bradford Hovinen <hovinen@ximian.com>
* all: Convert from GConfEngine to GConfClient * all: Convert from GConfEngine to GConfClient

8
gnome-settings-daemon/gnome-settings-daemon.c
View file

@ -28,7 +28,9 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gconf/gconf.h> #include <gconf/gconf.h>
#include <libgnome/gnome-init.h>
#include <libgnomeui/gnome-ui-init.h>
#include <config.h>
#include "xsettings-manager.h" #include "xsettings-manager.h"
#include "gnome-settings-daemon.h" #include "gnome-settings-daemon.h"
@ -133,7 +135,8 @@ main (int argc, char **argv)
gboolean terminated = FALSE; gboolean terminated = FALSE;
GConfClient *client; GConfClient *client;
GSList *list; GSList *list;
gtk_init (&argc, &argv); gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE,
argc, argv, NULL);
if (xsettings_manager_check_running (gdk_display, DefaultScreen (gdk_display))) if (xsettings_manager_check_running (gdk_display, DefaultScreen (gdk_display)))
{ {
@ -188,6 +191,7 @@ main (int argc, char **argv)
gnome_settings_xsettings_load (client); gnome_settings_xsettings_load (client);
gnome_settings_mouse_load (client); gnome_settings_mouse_load (client);
gnome_settings_sound_load (client);
if (!terminated) if (!terminated)
gtk_main (); gtk_main ();

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

@ -52,6 +52,7 @@ start_esd (void)
time_t starttime; time_t starttime;
GnomeClient *client = gnome_master_client (); GnomeClient *client = gnome_master_client ();
g_print ("Starting esd\n");
esdpid = gnome_execute_async (NULL, 2, (char **)esd_cmdline); esdpid = gnome_execute_async (NULL, 2, (char **)esd_cmdline);
g_snprintf (argbuf, sizeof (argbuf), "%d", esdpid); g_snprintf (argbuf, sizeof (argbuf), "%d", esdpid);
tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL; tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL;
@ -76,6 +77,9 @@ start_esd (void)
static void static void
stop_esd (void) stop_esd (void)
{ {
g_print ("Stopping esd\n");
/* Can't think of a way to do this reliably, so we fake it for now */
esd_standby (gnome_sound_connection_get ());
} }
/* reload_foreach_cb /* reload_foreach_cb
@ -148,6 +152,7 @@ apply_settings (void)
if (!inited || event_changed_old != event_changed_new) if (!inited || event_changed_old != event_changed_new)
{ {
SoundProperties *props; SoundProperties *props;
g_print ("Reloading events\n");
inited = TRUE; inited = TRUE;
event_changed_old = event_changed_new; event_changed_old = event_changed_new;