From 6cd6c87210c931542c9b7841e520d8f453557c4b Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sat, 21 Jun 2014 18:53:25 +0200 Subject: [PATCH] cleanup config use --- src/bin/main.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 94e8f049..8e84b7f0 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -2377,8 +2377,8 @@ main_ipc_new(Ipc_Instance *inst) { Win *wn; Term *term; - Config *config; Split *sp; + Config *config; int pargc = 0, nargc, i; char **pargv = NULL, **nargv = NULL, geom[256]; @@ -2543,21 +2543,18 @@ main_ipc_new(Ipc_Instance *inst) nargv[i++] = "-e"; nargv[i++] = (char *)inst->cmd; } - config = config_fork(main_config); ecore_app_args_set(nargc, (const char **)nargv); wn = main_win_new(inst->name, inst->role, inst->title, inst->icon_name, - config, inst->fullscreen, inst->iconic, + main_config, inst->fullscreen, inst->iconic, inst->borderless, inst->override, inst->maximized); if (!wn) { ecore_app_args_set(pargc, (const char **)pargv); free(nargv); - config_del(config); return; } - - config = config_fork(config); - + config = wn->config; + unsetenv("DESKTOP_STARTUP_ID"); if (inst->background) {