Index: capplets/sound/sound-properties-capplet.c
===================================================================
--- capplets/sound/sound-properties-capplet.c (revision 8231)
+++ capplets/sound/sound-properties-capplet.c (working copy)
@@ -953,11 +953,7 @@
WID ("chat_audio_capture_test"),
"gconfaudiosrc" AUDIO_TEST_IN_BETWEEN "gconfaudiosink profile=chat");
-#ifdef HAVE_ESD
- peditor = gconf_peditor_new_boolean (NULL, ENABLE_ESD_KEY, WID ("enable_toggle"), NULL);
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_toggle"));
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_vbox"));
-#else
+#ifndef HAVE_ESD
gtk_widget_hide (WID ("enable_toggle"));
#endif
gconf_peditor_new_boolean (NULL, EVENT_SOUNDS_KEY, WID ("events_toggle"), NULL);
@@ -994,7 +990,7 @@
gboolean val_bool, def;
client = gconf_client_get_default ();
- COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/enable_esd", "/sound/system/settings/start_esd=false");
+ COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/enable_esd", "/sound/system/settings/start_esd=true");
COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/event_sounds", "/sound/system/settings/event_sounds=false");
g_object_unref (G_OBJECT (client));
}
Index: capplets/sound/sound-properties.glade
===================================================================
--- capplets/sound/sound-properties.glade (revision 8231)
+++ capplets/sound/sound-properties.glade (working copy)
@@ -92,7 +92,7 @@
True
GTK_PROGRESS_LEFT_TO_RIGHT
0
- 0.05
+ 0.0500000007451
PANGO_ELLIPSIZE_NONE
@@ -321,10 +321,10 @@
True
True
+ Test
+ True
GTK_RELIEF_NORMAL
True
- Test
- True
0
@@ -460,10 +460,10 @@
True
True
- GTK_RELIEF_NORMAL
- True
Test
True
+ GTK_RELIEF_NORMAL
+ True
0
@@ -605,10 +605,10 @@
True
True
- GTK_RELIEF_NORMAL
- True
Test
True
+ GTK_RELIEF_NORMAL
+ True
0
@@ -692,10 +692,10 @@
True
True
- GTK_RELIEF_NORMAL
- True
Test
True
+ GTK_RELIEF_NORMAL
+ True
0
@@ -947,23 +947,7 @@
6
-
- True
- True
- E_nable software sound mixing (ESD)
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
-
- 0
- False
- False
-
+