Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_main.c e_signals.c
Log Message:
fix some env vars to use namespacing
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -3 -r1.192 -r1.193
--- e_config.c 20 Aug 2006 04:48:27 -0000 1.192
+++ e_config.c 20 Aug 2006 08:22:18 -0000 1.193
@@ -45,7 +45,7 @@
EAPI int
e_config_init(void)
{
- _e_config_profile = getenv("CONF_PROFILE");
+ _e_config_profile = getenv("E_CONF_PROFILE");
if (!_e_config_profile)
{
Eet_File *ef;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -3 -r1.176 -r1.177
--- e_main.c 20 Aug 2006 04:48:27 -0000 1.176
+++ e_main.c 20 Aug 2006 08:22:19 -0000 1.177
@@ -95,8 +95,8 @@
sigaction(SIGABRT, &action, NULL);
t = ecore_time_get();
- s = getenv("START_TIME");
- if ((s) && (getenv("CRASHED")))
+ s = getenv("E_START_TIME");
+ if ((s) && (!getenv("E_RESTART_OK")))
{
tstart = atof(s);
if ((t - tstart) < 5.0)
@@ -104,11 +104,10 @@
safe_mode = 1;
}
}
- e_util_env_set("CRASHED", NULL);
tstart = t;
snprintf(buf, sizeof(buf), "%1.1f", tstart);
- e_util_env_set("START_TIME", buf);
+ e_util_env_set("E_START_TIME", buf);
/* FIXME: this is the init code for letting e be relocatable. right now
* its not used - so i want to see if it can reliably determine its exe
@@ -159,12 +158,12 @@
/* for debugging by redirecting stdout of e to a log file to tail */
setvbuf(stdout, NULL, _IONBF, 0);
- if (getenv("NOSTARTUP")) nostartup = 1;
- if (getenv("RESTART")) after_restart = 1;
+ if (getenv("E_RESTART")) after_restart = 1;
if (getenv("DESKTOP_STARTUP_ID")) e_util_env_set("DESKTOP_STARTUP_ID",
NULL);
- e_util_env_set("RESTART", "1");
+ e_util_env_set("E_RESTART_OK", NULL);
+ e_util_env_set("E_RESTART", "1");
/* envrionment varabiles so you know E is running/launched you */
e_util_env_set("PANTS", "ON");
@@ -194,22 +193,24 @@
{
good = 1;
evil = 0;
+ printf("LA LA LA\n");
}
else if (!strcmp(argv[i], "-evil"))
{
good = 0;
evil = 1;
+ printf("MUHAHAHAHHAHAHAHAHA\n");
}
else if (!strcmp(argv[i], "-psychotic"))
{
good = 1;
evil = 1;
+ printf("MUHAHALALALALALALALA\n");
}
else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1)))
{
i++;
-
- e_util_env_set("CONF_PROFILE", argv[i]);
+ e_util_env_set("E_CONF_PROFILE", argv[i]);
}
else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "-help")) ||
@@ -734,6 +735,7 @@
e_app_unmonitor_all();
e_ipc_shutdown();
ecore_file_shutdown();
+ e_util_env_set("E_RESTART_OK", "1");
ecore_app_restart();
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_signals.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_signals.c 30 Jul 2006 19:34:05 -0000 1.13
+++ e_signals.c 20 Aug 2006 08:22:19 -0000 1.14
@@ -25,7 +25,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@@ -51,7 +50,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@@ -78,7 +76,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "ILL");
e_alert_show("This is very bad. Enlightenment has executed and illegal\n"
"instruction. This is most likely because Enlightenment or\n"
"a library it depends on has been compiled for a CPU type\n"
@@ -105,7 +102,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "FPE");
e_alert_show("This is very bad. Enlightenment has recieved a floating\n"
"point exception. This is probably due to a divide by 0\n"
"in Enlightenment or a library it depends on.\n"
@@ -131,7 +127,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "BUS");
e_alert_show("This is very bad. Enlightenment has recieved a bus error.\n"
"This could be for many reasons - accessing memory not in\n"
"its available address space or unable to be paged in.\n"
@@ -157,7 +152,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "ABRT");
e_alert_show("This is very bad. Enlightenment has recieved an abort.\n"
"This could be for many reasons - accessing memory not in\n"
"its available address space or unable to be paged in.\n"
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
