Don't crash on volume sync when there is no audio channel

Resolves: rhbz#1257210

0001-audio-Do-not-volume-sync-without-audio.patch

@@ -0,0 +1,77 @@
+From a99ed1524b075c0cd9e7d82e7877783a1e31d291 Mon Sep 17 00:00:00 2001
+From: Victor Toso <victortoso@redhat.com>
+Date: Mon, 7 Sep 2015 10:17:34 +0200
+Subject: [spice-gtk] audio: Do not volume-sync without audio
+
+In case audio backend is not initialized correctly or there isn't audio
+in the VM, we should not try to volume-sync.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1257210
+---
+ src/channel-main.c | 6 ++++--
+ src/spice-audio.c  | 4 ++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/channel-main.c b/src/channel-main.c
+index f5115aa..145b081 100644
+--- a/src/channel-main.c
++++ b/src/channel-main.c
+@@ -1159,7 +1159,8 @@ static void agent_sync_audio_playback(SpiceMainChannel *main_channel)
+     SpiceAudio *audio = spice_audio_get(session, NULL);
+     SpiceMainChannelPrivate *c = main_channel->priv;
+ 
+-    if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
++    if (audio == NULL ||
++        !test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
+         c->agent_volume_playback_sync == TRUE) {
+         SPICE_DEBUG("%s - is not going to sync audio with guest", __func__);
+         return;
+@@ -1215,7 +1216,8 @@ static void agent_sync_audio_record(SpiceMainChannel *main_channel)
+     SpiceAudio *audio = spice_audio_get(session, NULL);
+     SpiceMainChannelPrivate *c = main_channel->priv;
+ 
+-    if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
++    if (audio == NULL ||
++        !test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) ||
+         c->agent_volume_record_sync == TRUE) {
+         SPICE_DEBUG("%s - is not going to sync audio with guest", __func__);
+         return;
+diff --git a/src/spice-audio.c b/src/spice-audio.c
+index ce191e1..3114a0a 100644
+--- a/src/spice-audio.c
++++ b/src/spice-audio.c
+@@ -197,6 +197,7 @@ void spice_audio_get_playback_volume_info_async(SpiceAudio *audio,
+                                                 GAsyncReadyCallback callback,
+                                                 gpointer user_data)
+ {
++    g_return_if_fail(audio != NULL);
+     SPICE_AUDIO_GET_CLASS(audio)->get_playback_volume_info_async(audio,
+             cancellable, main_channel, callback, user_data);
+ }
+@@ -208,6 +209,7 @@ gboolean spice_audio_get_playback_volume_info_finish(SpiceAudio *audio,
+                                                      guint16 **volume,
+                                                      GError **error)
+ {
++    g_return_val_if_fail(audio != NULL, FALSE);
+     return SPICE_AUDIO_GET_CLASS(audio)->get_playback_volume_info_finish(audio,
+             res, mute, nchannels, volume, error);
+ }
+@@ -218,6 +220,7 @@ void spice_audio_get_record_volume_info_async(SpiceAudio *audio,
+                                               GAsyncReadyCallback callback,
+                                               gpointer user_data)
+ {
++    g_return_if_fail(audio != NULL);
+     SPICE_AUDIO_GET_CLASS(audio)->get_record_volume_info_async(audio,
+             cancellable, main_channel, callback, user_data);
+ }
+@@ -229,6 +232,7 @@ gboolean spice_audio_get_record_volume_info_finish(SpiceAudio *audio,
+                                                    guint16 **volume,
+                                                    GError **error)
+ {
++    g_return_val_if_fail(audio != NULL, FALSE);
+     return SPICE_AUDIO_GET_CLASS(audio)->get_record_volume_info_finish(audio,
+             res, mute, nchannels, volume, error);
+ }
+-- 
+2.4.3
+

spice-gtk.spec

@@ -2,7 +2,7 @@
 
 Name:           spice-gtk
 Version:        0.29
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A GTK+ widget for SPICE clients
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ License:        LGPLv2+
 URL:            http://spice-space.org/page/Spice-Gtk
 #VCS:           git:git://anongit.freedesktop.org/spice/spice-gtk
 Source0:        http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
+Patch1:         0001-audio-Do-not-volume-sync-without-audio.patch
 
 BuildRequires: intltool
 BuildRequires: gtk2-devel >= 2.14
@@ -134,7 +135,7 @@ if [ -n '%{?_version_suffix}' ]; then
 fi
 
 pushd spice-gtk-%{version}
-#%patch1 -p1
+%patch1 -p1
 find . -name '*.stamp' | xargs touch
 popd
 
@@ -253,6 +254,10 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %{_bindir}/spicy-stats
 
 %changelog
+* Tue Sep 08 2015 Christophe Fergeau <cfergeau@redhat.com> 0.29-3
+- Don't crash on volume sync when there is no audio channel
+  Resolves: rhbz#1257210
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild