From 50497dc499b24509e65c01ed7d6a7adeae4e39b7 Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Apr 04 2008 09:09:48 +0000
Subject: - fix locking/unlocking with gnome-screensaver (#207058)


---

diff --git a/workrave-1.8.5-lock.patch b/workrave-1.8.5-lock.patch
new file mode 100644
index 0000000..4667635
--- /dev/null
+++ b/workrave-1.8.5-lock.patch
@@ -0,0 +1,15 @@
+diff -up workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc.lock workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc
+--- workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc.lock	2007-09-14 20:50:25.000000000 +0200
++++ workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc	2008-04-04 10:53:28.000000000 +0200
+@@ -185,6 +185,11 @@ WindowHints::grab(int num_windows, GdkWi
+           // So, let's not waste memory and simply return a bogus non-NULL ptr.
+           handle = (WindowHints::Grab *) 0xdeadf00d;
+         }
++      else
++        {
++	  gdk_keyboard_ungrab(GDK_CURRENT_TIME);
++	  gdk_pointer_ungrab(GDK_CURRENT_TIME);
++        }
+     }
+ #elif defined(WIN32)
+   if (num_windows > 0)
diff --git a/workrave.spec b/workrave.spec
index 2722fbc..79121a6 100644
--- a/workrave.spec
+++ b/workrave.spec
@@ -1,6 +1,6 @@
 Name: workrave
 Version: 1.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag@wieers.com> and Steve Ratcliffe
 License: GPLv2+
@@ -11,6 +11,7 @@ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 Source1: workrave.desktop
 
 Patch1: workrave-1.8.5-gcc43.patch
+Patch2: workrave-1.8.5-lock.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -29,6 +30,7 @@ take micro-pauses, rest breaks and restricts you to your daily limit.
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .lock
 
 %build
 if [ ! -x configure ]; then
@@ -69,6 +71,9 @@ desktop-file-install --vendor fedora                    \
 %{_datadir}/applications/fedora-workrave.desktop
 
 %changelog
+* Fri Apr  4 2008 Tomas Mraz <tmraz@redhat.com> - 1.8.5-4
+- fix locking/unlocking with gnome-screensaver (#207058)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.8.5-3
 - Autorebuild for GCC 4.3