Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_netwm.c
Log Message:
Fix.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ecore_x_netwm.c 3 Jun 2005 01:18:58 -0000 1.20
+++ ecore_x_netwm.c 3 Jun 2005 05:38:20 -0000 1.21
@@ -760,6 +760,7 @@
ecore_x_netwm_icon_get(Ecore_X_Window win, int *width, int *height, unsigned
int **data, int *num)
{
unsigned char *data_ret;
+ unsigned int *icon;
unsigned int *src;
int num_ret, len;
@@ -770,6 +771,7 @@
if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_NET_WM_ICON,
XA_CARDINAL, 32, &data_ret, &num_ret))
return 0;
+ icon = (unsigned int *)data_ret;
if (data)
{
@@ -778,13 +780,13 @@
}
if (num) *num = (num_ret - 2);
- if (width) *width = ((unsigned int *)data_ret)[0];
- if (height) *height = ((unsigned int *)data_ret)[1];
+ if (width) *width = icon[0];
+ if (height) *height = icon[1];
- len = ((unsigned int *)data_ret)[0] * ((unsigned int *)data_ret)[1];
- src = &(((unsigned int *)data_ret)[2]);
+ len = icon[0] * icon[1];
+ src = &(icon[2]);
if (data)
- memcpy(*data, &(data_ret[2]), len * sizeof(unsigned int));
+ memcpy(*data, &(icon[2]), len * sizeof(unsigned int));
free(data_ret);
return 1;
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
