Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: ecore_x_netwm.c Log Message: fix ecore_x_netwm_icons_get() =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- ecore_x_netwm.c 8 Oct 2005 12:39:07 -0000 1.46 +++ ecore_x_netwm.c 9 Oct 2005 09:56:47 -0000 1.47 @@ -697,8 +697,14 @@ return 0; } + /* Fetch the icons */ + p = data; for (i = 0; i < icons; i++) { + len = p[0] * p[1]; + ((*icon)[i]).width = p[0]; + ((*icon)[i]).height = p[1]; + src = &(p[2]); ((*icon)[i]).data = malloc(len * sizeof(unsigned int)); if (!((*icon)[i]).data) { @@ -708,17 +714,7 @@ free(data_ret); return 0; } - } - /* Fetch the icons */ - p = data; - for (i = 0; i < icons; i++) - { - len = p[0] * p[1]; - ((*icon)[i]).width = p[0]; - ((*icon)[i]).height = p[1]; - src = &(p[2]); - ((*icon)[i]).data = malloc(len * sizeof(unsigned int)); memcpy(((*icon)[i]).data, src, len * sizeof(unsigned int)); p += (len + 2); ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs