From a1a6f6b283cc245c0fd57b7297244913cb07b015 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Thu, 9 Dec 2004 19:29:24 +0000 Subject: [PATCH] Gah - fix. SVN revision: 12425 --- legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c index e8d01c5da4..400680bc57 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c @@ -73,27 +73,28 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win, Ecore_X_Atom atom, 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; } /*