Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
ecore-e16.c ipc.c
Log Message:
Oops - fix.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecore-e16.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ecore-e16.c 8 Dec 2004 20:06:14 -0000 1.1.2.6
+++ ecore-e16.c 9 Dec 2004 19:22:20 -0000 1.1.2.7
@@ -132,27 +132,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;
}
/*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.36
retrieving revision 1.174.2.37
diff -u -3 -r1.174.2.36 -r1.174.2.37
--- ipc.c 21 Nov 2004 09:43:02 -0000 1.174.2.36
+++ ipc.c 9 Dec 2004 19:22:20 -0000 1.174.2.37
@@ -1384,6 +1384,7 @@
"No resize H/V %i/%i Shaped %i\n"
"Base, min, max, inc w/h %ix%i, %ix%i, %ix%i %ix%i\n"
"Aspect min, max %5.5f, %5.5f\n"
+ "Struts lrtb %i,%i,%i,%i\n"
"MWM border %i resizeh %i title %i menu %i minimize %i maximize
%i\n"
"NeedsInput %i TakeFocus %i FocusNever %i FocusClick
%i\n"
"NeverUseArea %i FixedPos %i\n"
@@ -1411,12 +1412,15 @@
ewin->client.shaped, ewin->client.base_w, ewin->client.base_h,
ewin->client.width.min, ewin->client.height.min,
ewin->client.width.max, ewin->client.height.max,
- ewin->client.w_inc, ewin->client.h_inc, ewin->client.aspect_min,
- ewin->client.aspect_max, ewin->client.mwm_decor_border,
- ewin->client.mwm_decor_resizeh, ewin->client.mwm_decor_title,
- ewin->client.mwm_decor_menu, ewin->client.mwm_decor_minimize,
- ewin->client.mwm_decor_maximize, ewin->client.need_input,
- ewin->client.take_focus, ewin->neverfocus, ewin->focusclick,
+ ewin->client.w_inc, ewin->client.h_inc,
+ ewin->client.aspect_min, ewin->client.aspect_max,
+ ewin->strut.left, ewin->strut.right,
+ ewin->strut.top, ewin->strut.bottom,
+ ewin->client.mwm_decor_border, ewin->client.mwm_decor_resizeh,
+ ewin->client.mwm_decor_title, ewin->client.mwm_decor_menu,
+ ewin->client.mwm_decor_minimize, ewin->client.mwm_decor_maximize,
+ ewin->client.need_input, ewin->client.take_focus,
+ ewin->neverfocus, ewin->focusclick,
ewin->never_use_area, ewin->fixedpos, EoGetDesk(ewin),
EoGetLayer(ewin), ewin->iconified, EoIsSticky(ewin), ewin->shaded,
ewin->docked, ewin->state, ewin->shown, ewin->active,
-------------------------------------------------------
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
