Ecore_Config no longer saves configurations passed on the command line - due to popul...

SVN revision: 12287

diff --git a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
index ec9f5bd..e128d50 100644 (file)
--- a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
+++ b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
@@ -60,7 +60,8 @@ typedef enum Ecore_Config_Flag
    PF_NONE = 0,
    PF_BOUNDS = 1,
    PF_MODIFIED = 2,
-   PF_SYSTEM = 4
+   PF_SYSTEM = 4,
+   PF_CMDLN = 8
 } Ecore_Config_Flag;
 
 /**

diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c
index f800246..b985ac6 100644 (file)
--- a/legacy/ecore/src/lib/ecore_config/ecore_config.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c
@@ -541,6 +541,7 @@ ecore_config_typed_val(Ecore_Config_Prop * e, void *val, int type)
 
        ecore_config_bound(e);
        e->flags |= PF_MODIFIED;
+  e->flags = e->flags & ~PF_CMDLN;
        return ECORE_CONFIG_ERR_SUCC;
      }
    return ECORE_CONFIG_ERR_IGNORED;

diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c
index 8c106b9..cc0eef2 100644 (file)
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c
@@ -574,7 +574,10 @@ ecore_config_parse_set(Ecore_Config_Prop * prop, char *arg, char *opt,
        return ECORE_CONFIG_PARSE_EXIT;
      }
    else
-      ecore_config_set(prop->key, arg);
+     {
+       ecore_config_set(prop->key, arg);
+       prop->flags |= PF_CMDLN;
+     }   
    return ECORE_CONFIG_PARSE_CONTINUE;
 }
 

diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c
index 7278ad7..7ce9c98 100644 (file)
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c
@@ -213,12 +213,15 @@ ecore_config_file_save(char *file)
    while (next)
      {
        /* let the config_db deal with this
-       if (!(next->flags & PF_MODIFIED))
+        * handyande: hmm, not sure that it ever does - reinstating until
+        * further discussions satisfy me!
+        */
+       if (!(next->flags & PF_MODIFIED) || next->flags & PF_CMDLN)
          {
             next = next->next;
             continue;
          }
-        */
+
        tmp = NULL;
 
        switch (next->type)