Re: Display configuration capplet

[Bryce Harrington <bryce canonical com>]

Soeren, attached are a couple patches verified to fix breakage when run
on systems with questionable xrandr support.

https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/197153

Bryce

diff -Nurp gnome-settings-daemon-2.21.91-patched/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.21.91-working/plugins/xrandr/gsd-xrandr-manager.c
--- gnome-settings-daemon-2.21.91-patched/plugins/xrandr/gsd-xrandr-manager.c	2008-03-03 16:48:36.000000000 -0800
+++ gnome-settings-daemon-2.21.91-working/plugins/xrandr/gsd-xrandr-manager.c	2008-03-03 17:14:22.000000000 -0800
@@ -107,6 +107,7 @@ gboolean
 gsd_xrandr_manager_start (GsdXrandrManager *manager,
                           GError          **error)
 {
+#ifdef HAVE_RANDR
         RWScreen *rw_screen;
         
         g_debug ("Starting xrandr manager");
@@ -118,7 +119,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
         gdk_add_client_message_filter (gnome_randr_atom(),
                                        on_client_message,
                                        rw_screen);
-        
+#endif /* HAVE_RANDR */
         return TRUE;
 }
 

diff -Nurp gnome-desktop-2.21.92-patched/libgnome-desktop/randrwrap.c gnome-desktop-2.21.92-working/libgnome-desktop/randrwrap.c
--- gnome-desktop-2.21.92-patched/libgnome-desktop/randrwrap.c	2008-03-03 16:50:17.000000000 -0800
+++ gnome-desktop-2.21.92-working/libgnome-desktop/randrwrap.c	2008-03-03 16:52:40.000000000 -0800
@@ -574,7 +574,7 @@ output_initialize (RWOutput *output, XRR
     
     g_print ("Output %lx Timestamp: %u\n", output->id, (guint32)info->timestamp);
 	
-    if (!info)
+    if (!info || !output->info)
     {
 	/* FIXME */
 	return;