2.25.144

.cvsignore

@@ -1 +1 @@
-metacity-2.25.89.tar.bz2
+metacity-2.25.144.tar.bz2

leaks.patch

@@ -1,14 +0,0 @@
-diff -up metacity-2.23.610/src/core/edge-resistance.c.leaks metacity-2.23.610/src/core/edge-resistance.c
---- metacity-2.23.610/src/core/edge-resistance.c.leaks	2008-09-14 22:39:38.000000000 -0400
-+++ metacity-2.23.610/src/core/edge-resistance.c	2008-09-14 22:43:28.000000000 -0400
-@@ -985,8 +985,8 @@ meta_display_compute_resistance_and_snap
-       cur_window_iter = cur_window_iter->next;
-     }
-   /* Put 'em in bottom to top order */
--  rem_windows       = g_slist_reverse (obscuring_windows);
--  rem_win_stacking  = g_slist_reverse (window_stacking);
-+  rem_windows = obscuring_windows = g_slist_reverse (obscuring_windows);
-+  rem_win_stacking = window_stacking = g_slist_reverse (window_stacking);
- 
-   /*
-    * 3rd: loop over the windows again, this time getting the edges from

metacity-scrub-wmcheck.patch

@@ -1,26 +0,0 @@
-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);
-   

metacity.spec

@@ -1,18 +1,12 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.25.89
+Version: 2.25.144
 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
-# http://bugzilla.gnome.org/show_bug.cgi?id=552303
-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
-# http://bugzilla.gnome.org/show_bug.cgi?id=564561
-Patch6: metacity-scrub-wmcheck.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -71,10 +65,7 @@ API. This package exists purely for technical reasons.
 %prep
 %setup -q 
 %patch0 -p1 -b .default-theme
-%patch2 -p1 -b .leaks
-%patch3 -p1 -b .string-leak
 %patch4 -p1 -b .stop-spamming-xsession-errors
-%patch6 -p1 -b .scrub-wmcheck
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +168,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Feb  3 2009 Matthias Clasen  <mclasen@redhat.com> - 2.25.144-1
+- Update to 2.25.144
+
 * Mon Jan  5 2009 Matthias Clasen  <mclasen@redhat.com> - 2.25.89-1
 - Update to 2.25.89
 

sources

@@ -1 +1 @@
-1d083549efdcdc6aad4eaada1c3ff86a  metacity-2.25.89.tar.bz2
+b7f51a8144584f51434b8775216bc2c5  metacity-2.25.144.tar.bz2

string-leak.patch

@@ -1,20 +0,0 @@
-diff -up metacity-2.23.610/src/ui/ui.c.string-leak metacity-2.23.610/src/ui/ui.c
---- metacity-2.23.610/src/ui/ui.c.string-leak	2008-08-18 08:29:07.000000000 -0400
-+++ metacity-2.23.610/src/ui/ui.c	2008-09-15 18:05:20.000000000 -0400
-@@ -657,10 +657,12 @@ meta_text_property_to_utf8 (Display     
-                                           &list);
- 
-   if (count == 0)
--    return NULL;
--
--  retval = list[0];
--  list[0] = g_strdup (""); /* something to free */
-+    retval = NULL;
-+  else
-+    {
-+      retval = list[0];
-+      list[0] = g_strdup (""); /* something to free */
-+    }
-   
-   g_strfreev (list);
- 

werror-no-thanks.patch

@@ -1,13 +0,0 @@
-diff -up metacity-2.25.8/configure.werror metacity-2.25.8/configure
---- metacity-2.25.8/configure.werror	2008-11-24 22:08:04.000000000 -0500
-+++ metacity-2.25.8/configure	2008-11-24 22:08:15.000000000 -0500
-@@ -21223,9 +21223,6 @@ if test "x$enable_debug" = "xyes"; then
- 	CFLAGS="$CFLAGS -g -O"
- fi
- 
--# Warnings are there for a reason
--CFLAGS="$CFLAGS -Wall -Werror -ansi"
--
- # Use gnome-doc-utils:
- 
- gdu_cv_version_required=0.9.0