diff -u gnome-desktop-2.28.1/debian/changelog gnome-desktop-2.28.1/debian/changelog
--- gnome-desktop-2.28.1/debian/changelog
+++ gnome-desktop-2.28.1/debian/changelog
@@ -1,3 +1,12 @@
+gnome-desktop (1:2.28.1-0ubuntu3) karmic-proposed; urgency=low
+
+  * debian/patches/101_trap_rr_x_errors.patch:
+    - XRRGetScreenResources is only available on RANDR 1.2 and above.
+      Trap and handle the BadRequest error when called on servers which 
+      don't implement this call, instead of crashing (LP: #454487) 
+
+ -- Chris Coulson <chrisccoulson@ubuntu.com>  Fri, 23 Oct 2009 23:23:56 +0100
+
 gnome-desktop (1:2.28.1-0ubuntu2) karmic; urgency=low
 
   * debian/patches/80_correct_version_update.patch:
only in patch2:
unchanged:
--- gnome-desktop-2.28.1.orig/debian/patches/101_trap_rr_x_errors.patch
+++ gnome-desktop-2.28.1/debian/patches/101_trap_rr_x_errors.patch
@@ -0,0 +1,26 @@
+diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.28.1/libgnome-desktop/gnome-rr.c gnome-desktop-2.28.1.new/libgnome-desktop/gnome-rr.c
+--- gnome-desktop-2.28.1/libgnome-desktop/gnome-rr.c	2009-08-19 16:51:03.000000000 +0100
++++ gnome-desktop-2.28.1.new/libgnome-desktop/gnome-rr.c	2009-10-31 01:11:51.382756270 +0000
+@@ -375,6 +375,8 @@
+ 
+     /* First update the screen resources */
+ 
++	gdk_error_trap_push ();
++
+     if (needs_reprobe)
+         resources = XRRGetScreenResources (xdisplay, xroot);
+     else
+@@ -394,6 +396,13 @@
+ #endif
+     }
+ 
++	gdk_flush ();
++	if (gdk_error_trap_pop ()) {
++		g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_UNKNOWN,
++			 	_("unhandled X error while getting the screen resources"));
++	    return FALSE;
++	}
++
+     if (resources)
+     {
+ 	if (!fill_screen_info_from_resources (info, resources, error))