diff options
author | David Walter Seikel | 2014-05-17 11:12:12 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-17 11:12:12 +1000 |
commit | e615cf693dea7636a1561f8f76d201a3efe61a31 (patch) | |
tree | 6c0913a443ebe154b331d7fdad9a184e719a591c | |
parent | Don't sleep to wait for reconnecting, use a timer instead. (diff) | |
download | SledjHamr-e615cf693dea7636a1561f8f76d201a3efe61a31.zip SledjHamr-e615cf693dea7636a1561f8f76d201a3efe61a31.tar.gz SledjHamr-e615cf693dea7636a1561f8f76d201a3efe61a31.tar.bz2 SledjHamr-e615cf693dea7636a1561f8f76d201a3efe61a31.tar.xz |
Remove excess sleep and env setting.
-rw-r--r-- | src/extantz/extantz.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 07fe817..80306b9 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -544,7 +544,7 @@ void overlay_add(globals *ourGlobals) | |||
544 | EAPI_MAIN int elm_main(int argc, char **argv) | 544 | EAPI_MAIN int elm_main(int argc, char **argv) |
545 | { | 545 | { |
546 | GLData *gld = NULL; | 546 | GLData *gld = NULL; |
547 | char buf[PATH_MAX * 2], *env; | 547 | char buf[PATH_MAX * 2]; |
548 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. | 548 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. |
549 | 549 | ||
550 | /* Set the locale according to the system pref. | 550 | /* Set the locale according to the system pref. |
@@ -565,21 +565,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
565 | logDom = loggingStartup("extantz", logDom); | 565 | logDom = loggingStartup("extantz", logDom); |
566 | ourGlobals.running = 1; | 566 | ourGlobals.running = 1; |
567 | 567 | ||
568 | // Add extras, so we can run test.lua later. | 568 | // TODO - Should use Ecore_Exe for this sort of thing. |
569 | env = getenv("LUA_CPATH"); | ||
570 | if (!env) env = ""; | ||
571 | sprintf(buf, "%s;%s/src/GuiLua/?.so", env, elm_app_bin_dir_get()); | ||
572 | setenv("LUA_CPATH", buf, 1); | ||
573 | |||
574 | env = getenv("LUA_PATH"); | ||
575 | if (!env) env = ""; | ||
576 | sprintf(buf, "%s;%s/src/GuiLua/?.lua", env, elm_app_bin_dir_get()); | ||
577 | setenv("LUA_PATH", buf, 1); | ||
578 | |||
579 | // TODO - Should use Ecore_Exe for this sort of thing, and write a more robust way of connecting to servers than random sleeps. | ||
580 | sprintf(buf, "%s/love &", elm_app_bin_dir_get()); | 569 | sprintf(buf, "%s/love &", elm_app_bin_dir_get()); |
581 | system(buf); | 570 | system(buf); |
582 | sleep(1); | ||
583 | 571 | ||
584 | // Don't do this, we need to clean up other stuff to, so set a clean up function below. | 572 | // Don't do this, we need to clean up other stuff to, so set a clean up function below. |
585 | //elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); | 573 | //elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); |