rpms/control-center/devel control-center-2.20.0-enable-sound-by-default.patch, NONE, 1.1 control-center.spec, 1.311, 1.312

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30334

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.20.0-enable-sound-by-default.patch 
Log Message:
* Tue Oct 30 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-7
- Remove useless "start esd" preference


control-center-2.20.0-enable-sound-by-default.patch:

--- NEW FILE control-center-2.20.0-enable-sound-by-default.patch ---
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 @@
 	      <property name="visible">True</property>
 	      <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
 	      <property name="fraction">0</property>
-	      <property name="pulse_step">0.05</property>
+	      <property name="pulse_step">0.0500000007451</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	    </widget>
 	    <packing>
@@ -321,10 +321,10 @@
 				<widget class="GtkButton" id="sounds_playback_test">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Test</property>
+				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-			 	  <property name="label" translatable="yes">Test</property>
-				  <property name="use_underline">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -460,10 +460,10 @@
 				<widget class="GtkButton" id="music_playback_test">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
 				  <property name="label" translatable="yes">Test</property>
 				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -605,10 +605,10 @@
 				    <widget class="GtkButton" id="chat_audio_playback_test">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
 				      <property name="label" translatable="yes">Test</property>
 				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -692,10 +692,10 @@
 				    <widget class="GtkButton" id="chat_audio_capture_test">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
 				      <property name="label" translatable="yes">Test</property>
 				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -947,23 +947,7 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkCheckButton" id="enable_toggle">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">E_nable software sound mixing (ESD)</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		  <signal name="toggled" handler="enable_toggled_cb"/>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
+		<placeholder/>
 	      </child>
 
 	      <child>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- control-center.spec	25 Oct 2007 00:29:58 -0000	1.311
+++ control-center.spec	30 Oct 2007 17:06:14 -0000	1.312
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.20.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=330501
 Patch5: control-center-2.20.1-more-key-defaults.patch
 
+Patch6: control-center-2.20.0-enable-sound-by-default.patch
+
 # ubuntu has a better patch for this in the works
 # apparently http://blog.omma.net/?p=16
 # We should either wait for it to get upstream, or
@@ -195,6 +197,7 @@
 %patch4 -p1 -b .about-me-help
 pushd schemas/
 %patch5 -p0 -b .more-default-keys
+%patch6 -p0 -b .enable-sound
 popd
 #%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
@@ -398,6 +401,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Oct 30 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-7
+- Remove useless "start esd" preference
+
 * Wed Oct 24 2007  Matthias Clasen <mclasen at redhat.com> - 2.20.1-6
 - Fix the orca command in the default applications capplet (#351471)