[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.8.4-6

[Guido Günther]

The following commit has been merged in the master branch:
commit 6466da16a08ea28b81e38339737411f9c2488dbd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jul 15 09:30:37 2010 +0200

    New patch 0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
    
    Add conn info to virtinst.VirtualGraphics
    
    Closes: #583534
    Thanks: Cole Robinson

diff --git a/debian/patches/0005-Add-conn-info-to-virtinst.VirtualGraphics.patch b/debian/patches/0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
new file mode 100644
index 0000000..d9d4695
--- /dev/null
+++ b/debian/patches/0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 15 Jul 2010 09:29:36 +0200
+Subject: [PATCH] Add conn info to virtinst.VirtualGraphics
+
+so we know if we have to add a keymap option.
+
+Closes: #583534
+---
+ src/virtManager/addhardware.py |    3 ++-
+ src/virtManager/create.py      |    4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
+index 4ecfb8f..13ec813 100644
+--- a/src/virtManager/addhardware.py
++++ b/src/virtManager/addhardware.py
+@@ -1209,7 +1209,8 @@ class vmmAddHardware(gobject.GObject):
+         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 --git a/src/virtManager/create.py b/src/virtManager/create.py
+index dbacc3a..628bdd5 100644
+--- a/src/virtManager/create.py
++++ b/src/virtManager/create.py
+@@ -1110,7 +1110,9 @@ class vmmCreate(gobject.GObject):
+ 
+         # 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/debian/patches/series b/debian/patches/series
index cc6cfae..7c53530 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch
 0003-Update-french-translation.patch
 0004-create-Skip-post-install-restart-if-user-destroys-VM.patch
+0005-Add-conn-info-to-virtinst.VirtualGraphics.patch

-- 
VirtManager Debian packaging