rpms/metacity/devel .cvsignore, 1.79, 1.80 metacity.spec, 1.171, 1.172 sources, 1.79, 1.80 stop-spamming-xsession-errors.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
	stop-spamming-xsession-errors.patch 
Log Message:
2.25.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	12 Nov 2008 06:55:01 -0000	1.79
+++ .cvsignore	25 Nov 2008 02:41:57 -0000	1.80
@@ -1 +1 @@
-metacity-2.25.5.tar.bz2
+metacity-2.25.8.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- metacity.spec	23 Nov 2008 04:13:23 -0000	1.171
+++ metacity.spec	25 Nov 2008 02:41:57 -0000	1.172
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.25.5
-Release: 4%{?dist}
+Version: 2.25.8
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.25/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -174,6 +174,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Nov 24 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.8-1
+- Update to 2.25.8
+
 * Sat Nov 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.5-4
 - Tweak %%summary and %%description
 - Fix BuildRequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	12 Nov 2008 06:55:01 -0000	1.79
+++ sources	25 Nov 2008 02:41:57 -0000	1.80
@@ -1 +1 @@
-bad30bc7a0e935a1dd0ed31f863dd05f  metacity-2.25.5.tar.bz2
+da7fabe176eb971516a5d56bd6f3633b  metacity-2.25.8.tar.bz2

stop-spamming-xsession-errors.patch:

Index: stop-spamming-xsession-errors.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/stop-spamming-xsession-errors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stop-spamming-xsession-errors.patch	31 Oct 2008 19:28:28 -0000	1.1
+++ stop-spamming-xsession-errors.patch	25 Nov 2008 02:41:57 -0000	1.2
@@ -1,14 +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 
+diff -up metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors metacity-2.25.8/src/core/display.c
+--- metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors	2008-11-23 00:28:37.000000000 -0500
++++ metacity-2.25.8/src/core/display.c	2008-11-24 21:40:33.000000000 -0500
+@@ -3264,10 +3264,12 @@ 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");
+       if (window)
+         meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
+                       op, window->desc, display->grab_op,
+                       display->grab_window ? display->grab_window->desc : "none");
 +#endif
        return FALSE;
      }