Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
extinitwin.c session.c
Log Message:
Fix trouble with nested exits. Debug stuff tweaks.
===================================================================
RCS file: /cvs/e/e16/e/src/extinitwin.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- extinitwin.c 6 Apr 2007 22:20:07 -0000 1.21
+++ extinitwin.c 8 Dec 2007 14:01:27 -0000 1.22
@@ -112,7 +112,7 @@
i = 1;
Esnprintf(s, sizeof(s), "pix/wait%i.png", i);
- if (EDebug(EDBUG_TYPE_SESSION))
+ if (EDebug(EDBUG_TYPE_SESSION) > 1)
Eprintf("ExtInitWinCreate - child %s\n", s);
im = ThemeImageLoad(s);
===================================================================
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- session.c 2 Dec 2007 18:39:17 -0000 1.146
+++ session.c 8 Dec 2007 14:01:27 -0000 1.147
@@ -542,7 +542,7 @@
case EEXIT_RESTART:
SoundPlay("SOUND_WAIT");
#ifdef USE_EXT_INIT_WIN
- if (disp)
+ if (disp && !Mode.wm.window)
new_init_win_ext = ExtInitWinCreate();
#endif
EDisplayClose();
@@ -554,6 +554,8 @@
else if (!Mode.wm.master)
l +=
Esnprintf(s + l, sizeof(s) - l, " -m %d", Mode.wm.master_screen);
+ if (Mode.wm.window)
+ l += Esnprintf(s + l, sizeof(s) - l, " -w %dx%d", VRoot.w, VRoot.h);
#if USE_SM
if (sm_client_id)
l += Esnprintf(s + l, sizeof(s) - l, " -S %s", sm_client_id);
@@ -674,6 +676,9 @@
if (EDebug(EDBUG_TYPE_SESSION))
Eprintf("SessionExit: mode=%d(%d) prm=%s\n", mode, Mode.wm.exit_mode,
param);
+
+ if (Mode.wm.exiting)
+ return;
if (Mode.wm.startup || Mode.wm.in_signal_handler)
goto done;
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
