From 80ee1d753169303b72fc06e651759d9991aa8e2f Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@fedoraproject.org>
Date: Tue, 24 Mar 2009 20:54:33 +0000
Subject: [PATCH] Fix release of keyboard grab when releasing mouse grab
 outside app window     (rhbz #491167)

---
 gtk-vnc-0.3.8-ungrab.patch | 24 ++++++++++++++++++++++++
 gtk-vnc.spec               |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 gtk-vnc-0.3.8-ungrab.patch

diff --git a/gtk-vnc-0.3.8-ungrab.patch b/gtk-vnc-0.3.8-ungrab.patch
new file mode 100644
index 0000000..52027be
--- /dev/null
+++ b/gtk-vnc-0.3.8-ungrab.patch
@@ -0,0 +1,24 @@
+diff --git a/src/vncdisplay.c b/src/vncdisplay.c
+index f1082da..5c78ab8 100644
+--- a/src/vncdisplay.c
++++ b/src/vncdisplay.c
+@@ -765,9 +765,6 @@ static gboolean enter_event(GtkWidget *widget, GdkEventCrossing *crossing)
+         if (priv->gvnc == NULL || !gvnc_is_initialized(priv->gvnc))
+                 return FALSE;
+ 
+-        if (crossing->mode != GDK_CROSSING_NORMAL)
+-                return FALSE;
+-
+         if (priv->grab_keyboard)
+                 do_keyboard_grab(VNC_DISPLAY(widget), FALSE);
+ 
+@@ -781,9 +778,6 @@ static gboolean leave_event(GtkWidget *widget, GdkEventCrossing *crossing)
+         if (priv->gvnc == NULL || !gvnc_is_initialized(priv->gvnc))
+                 return FALSE;
+ 
+-        if (crossing->mode != GDK_CROSSING_NORMAL)
+-                return FALSE;
+-
+         if (priv->grab_keyboard)
+                 do_keyboard_ungrab(VNC_DISPLAY(widget), FALSE);
+ 
diff --git a/gtk-vnc.spec b/gtk-vnc.spec
index 8c1969d..8c9749e 100644
--- a/gtk-vnc.spec
+++ b/gtk-vnc.spec
@@ -7,13 +7,14 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz
 Patch1: %{name}-%{version}-relative-mouse.patch
 Patch2: %{name}-%{version}-sasl-auth.patch
 Patch3: %{name}-%{version}-sasl-auth-tunnel.patch
+Patch4: %{name}-%{version}-ungrab.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://live.gnome.org/gtk-vnc
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -75,6 +76,7 @@ browsers.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # Temp hack for patch2
@@ -134,6 +136,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Tue Mar 24 2009 Daniel P. Berrange <berrange@redhat.com> - 0.3.8-7.fc11
+- Fix release of keyboard grab when releasing mouse grab outside app window (rhbz #491167)
+
 * Thu Mar  5 2009 Daniel P. Berrange <berrange@redhat.com> - 0.3.8-6.fc11
 - Fix SASL address generation when using AF_UNIX sockets