Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c eobj.c
Log Message:
Fix segv when lowering number of desktops.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ecompmgr.c 11 Jun 2005 11:45:55 -0000 1.38
+++ ecompmgr.c 14 Jun 2005 23:06:04 -0000 1.39
@@ -1248,10 +1248,8 @@
{
ECmWinInfo *cw = eo->cmhook;
-#if 0 /* FIXME - Why? */
if (!cw)
return;
-#endif
D1printf("ECompMgrWinDel %#lx\n", eo->win);
@@ -1263,12 +1261,9 @@
}
else
{
- if (cw && !eo->gone && Conf_compmgr.mode == ECM_MODE_WINDOW)
+ if (!eo->gone && Conf_compmgr.mode == ECM_MODE_WINDOW)
XCompositeUnredirectWindow(disp, eo->win, CompositeRedirectManual);
- }
- if (cw)
- {
ECompMgrWinInvalidate(eo, INV_ALL);
if (!eo->gone)
@@ -1279,9 +1274,9 @@
if (cw->damage != None)
XDamageDestroy(disp, cw->damage);
}
-
- _EFREE(eo->cmhook);
}
+
+ _EFREE(eo->cmhook);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- eobj.c 12 Jun 2005 07:56:30 -0000 1.36
+++ eobj.c 14 Jun 2005 23:06:15 -0000 1.37
@@ -186,7 +186,8 @@
Eprintf("EobjFini: %#lx %s\n", eo->win, eo->name);
#if USE_COMPOSITE
- ECompMgrWinDel(eo);
+ if (eo->cmhook)
+ ECompMgrWinDel(eo);
#endif
EobjListStackDel(eo);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
