Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c ecompmgr.c x.c
Log Message:
Various fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -3 -r1.262 -r1.263
--- borders.c 21 May 2005 20:58:18 -0000 1.262
+++ borders.c 2 Jun 2005 19:01:55 -0000 1.263
@@ -48,7 +48,7 @@
if ((ewb->cx != ewb->x) || (ewb->cy != ewb->y) ||
(ewb->cw != ewb->w) || (ewb->ch != ewb->h))
{
- if ((ewb->w < 0) || (ewb->h < 0))
+ if ((ewb->w <= 0) || (ewb->h <= 0))
{
EUnmapWindow(ewb->win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ecompmgr.c 2 Jun 2005 17:44:41 -0000 1.33
+++ ecompmgr.c 2 Jun 2005 19:02:13 -0000 1.34
@@ -1291,7 +1291,7 @@
{
ECmWinInfo *cw = eo->cmhook;
-#if 0
+#if 0 /* FIXME - Why? */
if (!cw)
return;
#endif
@@ -1306,7 +1306,7 @@
}
else
{
- if (!eo->gone && Conf_compmgr.mode == ECM_MODE_WINDOW)
+ if (cw && !eo->gone && Conf_compmgr.mode == ECM_MODE_WINDOW)
XCompositeUnredirectWindow(disp, eo->win, CompositeRedirectManual);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- x.c 29 May 2005 09:34:58 -0000 1.94
+++ x.c 2 Jun 2005 19:02:13 -0000 1.95
@@ -434,14 +434,18 @@
int i, num;
EXidDelete(win);
- XDestroyWindow(disp, win);
+ if (xid->parent != None)
+ XDestroyWindow(disp, win);
+
lst = (EXID **) ListItemType(&num, LIST_TYPE_XID);
if (lst)
{
for (i = 0; i < num; i++)
{
- if (lst[i]->parent == win)
- EDestroyWindow(lst[i]->win);
+ if (lst[i]->parent != win)
+ continue;
+ lst[i]->parent = None;
+ EDestroyWindow(lst[i]->win);
}
Efree(lst);
}
-------------------------------------------------------
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
