kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm config tool - get web backend when entry is deleted not on terminate 

terminate may be called after widgets/windows are deleted already...
so donyt get this stuff in terminate.
This commit is contained in:
Carsten Haitzler 2018-04-02 17:00:20 +09:00
parent cffb31f4a7
commit 2577def20e
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/elementary/config.c
View File

@ -1943,6 +1943,25 @@ _status_config_focus(Evas_Object *win,
elm_naviframe_item_simple_push(naviframe, bx);
}
static void
_web_entry_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
{
if (interactive)
{
const char *web_backend_set = elm_config_web_backend_get();
web_backend = elm_object_text_get(obj);
if ((web_backend_set != web_backend) ||
(web_backend && web_backend_set &&
(!!strcmp(web_backend, web_backend_set))))
{
elm_config_web_backend_set(web_backend);
fprintf(stderr, "web backend set to : [%s]\n", elm_config_web_backend_get());
elm_config_all_flush();
}
}
}
static void
_status_config_etc(Evas_Object *win,
Evas_Object *naviframe)
@ -2015,6 +2034,7 @@ _status_config_etc(Evas_Object *win,
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(en);
elm_box_pack_end(bx3, en);
evas_object_event_callback_add(en, EVAS_CALLBACK_DEL, _web_entry_del, NULL);
web_backend_entry = en;
@ -4286,19 +4306,6 @@ efl_terminate(void *data EINA_UNUSED,
const Efl_Event *ev EINA_UNUSED)
{
fprintf(stderr, "Terminating.\n");
if (interactive)
{
const char *web_backend_set = elm_config_web_backend_get();
web_backend = elm_object_text_get(web_backend_entry);
if (web_backend_set != web_backend ||
(web_backend && web_backend_set && !!strcmp(web_backend, web_backend_set)))
{
elm_config_web_backend_set(web_backend);
fprintf(stderr, "web backend set to : [%s]\n", elm_config_web_backend_get());
elm_config_all_flush();
}
}
}
/* this is your elementary main function - it MUST be called IMMEDIATELY