summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-02-20 17:16:54 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-02-20 17:16:54 +0900
commitc5ade50c9f9a7297db69f47fc12787b266a76b41 (patch)
treef9139103b0ea31cd2f41066c62f0f3fd4fcd62fc
parent61287fce389843c8cb1819556da08ec98241ca13 (diff)
Fix ecore-x edid fetch to ftech 128, not 100 bytes.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e8251947b..8bbb585492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-02-20 Carsten Haitzler (The Rasterman)
2
3 * Fix ecore-x edid fetch to ftech 128, not 100 bytes.
4
12013-02-20 Cedric Bail 52013-02-20 Cedric Bail
2 6
3 * Properly report file not found in Edje. 7 * Properly report file not found in Edje.
diff --git a/NEWS b/NEWS
index 8fa05e627a..cff0943344 100644
--- a/NEWS
+++ b/NEWS
@@ -175,3 +175,5 @@ Fixes:
175 * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes. 175 * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes.
176 * Evas: Fix Evas_Object_Text when LTR and RTL are used in the same paragraph. 176 * Evas: Fix Evas_Object_Text when LTR and RTL are used in the same paragraph.
177 * Properly report file not found in Edje. 177 * Properly report file not found in Edje.
178 * Fix ecore-x edid fetch to ftech 128, not 100 bytes.
179
diff --git a/src/lib/ecore_x/xlib/ecore_x_randr.c b/src/lib/ecore_x/xlib/ecore_x_randr.c
index ec016dbc0f..bda1c9e428 100644
--- a/src/lib/ecore_x/xlib/ecore_x_randr.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr.c
@@ -2698,7 +2698,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root EINA_UNUSED, Ecore_X_Randr_Out
2698 /* get the output property 2698 /* get the output property
2699 * 2699 *
2700 * NB: Returns 0 on success */ 2700 * NB: Returns 0 on success */
2701 if (!XRRGetOutputProperty(_ecore_x_disp, output, edid, 0, 100, False, False, 2701 if (!XRRGetOutputProperty(_ecore_x_disp, output, edid, 0, 128, False, False,
2702 AnyPropertyType, &type, &format, &nitems, 2702 AnyPropertyType, &type, &format, &nitems,
2703 &bytes, &prop)) 2703 &bytes, &prop))
2704 { 2704 {