Backout change that I accidently committed. gnome-2-30-s11update
authoryippi
Thu, 17 May 2012 08:09:28 +0000
branchgnome-2-30-s11update
changeset 22440 b0dc72405bb6
parent 22439 879367a37bab
child 22441 8d2155ef0436
Backout change that I accidently committed.
patches/pulseaudio-06-configure.diff
--- a/patches/pulseaudio-06-configure.diff	Thu May 17 07:05:47 2012 +0000
+++ b/patches/pulseaudio-06-configure.diff	Thu May 17 08:09:28 2012 +0000
@@ -9,20 +9,3 @@
  #load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
  ])dnl
  ifelse(@HAVE_WAVEOUT@, 1, [dnl
-@@ -120,11 +120,11 @@ ifelse(@OS_IS_WIN32@, 0, [dnl
- ### Load additional modules from GConf settings. This can be configured with the paprefs tool.
- ### Please keep in mind that the modules configured by paprefs might conflict with manually
- ### loaded modules.
--.ifexists module-gconf@PA_SOEXT@
--.nofail
--load-module module-gconf
--.fail
--.endif
-+#.ifexists module-gconf@PA_SOEXT@
-+#.nofail
-+#load-module module-gconf
-+#.fail
-+#.endif
- 
- ### Automatically restore the default sink/source when changed by the user
- ### during runtime