rpms/workrave/devel workrave-1.8.5-lock.patch, NONE, 1.1 workrave.spec, 1.13, 1.14

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv953

Modified Files:
	workrave.spec 
Added Files:
	workrave-1.8.5-lock.patch 
Log Message:
* Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
- fix locking/unlocking with gnome-screensaver (#207058)


workrave-1.8.5-lock.patch:

--- NEW FILE workrave-1.8.5-lock.patch ---
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)


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- workrave.spec	20 Feb 2008 05:40:53 -0000	1.13
+++ workrave.spec	4 Apr 2008 09:09:48 -0000	1.14
@@ -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 at wieers.com> and Steve Ratcliffe
 License: GPLv2+
@@ -11,6 +11,7 @@
 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 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .lock
 
 %build
 if [ ! -x configure ]; then
@@ -69,6 +71,9 @@
 %{_datadir}/applications/fedora-workrave.desktop
 
 %changelog
+* Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
+- fix locking/unlocking with gnome-screensaver (#207058)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.8.5-3
 - Autorebuild for GCC 4.3