Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_netwm.c
Log Message:
Gah - fix.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_x_netwm.c 8 Dec 2004 20:29:45 -0000 1.5
+++ ecore_x_netwm.c 9 Dec 2004 19:29:24 -0000 1.6
@@ -73,27 +73,28 @@
unsigned long bytes_after, num_ret;
int format_ret;
unsigned int i;
+ int num;
prop_ret = NULL;
XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
- ECORE_X_ATOM_UTF8_STRING, &type_ret,
- &format_ret, &num_ret, &bytes_after, &prop_ret);
- if (prop_ret && num_ret > 0 && format_ret == 32)
+ XA_CARDINAL, &type_ret, &format_ret, &num_ret,
+ &bytes_after, &prop_ret);
+ if (prop_ret && type_ret == XA_CARDINAL && format_ret == 32)
{
if (num_ret < len)
len = num_ret;
for (i = 0; i < len; i++)
- val[i] = prop_ret[i];
+ val[i] = ((unsigned long *)prop_ret)[i];
+ num = len;
}
else
{
- if (!prop_ret || format_ret != 32)
- len = -1;
+ num = -1;
}
if (prop_ret)
XFree(prop_ret);
- return len;
+ return num;
}
/*
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
