diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-12-15 16:49:38 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-12-15 16:49:38 +0000 |
| commit | d8631c623849102e3e35c3a60d91482150198c5b (patch) | |
| tree | 8ef6e65a5efd8d6d6e3e8d698717e0eb7503fa5f | |
| parent | 999a8ff1c912a8da38c70740329d60026411d18f (diff) | |
| download | metacity-d8631c623849102e3e35c3a60d91482150198c5b.tar.gz metacity-d8631c623849102e3e35c3a60d91482150198c5b.tar.xz metacity-d8631c623849102e3e35c3a60d91482150198c5b.zip | |
clean _NET_SUPPORTING_WM_CHECK on shutdownmetacity-2_25_34-2_fc11
| -rw-r--r-- | metacity-scrub-wmcheck.patch | 26 | ||||
| -rw-r--r-- | metacity.spec | 11 |
2 files changed, 33 insertions, 4 deletions
diff --git a/metacity-scrub-wmcheck.patch b/metacity-scrub-wmcheck.patch new file mode 100644 index 0000000..e0b6f80 --- /dev/null +++ b/metacity-scrub-wmcheck.patch @@ -0,0 +1,26 @@ +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); + diff --git a/metacity.spec b/metacity.spec index d837c1a..60b92df 100644 --- a/metacity.spec +++ b/metacity.spec @@ -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 @@ Patch2: leaks.patch 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 @@ API. This package exists purely for technical reasons. %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 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Mon Dec 15 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.34-2 +- Clean _NET_SUPPORTING_WM_CHECK on shutdown + * Wed Dec 3 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.34-1 - Update to 2.25.34 |