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

[Guido Günther]

The following commit has been merged in the master branch:
commit e07202f4efbfb1ca5164314e64f3ad4772d9545a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jul 28 09:46:25 2010 +0200

    New patch 0006-Fix-error-launching-create-wizard-on-qemu-session.patch
    
    Fix error launching create wizard on qemu:///session
    
    Thanks: Cole Robinson
    Closes: #590491

diff --git a/debian/patches/0006-Fix-error-launching-create-wizard-on-qemu-session.patch b/debian/patches/0006-Fix-error-launching-create-wizard-on-qemu-session.patch
new file mode 100644
index 0000000..3ca4a76
--- /dev/null
+++ b/debian/patches/0006-Fix-error-launching-create-wizard-on-qemu-session.patch
@@ -0,0 +1,34 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 28 Jul 2010 09:44:13 +0200
+Subject: [PATCH] Fix error launching create wizard on qemu:///session
+
+Origin: vendor, http://hg.fedorahosted.org/hg/virt-manager/rev/ea94314da7d5
+---
+ src/virtManager/uihelpers.py |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/virtManager/uihelpers.py b/src/virtManager/uihelpers.py
+index a970ccb..d8fa0dc 100644
+--- a/src/virtManager/uihelpers.py
++++ b/src/virtManager/uihelpers.py
+@@ -264,9 +264,6 @@ def populate_network_list(net_list, conn):
+     bridge_dict = {}
+     iface_dict = {}
+ 
+-    def add_row(*args):
+-        model.append(build_row(*args))
+-
+     def build_row(nettype, name, label, is_sensitive, is_running,
+                   manual_bridge=False):
+         return [nettype, name, label, is_sensitive, is_running, manual_bridge]
+@@ -284,7 +281,8 @@ def populate_network_list(net_list, conn):
+     # For qemu:///session
+     if conn.is_qemu_session():
+         nettype = VirtualNetworkInterface.TYPE_USER
+-        add_row(nettype, None, pretty_network_desc(nettype), True)
++        r = build_row(nettype, None, pretty_network_desc(nettype), True, True)
++        model.append(r)
+         set_active(0)
+         return
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 7c53530..a880778 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Update-french-translation.patch
 0004-create-Skip-post-install-restart-if-user-destroys-VM.patch
 0005-Add-conn-info-to-virtinst.VirtualGraphics.patch
+0006-Fix-error-launching-create-wizard-on-qemu-session.patch

-- 
VirtManager Debian packaging