commit d9f0cca94f16628cb273cadfe25bd5998ac3c178
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 7 18:20:12 2009 -0400
Adapt to RANDR 1.3's name for the EDID property.
1.2 calls it EDID_DATA, 1.3 calls it EDID. Try the 1.3 name first since
1.2 will eventually be rare.
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index a3a8b2c..b788600 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -866,13 +866,21 @@ get_property (Display *dpy,
static guint8 *
read_edid_data (GnomeRROutput *output)
{
- Atom edid_atom = XInternAtom (DISPLAY (output), "EDID_DATA", FALSE);
+ Atom edid_atom;
guint8 *result;
int len;
-
+
+ edid_atom = XInternAtom (DISPLAY (output), "EDID", FALSE);
result = get_property (DISPLAY (output),
output->id, edid_atom, &len);
-
+
+ if (!result)
+ {
+ edid_atom = XInternAtom (DISPLAY (output), "EDID_DATA", FALSE);
+ result = get_property (DISPLAY (output),
+ output->id, edid_atom, &len);
+ }
+
if (result)
{
if (len % 128 == 0)