[EGIT] [apps/express] master 01/01: express: Redo config version system

[Christopher Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/apps/express.git/commit/?id=e77cf7c9234134cac03668791aa1a86189f1fb09

commit e77cf7c9234134cac03668791aa1a86189f1fb09
Author: Christopher Michael <devilho...@comcast.net>
Date:   Wed Jan 27 11:17:31 2021 -0500

    express: Redo config version system
    
    NB: This WILL cause your existing config to be nuked sadly :(
---
 src/bin/config.c          | 19 ++++++++++---------
 src/bin/options_general.c |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/bin/config.c b/src/bin/config.c
index 257baa4..fec07b6 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -24,10 +24,10 @@
 # define EX_CONFIG_HASH(edd, type, member, eddtype) \
    EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
 
-#  define EX_CONFIG_FILE_EPOCH 0x0004
-#  define EX_CONFIG_FILE_GENERATION 0x012d
+#  define EX_CONFIG_FILE_EPOCH 2
+#  define EX_CONFIG_FILE_GENERATION 4
 #  define EX_CONFIG_FILE_VERSION \
-   ((EX_CONFIG_FILE_EPOCH << 16) | EX_CONFIG_FILE_GENERATION)
+   ((EX_CONFIG_FILE_EPOCH * 1000000) + EX_CONFIG_FILE_GENERATION)
 
 typedef Eet_Data_Descriptor Ex_Config_DD;
 
@@ -233,7 +233,7 @@ _config_load(void)
      {
         Eina_Bool reload = EINA_FALSE;
 
-        if ((_ex_cfg->version >> 16) < EX_CONFIG_FILE_EPOCH)
+        if (_ex_cfg->version < (EX_CONFIG_FILE_EPOCH * 1000000))
           {
              /* config too old */
              reload = EINA_TRUE;
@@ -255,7 +255,8 @@ _config_load(void)
      }
 
    /* define some convenient macros */
-#define IFCFG(v) if ((_ex_cfg->version & 0xffff) < (v)) {
+#define IFCFG(v) \
+   if ((_ex_cfg->version - (EX_CONFIG_FILE_EPOCH * 1000000)) < (v)) {
 #define IFCFGELSE } else {
 #define IFCFGEND }
 
@@ -269,19 +270,19 @@ _config_load(void)
    _ex_cfg->gui.scrollback = 2000;
    _ex_cfg->networks = NULL;
 
-   IFCFG(0x009d);
+   IFCFG(1);
    _ex_cfg->gui.tabs = 1;
    IFCFGEND;
 
-   IFCFG(0x010d);
+   IFCFG(2);
    _ex_cfg->gui.use_gravatar = EINA_TRUE;
    IFCFGEND;
 
-   IFCFG(0x011d);
+   IFCFG(3);
    _ex_cfg->font.use_entry = EINA_TRUE;
    IFCFGEND;
 
-   IFCFG(0x012d);
+   IFCFG(4);
    _ex_cfg->video.module = 0;
    _ex_cfg->video.muted = EINA_FALSE;
    _ex_cfg->video.visualized = EINA_TRUE;
diff --git a/src/bin/options_general.c b/src/bin/options_general.c
index 7fcd04b..3bc5a52 100644
--- a/src/bin/options_general.c
+++ b/src/bin/options_general.c
@@ -63,7 +63,6 @@ _options_general(Evas_Object *box, Evas_Object *grid 
EINA_UNUSED)
    ALIGN_SET(group, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_text_set(group, "Use Tabs");
    elm_radio_state_value_set(group, 1);
-   elm_radio_value_pointer_set(group, &_ex_cfg->gui.tabs);
    evas_object_smart_callback_add(group, "changed", _cb_tabs, NULL);
    elm_box_pack_end(vbox, group);
    evas_object_show(group);
@@ -73,12 +72,13 @@ _options_general(Evas_Object *box, Evas_Object *grid 
EINA_UNUSED)
    ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_text_set(o, "Use Treeview");
    elm_radio_state_value_set(o, 0);
-   elm_radio_value_pointer_set(group, &_ex_cfg->gui.tabs);
    elm_radio_group_add(o, group);
    evas_object_smart_callback_add(o, "changed", _cb_tabs, NULL);
    elm_box_pack_end(vbox, o);
    evas_object_show(o);
 
+   elm_radio_value_set(group, _ex_cfg->gui.tabs);
+
    o = elm_separator_add(box);
    elm_separator_horizontal_set(o, EINA_TRUE);
    WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);

--