From 39e4d3d634260291f0996f173c9c1738f78c57f1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Oct 10 2008 09:31:12 +0000
Subject: - Remove OSS from the possible options (#466342)


---

diff --git a/control-center.spec b/control-center.spec
index dbe88a2..70d62d9 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -37,6 +37,9 @@ Patch8: gtkmarshal.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=456919
 Patch9: gcc-set-sound-theme-dir.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=466342
+Patch10: gcc-sound-props-remove-oss.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -176,6 +179,7 @@ utilities.
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
 %patch9 -p0 -b .default-dir
+%patch10 -p0 -b .no-oss
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch28 -p1 -b .capplet-help
@@ -350,6 +354,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Oct 10 2008 - Bastien Nocera <bnocera@redhat.com> - 2.24.0.1-7
+- Remove OSS from the possible options (#466342)
+
 * Fri Oct 10 2008 - Bastien Nocera <bnocera@redhat.com> - 2.24.0.1-6
 - When a sound is selected with the file chooser in g-s-p, make
   sure to default to /usr/share/sounds if that dir exists
diff --git a/gcc-sound-props-remove-oss.patch b/gcc-sound-props-remove-oss.patch
new file mode 100644
index 0000000..e85c0d5
--- /dev/null
+++ b/gcc-sound-props-remove-oss.patch
@@ -0,0 +1,35 @@
+Index: capplets/sound/sound-properties-capplet.c
+===================================================================
+--- capplets/sound/sound-properties-capplet.c	(revision 9054)
++++ capplets/sound/sound-properties-capplet.c	(working copy)
+@@ -280,6 +280,7 @@
+ 	}
+ }
+ 
++#if 0
+ /* Adds an element which supports the GstPropertyProbe interface. Will add
+  * entries for all available devices. Elements should support retrieving the
+  * device-name in NULL state for this to work properly/nicely.
+@@ -347,7 +348,7 @@
+ 	gst_object_unref (element);
+ 	return res;
+ }
+-
++#endif
+ #if USE_HAL
+ static void
+ remove_device (int type, const gchar *pipeline)
+@@ -836,13 +837,6 @@
+ 	add_device (AUDIO_PLAYBACK, "artsdsink", _("Artsd - ART Sound Daemon"), NULL);
+ 	add_device (AUDIO_PLAYBACK, "esdsink", _("ESD - Enlightened Sound Daemon"), NULL);
+ 	add_device (AUDIO_CAPTURE, "esdmon", _("ESD - Enlightened Sound Daemon"), NULL);
+-	/* only show legacy OSS if OSS4 isn't active and working */
+-	if (!add_device_with_probe (AUDIO_PLAYBACK, "oss4sink", "OSS4")) {
+-		add_device (AUDIO_PLAYBACK, "osssink", _("OSS - Open Sound System"), NULL);
+-	}
+-	if (!add_device_with_probe (AUDIO_CAPTURE, "oss4src", "OSS4")) {
+-		add_device (AUDIO_CAPTURE, "osssrc", _("OSS - Open Sound System"), NULL);
+-	}
+ 	add_device (AUDIO_PLAYBACK, "pulsesink", _("PulseAudio Sound Server"), NULL);
+ 	add_device (AUDIO_CAPTURE, "pulsesrc", _("PulseAudio Sound Server"), NULL);
+ 	add_device (AUDIO_CAPTURE, "audiotestsrc wave=triangle is-live=true", _("Test Sound"), NULL);