[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.9.0-2-3-g94d561d

[Laurent Léonard]

The following commit has been merged in the master branch:
commit fd980dc626c60fe41b2b8ae40ec5ab28b9598b14
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sat Nov 19 18:58:47 2011 +0100

    New patch 0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
    
    Closes: #648420

diff --git a/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch b/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
new file mode 100644
index 0000000..2871f80
--- /dev/null
+++ b/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
@@ -0,0 +1,31 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Fri, 28 Oct 2011 12:20:11 -0400
+Subject: console: Fix crashes when deleting vm on F16
+
+The toolbar cleanup order was causing crashed on f16 at app shutdown or
+VM delete (when a console window is fully uninstantiated)
+
+Origin: upstream, http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=930a321f8e411cd02f4f43c193f967763e8b6e5c
+Bug-Debian: http://bugs.debian.org/648420
+---
+ src/virtManager/console.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/virtManager/console.py b/src/virtManager/console.py
+index 1bdf26b..bd08cc3 100644
+--- a/src/virtManager/console.py
++++ b/src/virtManager/console.py
+@@ -597,10 +597,10 @@ class vmmConsolePages(vmmGObjectUI):
+ 
+         self.keycombo_menu.destroy()
+         self.keycombo_menu = None
+-        self.fs_toolbar.destroy()
+-        self.fs_toolbar = None
+         self.fs_drawer.destroy()
+         self.fs_drawer = None
++        self.fs_toolbar.destroy()
++        self.fs_toolbar = None
+ 
+     ##########################
+     # Initialization helpers #
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a794bf6..095fc5f 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-virt-manager-Fix-Resize-to-VM-menu-option.patch
+0004-console-Fix-crashes-when-deleting-vm-on-F16.patch

-- 
VirtManager Debian packaging