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

[Guido Günther]

The following commit has been merged in the master branch:
commit 851972d8229646ef5e40f20677c89a69e2931aa2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jun 4 16:10:45 2012 +0200

    vnc: Fix accidental recursion we reporting grab keys
    
    Thanks: Cole Robinson

diff --git a/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch b/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch
new file mode 100644
index 0000000..b955aa6
--- /dev/null
+++ b/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch
@@ -0,0 +1,25 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 6 Feb 2012 17:57:14 -0500
+Subject: vnc: Fix accidental recursion we reporting grab keys
+
+---
+ src/virtManager/console.py |    6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/virtManager/console.py b/src/virtManager/console.py
+index c00011e..3c40c6b 100644
+--- a/src/virtManager/console.py
++++ b/src/virtManager/console.py
+@@ -390,12 +390,6 @@ class VNCViewer(Viewer):
+     def open_fd(self, fd):
+         self.display.open_fd(fd)
+ 
+-    def get_grab_keys(self):
+-        keystr = self.get_grab_keys()
+-        if not keystr:
+-            keystr = "Control_L+Alt_L"
+-        return keystr
+-
+     def set_credential_username(self, cred):
+         self.display.set_credential(gtkvnc.CREDENTIAL_USERNAME, cred)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9c55122..975a649 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-use-usr-share-gconf-for-schema-data.patch
 0002-Use-IPy-from-python-ipy.patch
 0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch
+0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch

-- 
VirtManager Debian packaging