From 33a5e82101b1db2f72f444c04c8b2a02ed3b7f8c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Nov 09 2009 19:44:03 +0000
Subject: ignore x errors when setting screen size


---

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 7a94ad1..4097235 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -12,12 +12,14 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.1
-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
 # https://bugzilla.gnome.org/show_bug.cgi?id=597874
 Patch2: randr-gamma.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599914
+Patch3: ignore-xrandr-badmatch.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -78,6 +80,7 @@ libgnomedesktop.
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
 %patch2 -p1 -b .randr-gamma
+%patch3 -p1 -b .ignore-xrandr-badmatch
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -125,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Nov  9 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.1-3
+- Ignore X errors when setting screen size (gnome #599914)
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.1-2
 - Support proper gamma setting in multihead setups
 
diff --git a/ignore-xrandr-badmatch.patch b/ignore-xrandr-badmatch.patch
new file mode 100644
index 0000000..7af07f1
--- /dev/null
+++ b/ignore-xrandr-badmatch.patch
@@ -0,0 +1,17 @@
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 6f23fbb..b744e38 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -683,8 +683,11 @@ gnome_rr_screen_set_size (GnomeRRScreen *screen,
+ {
+     g_return_if_fail (screen != NULL);
+     
++    gdk_error_trap_push ();
+     XRRSetScreenSize (screen->xdisplay, screen->xroot,
+ 		      width, height, mm_width, mm_height);
++    gdk_flush ();
++    gdk_error_trap_pop (); /* ignore error */
+ }
+ 
+ void
+