From d9d731804162bf023b569676cd5d52ec94677432 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sat, 26 Jan 2013 22:22:39 +0000 Subject: [PATCH] termpty_init/shutdown() are now called globally SVN revision: 83360 --- src/bin/main.c | 6 +++++- src/bin/termio.c | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index c8f57157..22c09430 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -1229,7 +1229,9 @@ main_term_new(Win *wn, Config *config, const char *cmd, if (!term) return NULL; if (!config) abort(); - + + termpty_init(); + term->wn = wn; term->hold = hold; term->config = config; @@ -2051,6 +2053,8 @@ remote: main_win_free(wn); } + termpty_shutdown(); + config_shutdown(); eina_log_domain_unregister(_log_domain); _log_domain = -1; diff --git a/src/bin/termio.c b/src/bin/termio.c index 871778ca..ba53deba 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -2358,8 +2358,6 @@ _smart_del(Evas_Object *obj) sd->glayer = NULL; ecore_imf_shutdown(); - termpty_shutdown(); - _parent_sc.del(obj); } @@ -2564,7 +2562,6 @@ termio_add(Evas_Object *parent, Config *config, const char *cmd, Eina_Bool login ELM_GESTURE_STATE_ABORT, _smart_cb_gest_zoom_abort, obj); - termpty_init(); sd->pty = termpty_new(cmd, login_shell, cd, w, h, config->scrollback); sd->pty->cb.change.func = _smart_pty_change;