From 44c81f31631b7cadd000f6486c179aca3a8ec8f7 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 6 Oct 2013 15:34:15 -0400
Subject: [PATCH] Another fix for TLS (bz #904295) Add dep on dconf (bz
 #1012884)

---
 0009-console-Fix-console_active-logic.patch | 38 +++++++++++++++++++++
 virt-manager.spec                           | 12 +++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 0009-console-Fix-console_active-logic.patch

diff --git a/0009-console-Fix-console_active-logic.patch b/0009-console-Fix-console_active-logic.patch
new file mode 100644
index 0000000..8d14675
--- /dev/null
+++ b/0009-console-Fix-console_active-logic.patch
@@ -0,0 +1,38 @@
+From a4e1df7fb3c835cb84344a59df82fa33cf1fe1aa Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Sun, 6 Oct 2013 15:30:01 -0400
+Subject: [PATCH] console: Fix console_active() logic
+
+(cherry picked from commit 79196cdfcf8f2ac58c87074c326ca3237f84dca6)
+
+Conflicts:
+	virtManager/console.py
+---
+ virtManager/console.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/virtManager/console.py b/virtManager/console.py
+index 90db31c..8058af9 100644
+--- a/virtManager/console.py
++++ b/virtManager/console.py
+@@ -100,9 +100,9 @@ class ConnectionInfo(object):
+     def console_active(self):
+         if self.gsocket:
+             return True
+-        if not self.gport:
++        if (self.gport in [None, -1] and self.gtlsport in [None, -1]):
+             return False
+-        return int(self.gport) == -1
++        return True
+ 
+ 
+ class Tunnel(object):
+@@ -1129,7 +1129,7 @@ class vmmConsolePages(vmmGObjectUI):
+             self.activate_unavailable_page(msg)
+             return
+ 
+-        if ginfo.console_active():
++        if not ginfo.console_active():
+             self.activate_unavailable_page(
+                             _("Graphical console is not yet active for guest"))
+             self.schedule_retry()
diff --git a/virt-manager.spec b/virt-manager.spec
index 850b9d4..52a2ef1 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -21,7 +21,7 @@
 
 
 %define _version 0.10.0
-%define _release 3
+%define _release 4
 
 
 # This macro is used for the continuous automated builds. It just
@@ -53,6 +53,8 @@ Patch0006: 0006-manager-Merge-some-row-creation-drop-unneeded-row-ke.patch
 Patch0007: 0007-manager-Separate-stats-and-state-update-callbacks.patch
 # Make cache=default when adding new disk to existing VM (bz #976925)
 Patch0008: 0008-addhw-disk-cache-default-should-be-default-not-none.patch
+# Another fix for TLS (bz #904295)
+Patch0009: 0009-console-Fix-console_active-logic.patch
 BuildArch: noarch
 
 
@@ -60,7 +62,7 @@ Requires: virt-manager-common = %{verrel}
 Requires: pygobject3
 Requires: gtk3
 Requires: libvirt-glib >= 0.0.9
-Requires: gnome-python2-gconf
+Requires: dconf
 Requires: libxml2-python
 Requires: vte3
 
@@ -129,6 +131,8 @@ machine).
 %patch0007 -p1
 # Make cache=default when adding new disk to existing VM (bz #976925)
 %patch0008 -p1
+# Another fix for TLS (bz #904295)
+%patch0009 -p1
 
 %build
 %if %{qemu_user}
@@ -239,6 +243,10 @@ fi
 
 
 %changelog
+* Sun Oct 06 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-4
+- Another fix for TLS (bz #904295)
+- Add dep on dconf (bz #1012884)
+
 * Wed Sep 25 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-3
 - Make cache=default when adding new disk to existing VM (bz #976925)