Cleanups, issue warning on missing unregistration.
SVN revision: 22444
This commit is contained in:
parent
10f06763c6
commit
bd6d2a8632
|
@ -216,7 +216,11 @@ EobjFini(EObj * eo)
|
|||
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;
|
||||
|
|
20
src/x.c
20
src/x.c
|
@ -216,15 +216,7 @@ EventCallbackRegister(Win win, int type __UNUSED__, EventCallbackFunc * func,
|
|||
|
||||
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 @@ EUnregisterXwin(Window xwin)
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue