Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c dialog.c iconify.c pager.c
Log Message:
Fix a number of segv's introduced during Win API change.
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- eobj.c 2 May 2006 20:06:32 -0000 1.74
+++ eobj.c 11 May 2006 20:47:26 -0000 1.75
@@ -216,19 +216,19 @@
Eprintf("EobjFini: %#lx %s\n", EobjGetXwin(eo), eo->name);
EobjListStackDel(eo);
- if (eo->external)
- {
- EUnregisterWindow(eo->win);
- }
- else
- {
- EDestroyWindow(eo->win);
- eo->gone = 1;
- }
+
#if USE_COMPOSITE
+ if (!eo->external)
+ eo->gone = 1; /* Actually not yet (but soon) */
+
if (eo->cmhook)
ECompMgrWinDel(eo);
#endif
+
+ if (eo->external)
+ EUnregisterWindow(eo->win);
+ else
+ EDestroyWindow(eo->win);
if (eo->name)
Efree(eo->name);
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- dialog.c 8 May 2006 16:26:22 -0000 1.157
+++ dialog.c 11 May 2006 20:47:26 -0000 1.158
@@ -551,6 +551,7 @@
DialogEwinClose(EWin * ewin)
{
DialogDestroy(ewin->data);
+ ewin->client.win = NULL;
ewin->data = NULL;
}
===================================================================
RCS file: /cvs/e/e16/e/src/iconify.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- iconify.c 10 May 2006 22:42:27 -0000 1.205
+++ iconify.c 11 May 2006 20:47:26 -0000 1.206
@@ -558,6 +558,7 @@
IconboxEwinClose(EWin * ewin)
{
IconboxDestroy(ewin->data, 0);
+ ewin->client.win = NULL;
ewin->data = NULL;
}
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -3 -r1.213 -r1.214
--- pager.c 7 May 2006 16:21:37 -0000 1.213
+++ pager.c 11 May 2006 20:47:26 -0000 1.214
@@ -615,6 +615,7 @@
PagerEwinClose(EWin * ewin)
{
PagerDestroy(ewin->data);
+ ewin->client.win = NULL;
ewin->data = NULL;
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
