rpms/gtk-vnc/F-9 gtk-vnc-0.3.7-abs-ungrab.patch, NONE, 1.1 gtk-vnc.spec, 1.20, 1.21

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17404

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.3.7-abs-ungrab.patch 
Log Message:
Fix ungrab when in absolute pointer mode

gtk-vnc-0.3.7-abs-ungrab.patch:

--- NEW FILE gtk-vnc-0.3.7-abs-ungrab.patch ---
diff -r cf0e849385e0 src/vncdisplay.c
--- a/src/vncdisplay.c	Thu Sep 11 17:07:42 2008 +0100
+++ b/src/vncdisplay.c	Thu Sep 25 12:57:31 2008 +0100
@@ -703,13 +703,12 @@
 		}
 	}
 
-	if ((!priv->grab_keyboard || !priv->absolute) &&
-	    key->type == GDK_KEY_PRESS &&
+	if (key->type == GDK_KEY_PRESS &&
 	    ((keyval == GDK_Control_L && (key->state & GDK_MOD1_MASK)) ||
 	     (keyval == GDK_Alt_L && (key->state & GDK_CONTROL_MASK)))) {
 		if (priv->in_pointer_grab)
 			do_pointer_ungrab(VNC_DISPLAY(widget), FALSE);
-		else
+		else if (!priv->grab_keyboard || !priv->absolute)
 			do_pointer_grab(VNC_DISPLAY(widget), FALSE);
 	}
 


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-9/gtk-vnc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-vnc.spec	8 Sep 2008 13:02:35 -0000	1.20
+++ gtk-vnc.spec	25 Sep 2008 12:20:38 -0000	1.21
@@ -7,10 +7,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-abs-ungrab.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -32,7 +33,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: pkgconfig
-Requires: pygtk2-devel gtk2-devel gnutls-devel
+Requires: gtk2-devel gnutls-devel
 
 %description devel
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -120,6 +122,9 @@
 %endif
 
 %changelog
+* Thu Sep 25 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-2.fc9
+- Allow pointer ungrab keysequence if already grabbed (rhbz #463729)
+
 * Mon Sep  8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.7-1.fc9
 - Update to 0.3.7 release for crash fix (rhbz #461359)