gnome-settings-daemon r227 - in trunk: . plugins/sound

[jensg svn gnome org]

Author: jensg
Date: Mon Mar 24 17:17:45 2008
New Revision: 227
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=227&view=rev

Log:
2008-03-24  Jens Granseuer  <jensgr gmx net>

	Patch by: Alexey Shabalin <a shabalin gmail com>

	* plugins/sound/gsd-sound-manager.c: (apply_settings): now that
	"starting esd" can mean either esd or PulseAudio, check the GConf
	setting for starting the sound server even when esd is disabled
	(bug #523743)


Modified:
   trunk/ChangeLog
   trunk/plugins/sound/gsd-sound-manager.c

Modified: trunk/plugins/sound/gsd-sound-manager.c
==============================================================================
--- trunk/plugins/sound/gsd-sound-manager.c	(original)
+++ trunk/plugins/sound/gsd-sound-manager.c	Mon Mar 24 17:17:45 2008
@@ -273,11 +273,7 @@
 
         client = gconf_client_get_default ();
 
-#ifdef HAVE_ESD
         enable_sound = gconf_client_get_bool (client, "/desktop/gnome/sound/enable_esd", NULL);
-#else
-        enable_sound = TRUE;
-#endif
         event_sounds = gconf_client_get_bool (client, "/desktop/gnome/sound/event_sounds", NULL);
         /* FIXME this is completely bogus, the entry doesn't exist */
         event_changed_new = gconf_client_get_int  (client, "/desktop/gnome/sound/event_changed", NULL);