Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c x.c
Log Message:
Cleanups, issue warning on missing unregistration.
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- eobj.c 29 Apr 2006 19:39:21 -0000 1.73
+++ eobj.c 2 May 2006 20:06:32 -0000 1.74
@@ -216,7 +216,11 @@
Eprintf("EobjFini: %#lx %s\n", EobjGetXwin(eo), eo->name);
EobjListStackDel(eo);
- if (!eo->external)
+ if (eo->external)
+ {
+ EUnregisterWindow(eo->win);
+ }
+ else
{
EDestroyWindow(eo->win);
eo->gone = 1;
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- x.c 29 Apr 2006 19:39:21 -0000 1.129
+++ x.c 2 May 2006 20:06:32 -0000 1.130
@@ -216,15 +216,7 @@
xid = EXidFind(win);
if (!xid)
- {
- ERegisterWindow(Xwin(win)); /* FIXME - We shouldn't go here */
- xid = EXidFind(win);
- if (!xid)
- {
- Eprintf("EventCallbackRegister win=%#lx ???\n", Xwin(win));
- return;
- }
- }
+ return;
#if 0
Eprintf("EventCallbackRegister: %p %#lx\n", xid, win);
#endif
@@ -674,8 +666,14 @@
EXID *xid;
xid = EXidLookup(xwin);
- if (xid)
- EXidDel(xid); /* FIXME - We shouldn't go here */
+ if (!xid)
+ return;
+
+ /* FIXME - We shouldn't go here */
+ EXidDel(xid);
+#if 1 /* Debug - Fix code if we get here */
+ Eprintf("*** FIXME - EUnregisterXwin %#lx\n", xwin);
+#endif
}
void
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
