bug 467802

metacity.spec

@@ -1,7 +1,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.24/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -11,6 +11,8 @@ Patch1: metacity-2.21.13-dont-move-windows.patch
 Patch2: leaks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552307
 Patch3: string-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=558723
+Patch4: stop-spamming-xsession-errors.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -69,6 +71,7 @@ API. This package exists purely for technical reasons.
 %patch1 -p0 -b .dont-move-windows
 %patch2 -p1 -b .leaks
 %patch3 -p1 -b .string-leak
+%patch4 -p1 -b .stop-spamming-xsession-errors
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -172,6 +175,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Oct 31 2008 Soren Sandmann <sandmann@redhat.com> - 2.24.0-3
+- Don't spam .xsession-errors so hard (bug 467802)
+
 * Thu Sep 25 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-2
 - Save some space
 

stop-spamming-xsession-errors.patch

@@ -0,0 +1,15 @@
+diff -up metacity-2.24.0/src/core/display.c~ metacity-2.24.0/src/core/display.c
+--- metacity-2.24.0/src/core/display.c~	2008-08-18 08:29:06.000000000 -0400
++++ metacity-2.24.0/src/core/display.c	2008-10-31 15:19:02.000000000 -0400
+@@ -3264,9 +3264,11 @@ meta_display_begin_grab_op (MetaDisplay 
+   
+   if (display->grab_op != META_GRAB_OP_NONE)
+     {
++#if 0
+       meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
+                     op, window ? window->desc : "none", display->grab_op,
+                     display->grab_window ? display->grab_window->desc : "none");
++#endif
+       return FALSE;
+     }
+