gnome-desktop r5409 - trunk/libgnome-desktop

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Feb 20 03:50:37 2009
New Revision: 5409
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5409&view=rev

Log:
        * gnome-rr.c (fill_out_screen_info): Revert the change from
        2009-01-19 and go back to using XRRGetScreenResources. This
        fixes the "Detect Monitors" button in the Screen Resolution
        capplet.



Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-rr.c

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Fri Feb 20 03:50:37 2009
@@ -362,11 +362,7 @@
 	     screen->min_height, screen->max_height);
 #endif
     
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-    resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
-#else
     resources = XRRGetScreenResources (xdisplay, xroot);
-#endif
     
     if (resources)
     {