rpms/metacity/devel metacity.spec, 1.204, 1.205 screenshot-forkbomb.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29913

Modified Files:
	metacity.spec screenshot-forkbomb.patch 
Log Message:
Fix a problem with the previous change



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- metacity.spec	25 Nov 2009 02:54:27 -0000	1.204
+++ metacity.spec	26 Nov 2009 08:56:04 -0000	1.205
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -204,6 +204,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Nov 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-11
+- Fix a problem with the previous change
+
 * Tue Nov 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-10
 - Disable key repeat for screenshot keybinding (#506369)
 

screenshot-forkbomb.patch:
 core/keybindings.c        |   28 ++++++++++++++++++++++------
 include/all-keybindings.h |    5 +++--
 2 files changed, 25 insertions(+), 8 deletions(-)

Index: screenshot-forkbomb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/screenshot-forkbomb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- screenshot-forkbomb.patch	25 Nov 2009 02:54:28 -0000	1.1
+++ screenshot-forkbomb.patch	26 Nov 2009 08:56:04 -0000	1.2
@@ -69,7 +69,7 @@
 +      return;
 +    }
 +
-+  if (binding->repeating)
++  if (binding->repeating && (binding->handler->flags & BINDING_NO_REPEAT))
 +    {
 +      meta_topic (META_DEBUG_KEYBINDINGS,
 +                  "Key repeat ignored, binding %s\n",