rpms/metacity/devel metacity-2.18.5-dont-deref-null-pointer.patch, NONE, 1.1 metacity.spec, 1.129, 1.130

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23716

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- fix crash on logout (and on the subsequent login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c
--- metacity-2.18.5/src/session.c.dont-deref-null-pointer	2007-09-11 15:41:23.000000000 -0400
+++ metacity-2.18.5/src/session.c	2007-09-11 15:41:34.000000000 -0400
@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter
 
       display_iter = display_iter->next;
     }
-  /* don't need to free displays */
-  displays = NULL;
 
   if (lame == NULL)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- metacity.spec	21 Aug 2007 21:19:09 -0000	1.129
+++ metacity.spec	11 Sep 2007 19:48:23 -0000	1.130
@@ -7,10 +7,11 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
+Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +65,7 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
+%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +152,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.19.55-4
+- fix crash on logout (and on the subsequent login, bug 243761)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.19.55-3
 - Rebuild for build id