rpms/gnome-desktop/F-12 randr-version.patch, NONE, 1.1 gnome-desktop.spec, 1.236, 1.237

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25792

Modified Files:
	gnome-desktop.spec 
Added Files:
	randr-version.patch 
Log Message:
fix another crash


randr-version.patch:
 gnome-rr.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE randr-version.patch ---
diff -up gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c.randr-version gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c
--- gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c.randr-version	2010-01-08 17:22:42.737310057 -0500
+++ gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c	2010-01-08 17:21:45.367310228 -0500
@@ -630,6 +630,10 @@ gnome_rr_screen_new (GdkScreen *gdk_scre
 	screen->randr_event_base = event_base;
 
 	XRRQueryVersion (dpy, &screen->rr_major_version, &screen->rr_minor_version);
+	if (screen->rr_minor_version < 2) {
+	    g_free (screen);
+	    return NULL;
+	}
 
 	screen->info = screen_info_new (screen, TRUE, error);
 	


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- gnome-desktop.spec	8 Jan 2010 18:15:18 -0000	1.236
+++ gnome-desktop.spec	8 Jan 2010 22:46:34 -0000	1.237
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -24,9 +24,10 @@ Patch3: ignore-xrandr-badmatch.patch
 Patch4: per-monitor-background.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601753
 Patch5: slideshow.patch
-
-#
+# https://bugzilla.gnome.org/show_bug.cgi?id=606456
 Patch6: gnome-desktop-crash.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=606457
+Patch7: randr-version.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -91,6 +92,7 @@ libgnomedesktop.
 %patch4 -p1 -b .per-monitor-background
 %patch5 -p1 -b .slideshow
 %patch6 -p1 -b .crash
+%patch7 -p1 -b .randr-version
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -138,8 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Jan  8 2010 Matthias Clasen <mclasen at redhat.com> - 2.28.2-3
+- Fix another crash in gnome-settings-daemon (#551780)
+
 * Fri Jan  8 2010 Matthias Clasen <mclasen at redhat.com> - 2.28.2-2
-- Fix a crash in gnome-settings-daemon (#381629)
+- Fix a crash in gnome-settings-daemon (#552368)
 
 * Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
 - Update to 2.28.2