rpms/gnome-desktop/devel ignore-xrandr-badmatch.patch, NONE, 1.1 gnome-desktop.spec, 1.227, 1.228

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23868

Modified Files:
	gnome-desktop.spec 
Added Files:
	ignore-xrandr-badmatch.patch 
Log Message:
ignore x errors when setting screen size


ignore-xrandr-badmatch.patch:
 gnome-rr.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ignore-xrandr-badmatch.patch ---
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



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- gnome-desktop.spec	2 Nov 2009 05:25:53 -0000	1.227
+++ gnome-desktop.spec	9 Nov 2009 19:44:03 -0000	1.228
@@ -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 at redhat.com> - 2.28.1-3
+- Ignore X errors when setting screen size (gnome #599914)
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Support proper gamma setting in multihead setups