[paprefs] Use module-combine-sink instead of module-combine

[belegdol]

commit 4fdbeca7bced47cf09c9a8c2cb6d519960536cf4
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Sat Mar 1 13:02:22 2014 +0100

    Use module-combine-sink instead of module-combine

 paprefs-0.9.10-module-combine-sink.patch |   12 ++++++++++++
 paprefs.spec                             |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/paprefs-0.9.10-module-combine-sink.patch b/paprefs-0.9.10-module-combine-sink.patch
new file mode 100644
index 0000000..a93abe2
--- /dev/null
+++ b/paprefs-0.9.10-module-combine-sink.patch
@@ -0,0 +1,12 @@
+diff -up paprefs-0.9.10/src/paprefs.cc.module-combine-sink paprefs-0.9.10/src/paprefs.cc
+--- paprefs-0.9.10/src/paprefs.cc.module-combine-sink	2014-03-01 12:57:44.304726964 +0100
++++ paprefs-0.9.10/src/paprefs.cc	2014-03-01 12:58:29.016893961 +0100
+@@ -388,7 +388,7 @@ void MainWindow::writeToGConfCombine() {
+     gconf->change_set_commit(changeSet, true);
+ 
+     if (combineCheckButton->get_active()) {
+-        changeSet.set(PA_GCONF_PATH_MODULES"/combine/name0", Glib::ustring("module-combine"));
++        changeSet.set(PA_GCONF_PATH_MODULES"/combine/name0", Glib::ustring("module-combine-sink"));
+         changeSet.set(PA_GCONF_PATH_MODULES"/combine/args0", Glib::ustring(""));
+ 
+         changeSet.set(PA_GCONF_PATH_MODULES"/combine/enabled", true);
diff --git a/paprefs.spec b/paprefs.spec
index aaafa47..42e430f 100644
--- a/paprefs.spec
+++ b/paprefs.spec
@@ -1,12 +1,13 @@
 Name:           paprefs
 Version:        0.9.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Management tool for PulseAudio
 
 License:        GPLv2+
 URL:            http://freedesktop.org/software/pulseaudio/%{name}
 Source0:        http://freedesktop.org/software/pulseaudio/%{name}/%{name}-%{version}.tar.xz
 Patch0:         %{name}-%{version}-modules-path.patch
+Patch1:         %{name}-%{version}-module-combine-sink.patch
 
 BuildRequires:  gconfmm26-devel
 BuildRequires:  libglademm24-devel 
@@ -28,6 +29,7 @@ for the PulseAudio sound server.
 touch -r configure.ac configure.ac.stamp
 %patch0 -p1 -b .modules-path
 touch -r configure.ac.stamp configure.ac
+%patch1 -p1 -b .module-combine-sink
 
 %build
 %configure
@@ -54,6 +56,9 @@ desktop-file-install \
 
 
 %changelog
+* Sat Mar 01 2014 Julian Sikorski <belegdol at fedoraproject.org> - 0.9.10-6
+- Use module-combine-sink instead of module-combine
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild