rpms/metacity/devel metacity-scrub-wmcheck.patch, NONE, 1.1 metacity.spec, 1.176, 1.177

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	metacity.spec 
Added Files:
	metacity-scrub-wmcheck.patch 
Log Message:
clean _NET_SUPPORTING_WM_CHECK on shutdown


metacity-scrub-wmcheck.patch:

--- NEW FILE metacity-scrub-wmcheck.patch ---
diff -up metacity-2.25.34/src/core/screen.c.scrub-wmcheck metacity-2.25.34/src/core/screen.c
--- metacity-2.25.34/src/core/screen.c.scrub-wmcheck	2008-12-15 00:12:33.000000000 -0500
+++ metacity-2.25.34/src/core/screen.c	2008-12-15 00:15:56.000000000 -0500
@@ -86,6 +86,13 @@ set_wm_check_hint (MetaScreen *screen)
   return Success;
 }
 
+static void
+unset_wm_check_hint (MetaScreen *screen)
+{
+  XDeleteProperty (screen->display->xdisplay, screen->xroot, 
+                   screen->display->atom__NET_SUPPORTING_WM_CHECK);
+}
+
 static int
 set_supported_hint (MetaScreen *screen)
 {
@@ -661,6 +668,8 @@ meta_screen_free (MetaScreen *screen,
     meta_warning (_("Could not release screen %d on display \"%s\"\n"),
                   screen->number, screen->display->name);
 
+  unset_wm_check_hint (screen);
+
   XDestroyWindow (screen->display->xdisplay,
                   screen->wm_sn_selection_window);
   


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- metacity.spec	4 Dec 2008 06:31:23 -0000	1.176
+++ metacity.spec	15 Dec 2008 16:49:38 -0000	1.177
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.25.34
-Release: 1%{?dist}
+Release: 2%{?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
@@ -13,8 +13,8 @@
 Patch3: string-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=562196
-Patch5: werror-no-thanks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=564561
+Patch6: metacity-scrub-wmcheck.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -76,7 +76,7 @@
 %patch2 -p1 -b .leaks
 %patch3 -p1 -b .string-leak
 %patch4 -p1 -b .stop-spamming-xsession-errors
-#%patch5 -p1 -b .werror-no-thanks
+%patch6 -p1 -b .scrub-wmcheck
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -179,6 +179,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Dec 15 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.34-2
+- Clean _NET_SUPPORTING_WM_CHECK on shutdown
+
 * Wed Dec  3 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.34-1
 - Update to 2.25.34