From b8af191a20efdc069a8a17d910358f37eef1b601 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 17 Feb 2017 17:21:20 +0900 Subject: [PATCH] fix entry selection by having proper cfg update and def fields this should fix T5183 --- config/default/base.src.in | 3 ++- config/mobile/base.src.in | 3 ++- config/standard/base.src.in | 3 ++- src/lib/elementary/elm_config.c | 4 ++++ src/lib/elementary/elm_priv.h | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/default/base.src.in b/config/default/base.src.in index 9128b98d97..f4947ee1fb 100644 --- a/config/default/base.src.in +++ b/config/default/base.src.in @@ -1,5 +1,6 @@ group "Elm_Config" struct { - value "config_version" int: 131085; + value "config_version" int: 131086; + value "config_version" uchar: 1; value "engine" string: ""; value "vsync" uchar: 0; value "thumbscroll_enable" uchar: 1; diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in index f1a357b22e..717b0745ef 100644 --- a/config/mobile/base.src.in +++ b/config/mobile/base.src.in @@ -1,5 +1,6 @@ group "Elm_Config" struct { - value "config_version" int: 131085; + value "config_version" int: 131086; + value "config_version" uchar: 1; value "engine" string: ""; value "vsync" uchar: 0; value "thumbscroll_enable" uchar: 1; diff --git a/config/standard/base.src.in b/config/standard/base.src.in index 678e274515..66af1c9ea1 100644 --- a/config/standard/base.src.in +++ b/config/standard/base.src.in @@ -1,5 +1,6 @@ group "Elm_Config" struct { - value "config_version" int: 131085; + value "config_version" int: 131086; + value "config_version" uchar: 1; value "engine" string: ""; value "vsync" uchar: 0; value "thumbscroll_enable" uchar: 0; diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 48330cdfcf..756d54ddf1 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -2165,6 +2165,10 @@ _config_update(void) IFCFG(0x000b) eina_stringshare_refplace(&_elm_config->modules, tcfg->modules); IFCFGEND + + IFCFG(0x000e) + _elm_config->entry_select_allow = EINA_TRUE; + IFCFGEND /** * Fix user config for current ELM_CONFIG_EPOCH here. **/ diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index ba351384d7..903aa348d2 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -131,7 +131,7 @@ struct _Elm_Theme * the users config doesn't need to be wiped - simply new values need * to be put in */ -#define ELM_CONFIG_FILE_GENERATION 0x000B +#define ELM_CONFIG_FILE_GENERATION 0x000e #define ELM_CONFIG_VERSION_EPOCH_OFFSET 16 #define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \ ELM_CONFIG_FILE_GENERATION)