Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: container.c dialog.c ewins.c magwin.c menus.c pager.c x.c Log Message: Cleanups around closing internal windows. =================================================================== RCS file: /cvs/e/e16/e/src/container.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- container.c 22 Jun 2008 13:34:42 -0000 1.23 +++ container.c 7 Aug 2008 23:17:04 -0000 1.24 @@ -174,9 +174,6 @@ ct->ops->Exit(ct, exiting); Efree(ct->name); - - EDestroyWindow(ct->win); - Efree(ct->objs); Efree(ct); @@ -286,7 +283,6 @@ _ContainerEwinClose(EWin * ewin) { ContainerDestroy((Container *) ewin->data, 0); - ewin->client.win = NULL; ewin->data = NULL; } @@ -1759,7 +1755,7 @@ case CONFIG_CLASSNAME: /* __NAME %s */ ct = ContainerFind(s2); if (ct) - ContainerDestroy(ct, 0); + EwinHide(ct->ewin); ct = ContainerCreate(s2); break; case TEXT_ORIENTATION: /* __ORIENTATION [ __HORIZONTAL | __VERTICAL ] */ =================================================================== RCS file: /cvs/e/e16/e/src/dialog.c,v retrieving revision 1.203 retrieving revision 1.204 diff -u -3 -r1.203 -r1.204 --- dialog.c 22 Jun 2008 13:38:19 -0000 1.203 +++ dialog.c 7 Aug 2008 23:17:04 -0000 1.204 @@ -260,7 +260,6 @@ TextclassFree(d->tclass); FreePmapMask(&(d->pmm_bg)); - EDestroyWindow(d->win); Efree(d); } @@ -497,7 +496,6 @@ _DialogEwinClose(EWin * ewin) { DialogDestroy((Dialog *) ewin->data); - ewin->client.win = NULL; ewin->data = NULL; } =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.234 retrieving revision 1.235 diff -u -3 -r1.234 -r1.235 --- ewins.c 11 Jul 2008 19:38:17 -0000 1.234 +++ ewins.c 7 Aug 2008 23:17:04 -0000 1.235 @@ -1488,14 +1488,14 @@ if (!EwinIsInternal(ewin) || ewin->state.iconified) return; - if (ewin->ops && ewin->ops->Close) - ewin->ops->Close(ewin); - if (EwinGetClientWin(ewin)) { ESelectInput(EwinGetClientWin(ewin), NoEventMask); XShapeSelectInput(disp, EwinGetClientXwin(ewin), NoEventMask); } + + if (ewin->ops && ewin->ops->Close) + ewin->ops->Close(ewin); EwinDestroy(ewin); } =================================================================== RCS file: /cvs/e/e16/e/src/magwin.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- magwin.c 24 May 2008 18:13:17 -0000 1.12 +++ magwin.c 7 Aug 2008 23:17:04 -0000 1.13 @@ -385,7 +385,6 @@ _MagEwinClose(EWin * ewin) { MagwinDestroy((MagWindow *) ewin->data); - ewin->client.win = NULL; ewin->data = NULL; MagWin = NULL; } =================================================================== RCS file: /cvs/e/e16/e/src/menus.c,v retrieving revision 1.304 retrieving revision 1.305 diff -u -3 -r1.304 -r1.305 --- menus.c 11 Jul 2008 19:38:18 -0000 1.304 +++ menus.c 7 Aug 2008 23:17:04 -0000 1.305 @@ -237,7 +237,9 @@ static void _MenuEwinClose(EWin * ewin) { - if ((Menu *) (ewin->data) == Mode_menus.active) + Menu *m = (Menu *) ewin->data; + + if (m == Mode_menus.active) { GrabKeyboardRelease(); Mode_menus.active = NULL; =================================================================== RCS file: /cvs/e/e16/e/src/pager.c,v retrieving revision 1.268 retrieving revision 1.269 diff -u -3 -r1.268 -r1.269 --- pager.c 24 May 2008 18:13:17 -0000 1.268 +++ pager.c 7 Aug 2008 23:17:04 -0000 1.269 @@ -158,7 +158,6 @@ PagerScanCancel(p); Efree(p->name); - EDestroyWindow(p->win); PagerHiwinHide(); if (p->bgpmap != None) EFreePixmap(p->bgpmap); @@ -679,7 +678,6 @@ _PagerEwinClose(EWin * ewin) { PagerDestroy((Pager *) ewin->data); - ewin->client.win = NULL; ewin->data = NULL; } =================================================================== RCS file: /cvs/e/e16/e/src/x.c,v retrieving revision 1.180 retrieving revision 1.181 diff -u -3 -r1.180 -r1.181 --- x.c 28 Jun 2008 18:54:59 -0000 1.180 +++ x.c 7 Aug 2008 23:17:04 -0000 1.181 @@ -256,7 +256,8 @@ if (!win) return; #if 0 - Eprintf("EventCallbackRegister: %p %#lx\n", win, win->xwin); + Eprintf("EventCallbackRegister: %p %#lx: func=%p prm=%p\n", win, win->xwin, + func, prm); #endif win->cbl.num++; @@ -277,7 +278,8 @@ if (!win) return; #if 0 - Eprintf("EventCallbackUnregister: %p %#lx\n", win, win->xwin); + Eprintf("EventCallbackUnregister: %p %#lx: func=%p prm=%p\n", win, win->xwin, + func, prm); #endif ecl = &win->cbl; ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs