discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5a7b3c5cf9ff5aedc8a20e1c3c7de4d15de175d1
commit 5a7b3c5cf9ff5aedc8a20e1c3c7de4d15de175d1 Author: Chris Michael <[email protected]> Date: Mon Sep 8 12:30:34 2014 -0400 xwayland: Add code to cleanup xwayland on shutdown Signed-off-by: Chris Michael <[email protected]> --- src/modules/xwayland/e_mod_main.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c index f1f6144..0f887f7 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -229,6 +229,8 @@ fail: close(wms[1]); exs->wm_fd = wms[0]; + /* TODO: watch process ?? */ + if (exs->abs_hdlr) ecore_main_fd_handler_del(exs->abs_hdlr); if (exs->unx_hdlr) @@ -354,5 +356,24 @@ lock: EAPI int e_modapi_shutdown(E_Module *m EINA_UNUSED) { + char path[256]; + + if (!exs) return 1; + + unlink(exs->lock); + + snprintf(path, sizeof(path), "/tmp/.X11-unix/X%d", exs->disp); + unlink(path); + + if (exs->abs_hdlr) ecore_main_fd_handler_del(exs->abs_hdlr); + if (exs->unx_hdlr) ecore_main_fd_handler_del(exs->unx_hdlr); + + close(exs->abs_fd); + close(exs->unx_fd); + + if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); + + free(exs); + return 1; } --
