|
 |
3b1e856 |
Index: capplets/sound/sound-properties-capplet.c
|
|
|
3b1e856 |
===================================================================
|
|
|
3b1e856 |
--- capplets/sound/sound-properties-capplet.c (revision 8231)
|
|
|
3b1e856 |
+++ capplets/sound/sound-properties-capplet.c (working copy)
|
|
|
3b1e856 |
@@ -953,11 +953,7 @@
|
|
|
3b1e856 |
WID ("chat_audio_capture_test"),
|
|
|
3b1e856 |
"gconfaudiosrc" AUDIO_TEST_IN_BETWEEN "gconfaudiosink profile=chat");
|
|
|
3b1e856 |
|
|
|
3b1e856 |
-#ifdef HAVE_ESD
|
|
|
3b1e856 |
- peditor = gconf_peditor_new_boolean (NULL, ENABLE_ESD_KEY, WID ("enable_toggle"), NULL);
|
|
|
3b1e856 |
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_toggle"));
|
|
|
3b1e856 |
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_vbox"));
|
|
|
3b1e856 |
-#else
|
|
|
3b1e856 |
+#ifndef HAVE_ESD
|
|
|
3b1e856 |
gtk_widget_hide (WID ("enable_toggle"));
|
|
|
3b1e856 |
#endif
|
|
|
3b1e856 |
gconf_peditor_new_boolean (NULL, EVENT_SOUNDS_KEY, WID ("events_toggle"), NULL);
|
|
|
3b1e856 |
@@ -994,7 +990,7 @@
|
|
|
3b1e856 |
gboolean val_bool, def;
|
|
|
3b1e856 |
|
|
|
3b1e856 |
client = gconf_client_get_default ();
|
|
|
3b1e856 |
- COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/enable_esd", "/sound/system/settings/start_esd=false");
|
|
|
3b1e856 |
+ COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/enable_esd", "/sound/system/settings/start_esd=true");
|
|
|
3b1e856 |
COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/event_sounds", "/sound/system/settings/event_sounds=false");
|
|
|
3b1e856 |
g_object_unref (G_OBJECT (client));
|
|
|
3b1e856 |
}
|
|
|
3b1e856 |
Index: capplets/sound/sound-properties.glade
|
|
|
3b1e856 |
===================================================================
|
|
|
3b1e856 |
--- capplets/sound/sound-properties.glade (revision 8231)
|
|
|
3b1e856 |
+++ capplets/sound/sound-properties.glade (working copy)
|
|
|
3b1e856 |
@@ -92,7 +92,7 @@
|
|
|
3b1e856 |
<property name="visible">True</property>
|
|
|
3b1e856 |
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
|
|
|
3b1e856 |
<property name="fraction">0</property>
|
|
|
3b1e856 |
- <property name="pulse_step">0.05</property>
|
|
|
3b1e856 |
+ <property name="pulse_step">0.0500000007451</property>
|
|
|
3b1e856 |
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
|
|
3b1e856 |
</widget>
|
|
|
3b1e856 |
<packing>
|
|
|
3b1e856 |
@@ -321,10 +321,10 @@
|
|
|
3b1e856 |
<widget class="GtkButton" id="sounds_playback_test">
|
|
|
3b1e856 |
<property name="visible">True</property>
|
|
|
3b1e856 |
<property name="can_focus">True</property>
|
|
|
3b1e856 |
+ <property name="label" translatable="yes">Test</property>
|
|
|
3b1e856 |
+ <property name="use_underline">True</property>
|
|
|
3b1e856 |
<property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
<property name="focus_on_click">True</property>
|
|
|
3b1e856 |
- <property name="label" translatable="yes">Test</property>
|
|
|
3b1e856 |
- <property name="use_underline">True</property>
|
|
|
3b1e856 |
</widget>
|
|
|
3b1e856 |
<packing>
|
|
|
3b1e856 |
<property name="padding">0</property>
|
|
|
3b1e856 |
@@ -460,10 +460,10 @@
|
|
|
3b1e856 |
<widget class="GtkButton" id="music_playback_test">
|
|
|
3b1e856 |
<property name="visible">True</property>
|
|
|
3b1e856 |
<property name="can_focus">True</property>
|
|
|
3b1e856 |
- <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
- <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
<property name="label" translatable="yes">Test</property>
|
|
|
3b1e856 |
<property name="use_underline">True</property>
|
|
|
3b1e856 |
+ <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
+ <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
</widget>
|
|
|
3b1e856 |
<packing>
|
|
|
3b1e856 |
<property name="padding">0</property>
|
|
|
3b1e856 |
@@ -605,10 +605,10 @@
|
|
|
3b1e856 |
<widget class="GtkButton" id="chat_audio_playback_test">
|
|
|
3b1e856 |
<property name="visible">True</property>
|
|
|
3b1e856 |
<property name="can_focus">True</property>
|
|
|
3b1e856 |
- <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
- <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
<property name="label" translatable="yes">Test</property>
|
|
|
3b1e856 |
<property name="use_underline">True</property>
|
|
|
3b1e856 |
+ <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
+ <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
</widget>
|
|
|
3b1e856 |
<packing>
|
|
|
3b1e856 |
<property name="padding">0</property>
|
|
|
3b1e856 |
@@ -692,10 +692,10 @@
|
|
|
3b1e856 |
<widget class="GtkButton" id="chat_audio_capture_test">
|
|
|
3b1e856 |
<property name="visible">True</property>
|
|
|
3b1e856 |
<property name="can_focus">True</property>
|
|
|
3b1e856 |
- <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
- <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
<property name="label" translatable="yes">Test</property>
|
|
|
3b1e856 |
<property name="use_underline">True</property>
|
|
|
3b1e856 |
+ <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
+ <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
</widget>
|
|
|
3b1e856 |
<packing>
|
|
|
3b1e856 |
<property name="padding">0</property>
|
|
|
3b1e856 |
@@ -947,23 +947,7 @@
|
|
|
3b1e856 |
<property name="spacing">6</property>
|
|
|
3b1e856 |
|
|
|
3b1e856 |
<child>
|
|
|
3b1e856 |
- <widget class="GtkCheckButton" id="enable_toggle">
|
|
|
3b1e856 |
- <property name="visible">True</property>
|
|
|
3b1e856 |
- <property name="can_focus">True</property>
|
|
|
3b1e856 |
- <property name="label" translatable="yes">E_nable software sound mixing (ESD)</property>
|
|
|
3b1e856 |
- <property name="use_underline">True</property>
|
|
|
3b1e856 |
- <property name="relief">GTK_RELIEF_NORMAL</property>
|
|
|
3b1e856 |
- <property name="focus_on_click">True</property>
|
|
|
3b1e856 |
- <property name="active">False</property>
|
|
|
3b1e856 |
- <property name="inconsistent">False</property>
|
|
|
3b1e856 |
- <property name="draw_indicator">True</property>
|
|
|
3b1e856 |
- <signal name="toggled" handler="enable_toggled_cb"/>
|
|
|
3b1e856 |
- </widget>
|
|
|
3b1e856 |
- <packing>
|
|
|
3b1e856 |
- <property name="padding">0</property>
|
|
|
3b1e856 |
- <property name="expand">False</property>
|
|
|
3b1e856 |
- <property name="fill">False</property>
|
|
|
3b1e856 |
- </packing>
|
|
|
3b1e856 |
+ <placeholder/>
|
|
|
3b1e856 |
</child>
|
|
|
3b1e856 |
|
|
|
3b1e856 |
<child>
|