Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
Entranced.h spawner.c
Log Message:
Fix for respawn bug -- apparently is being too smart and freeing the exes
automatically.
This also fixes the warnings about attempting to free already freed exe handles.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/Entranced.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Entranced.h 15 May 2004 16:12:00 -0000 1.6
+++ Entranced.h 20 May 2004 04:02:09 -0000 1.7
@@ -19,7 +19,7 @@
#define ENTRANCED_DEBUG 1
#define X_SERVER "/usr/X11R6/bin/X -quiet"
-/*#define X_SERVER "/usr/X11R6/bin/Xnest -full"*/
+//#define X_SERVER "/usr/X11R6/bin/Xnest -full"
#define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
#define ENTRANCE PREFIX "/bin/entrance_wrapper"
#define PIDFILE "/var/run/entranced.pid"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- spawner.c 19 May 2004 03:48:15 -0000 1.20
+++ spawner.c 20 May 2004 04:02:09 -0000 1.21
@@ -221,14 +221,6 @@
int
Entranced_X_Restart(Entranced_Display * d)
{
- /* Reinitialize display handle */
- if (d->e_exe)
- ecore_exe_free(d->e_exe);
- d->e_exe = NULL;
- if (d->x_exe)
- ecore_exe_free(d->x_exe);
- d->x_exe = NULL;
-
/* Attempt to restart X server */
d->status = NOT_RUNNING;
@@ -308,9 +300,9 @@
}
is_respawning = 1;
- respawn_timer = ecore_timer_add(5.0, Entranced_Respawn_Reset, d);
+ respawn_timer = ecore_timer_add(1.0, Entranced_Respawn_Reset, d);
- if (e->exe == d->e_exe && e->pid == ecore_exe_pid_get(d->e_exe))
+ if (e->exe == d->e_exe || e->pid == ecore_exe_pid_get(d->e_exe))
{
/* Session exited or crashed */
if (e->exited)
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
