Ecore: Backport randr_output_modes_get fix.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@76965 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index fd2ab38..9db1969 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -944,3 +944,6 @@
        * Fix ecore_x_image_is_argb32_get() to return correctly on
        endianess.
 
+2012-09-21  Christopher Michael
+
+       * Fix ecore_x_randr to properly return output modes from ecore_x_randr_output_modes_get

diff --git a/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/src/lib/ecore_x/xlib/ecore_x_randr_12.c
index 0ee009a..97f1d0c 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_randr_12.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr_12.c
@@ -1590,13 +1590,13 @@ ecore_x_randr_output_modes_get(Ecore_X_Window root,
      {
         if ((modes = malloc(sizeof(Ecore_X_Randr_Mode) * output_info->nmode)))
           {
-             memcpy(modes, output_info->modes,
-                    (sizeof(Ecore_X_Randr_Mode) * output_info->nmode));
-             if (num)
-               *num = output_info->nmode;
+             int i = 0;
+
+             if (num) *num = output_info->nmode;
+             if (npreferred) *npreferred = output_info->npreferred;
 
-             if (npreferred)
-               *npreferred = output_info->npreferred;
+             for (i = 0; i < output_info->nmode; i++)
+               modes[i] = output_info->modes[i];
           }
      }