From b6dbf5b5cda687c9c91bc911107099de5e9f4e56 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: Thu, 15 Jul 2010 17:14:05 +0000
Subject: [PATCH] Really fix VNC keymap negotiation (bz 586201)

---
 virt-manager-0.8.4-really-fix-keymap.patch | 34 ++++++++++++++++++++++
 virt-manager.spec                          |  8 ++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 virt-manager-0.8.4-really-fix-keymap.patch

diff --git a/virt-manager-0.8.4-really-fix-keymap.patch b/virt-manager-0.8.4-really-fix-keymap.patch
new file mode 100644
index 0000000..578edf8
--- /dev/null
+++ b/virt-manager-0.8.4-really-fix-keymap.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Marc Deslauriers <marc.deslauriers@ubuntu.com>
+# Date 1273089420 14400
+# Node ID 99cf13a133f304abf4597194070aec5d397234c7
+# Parent  5dcc284b39e924339f61dd6840b0c8093c0d616c
+Add conn info to virtinst.VirtualGraphics
+
+diff -r 5dcc284b39e9 -r 99cf13a133f3 src/virtManager/addhardware.py
+--- a/src/virtManager/addhardware.py	Wed Apr 28 05:21:10 2010 +0000
++++ b/src/virtManager/addhardware.py	Wed May 05 15:57:00 2010 -0400
+@@ -1209,7 +1209,8 @@
+         else:
+             _type = virtinst.VirtualGraphics.TYPE_SDL
+ 
+-        self._dev = virtinst.VirtualGraphics(type=_type)
++        self._dev = virtinst.VirtualGraphics(type=_type,
++                                             conn=self.vm.get_connection().vmm)
+         try:
+             self._dev.port   = self.get_config_vnc_port()
+             self._dev.passwd = self.get_config_vnc_password()
+diff -r 5dcc284b39e9 -r 99cf13a133f3 src/virtManager/create.py
+--- a/src/virtManager/create.py	Wed Apr 28 05:21:10 2010 +0000
++++ b/src/virtManager/create.py	Wed May 05 15:57:00 2010 -0400
+@@ -1110,7 +1110,9 @@
+ 
+         # Set up graphics device
+         try:
+-            guest._graphics_dev = virtinst.VirtualGraphics(type=virtinst.VirtualGraphics.TYPE_VNC)
++            guest._graphics_dev = virtinst.VirtualGraphics(
++                                        type=virtinst.VirtualGraphics.TYPE_VNC,
++                                        conn=guest.conn)
+             guest.add_device(virtinst.VirtualVideoDevice(conn=guest.conn))
+         except Exception, e:
+             self.err.show_err(_("Error setting up graphics device:") + str(e),
diff --git a/virt-manager.spec b/virt-manager.spec
index 2c536eb..f4c0503 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.4
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -39,6 +39,8 @@ Patch9: %{name}-%{version}-vnc-auto-keymap.patch
 Patch10: %{name}-%{version}-vnc-reconnect-traceback.patch
 # Fix remote VNC connection with zsh as default shell
 Patch11: %{name}-%{version}-vnc-zsh.patch
+# Really fix VNC keymap negotiation (bz 586201)
+Patch12: %{name}-%{version}-really-fix-keymap.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -108,6 +110,7 @@ management API.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 %configure
@@ -186,6 +189,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Wed Jul 14 2010 Cole Robinson <crobinso@redhat.com> - 0.8.4-2.fc13
+- Really fix VNC keymap negotiation (bz 586201)
+
 * Thu May 27 2010 Cole Robinson <crobinso@redhat.com> - 0.8.4-1.fc13
 - Update to version 0.8.4
 - 'Import' install option, to create a VM around an existing OS image