[spice-vdagent] - Fix setting of the guest resolution from a multi monitor client

[Hans de Goede]

commit ae22cef632e89437111303f04762a3e9f2a89bf8
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Mar 7 15:44:13 2011 +0100

    - Fix setting of the guest resolution from a multi monitor client

 ...ing-the-resolution-through-the-agent-on-m.patch |   28 ++++++++++++++++++++
 spice-vdagent.spec                                 |    7 ++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0006-Allow-changing-the-resolution-through-the-agent-on-m.patch b/0006-Allow-changing-the-resolution-through-the-agent-on-m.patch
new file mode 100644
index 0000000..1f86c64
--- /dev/null
+++ b/0006-Allow-changing-the-resolution-through-the-agent-on-m.patch
@@ -0,0 +1,28 @@
+From aca540ccae12fbc5194410accd71a5ab384473ce Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Mon, 7 Mar 2011 14:59:56 +0100
+Subject: [PATCH] Allow changing the resolution through the agent on multi monitor setups
+
+Rather then refusing to use the monitor config send by the client at
+all for multi monitor clients, simply take the info from the first monitor.
+---
+ vdagent-x11.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/vdagent-x11.c b/vdagent-x11.c
+index 11e9c45..2bf5cd1 100644
+--- a/vdagent-x11.c
++++ b/vdagent-x11.c
+@@ -805,8 +805,7 @@ void vdagent_x11_set_monitor_config(struct vdagent_x11 *x11,
+ 
+     if (mon_config->num_of_monitors != 1) {
+         fprintf(x11->errfile,
+-                "Only 1 monitor supported, ignoring monitor config\n");
+-        return;
++                "Only 1 monitor supported, ignoring additional monitors\n");
+     }
+ 
+     sizes = XRRSizes(x11->display, x11->screen, &num_sizes);
+-- 
+1.7.3.2
+
diff --git a/spice-vdagent.spec b/spice-vdagent.spec
index 83f1b81..e0387fd 100644
--- a/spice-vdagent.spec
+++ b/spice-vdagent.spec
@@ -1,6 +1,6 @@
 Name:           spice-vdagent
 Version:        0.6.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Agent for Spice guests
 Group:          Applications/System
 License:        GPLv3+
@@ -12,6 +12,7 @@ Patch1:         0002-Only-start-spice-vdagentd-in-runlevel-5.patch
 Patch2:         0003-sysv-initscript-fix-lsb-header-multi-line-descriptio.patch
 Patch3:         0004-Put-the-pid-and-log-files-into-their-own-subdir.patch
 Patch4:         0005-sysv-initscript-exit-cleanly-when-not-running-under-.patch
+Patch5:         0006-Allow-changing-the-resolution-through-the-agent-on-m.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dbus-devel spice-protocol libXrandr-devel libXfixes-devel
 BuildRequires:  desktop-file-utils
@@ -41,6 +42,7 @@ Features:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -86,6 +88,9 @@ fi
 
 
 %changelog
+* Mon Mar 07 2011 Hans de Goede <hdegoede at redhat.com> 0.6.3-6
+- Fix setting of the guest resolution from a multi monitor client
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild