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