vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup config use

This commit is contained in:
Boris Faure 2014-06-21 18:53:25 +02:00
parent 7dba8182cf
commit 6cd6c87210
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/main.c
View File

@ -2377,8 +2377,8 @@ main_ipc_new(Ipc_Instance *inst)
{ {
Win *wn; Win *wn;
Term *term; Term *term;
Config *config;
Split *sp; Split *sp;
Config *config;
int pargc = 0, nargc, i; int pargc = 0, nargc, i;
char **pargv = NULL, **nargv = NULL, geom[256]; char **pargv = NULL, **nargv = NULL, geom[256];
@ -2543,21 +2543,18 @@ main_ipc_new(Ipc_Instance *inst)
nargv[i++] = "-e"; nargv[i++] = "-e";
nargv[i++] = (char *)inst->cmd; nargv[i++] = (char *)inst->cmd;
} }
config = config_fork(main_config);
ecore_app_args_set(nargc, (const char **)nargv); ecore_app_args_set(nargc, (const char **)nargv);
wn = main_win_new(inst->name, inst->role, inst->title, inst->icon_name, 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); inst->borderless, inst->override, inst->maximized);
if (!wn) if (!wn)
{ {
ecore_app_args_set(pargc, (const char **)pargv); ecore_app_args_set(pargc, (const char **)pargv);
free(nargv); free(nargv);
config_del(config);
return; return;
} }
config = wn->config;
config = config_fork(config);
unsetenv("DESKTOP_STARTUP_ID"); unsetenv("DESKTOP_STARTUP_ID");
if (inst->background) if (inst->background)
{ {