[Pkg-libvirt-commits] [SCM] Virt Manager packaging branch, master, updated. debian/0.7.0-3

[Guido Günther]

The following commit has been merged in the master branch:
commit 4522aa135aa13fd67f8606d0422cc4b4a2d478ba
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed May 20 19:05:58 2009 +0200

    make check match return value of self.get_config_keymap()
    
    In the "Add hardware" wizard summary, the keymap field is set to "None"
    instead of "Same as host" when "Same as host" option is used.
    
    Closes: #528447
    Thanks: Laurent Léonard

diff --git a/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch b/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch
new file mode 100644
index 0000000..7ac097e
--- /dev/null
+++ b/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 20 May 2009 19:02:30 +0200
+Subject: [PATCH] make check match return value of self.get_config_keymap()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+In the "Add hardware" wizard summary, the keymap field is set to "None"
+instead of "Same as host" when "Same as host" option is used.
+
+Closes: #528447
+Thanks: Laurent Léonard
+---
+ src/virtManager/addhardware.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
+index 4648c88..de289d4 100644
+--- a/src/virtManager/addhardware.py
++++ b/src/virtManager/addhardware.py
+@@ -522,7 +522,7 @@ class vmmAddHardware(gobject.GObject):
+                         self.window.get_widget("summary-graphics-password").set_text(_("Yes"))
+                     else:
+                         self.window.get_widget("summary-graphics-password").set_text(_("No"))
+-                    if self.get_config_keymap() != "":
++                    if self.get_config_keymap() is not None:
+                         self.window.get_widget("summary-graphics-keymap").set_text(str(self.get_config_keymap()))
+                     else:
+                         self.window.get_widget("summary-graphics-keymap").set_text(_("Same as host"))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5d0bb65..75a2a97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-use-usr-share-gconf-for-schema-data.patch
 0002-close-nc-connection-on-EOF.patch
 0003-don-t-crop-vnc-display.patch
+0004-make-check-match-return-value-of-self.get_config_key.patch

-- 
Virt Manager packaging