[EGIT] [tools/enventor] master 01/01: config - fix the side effect that paths buf weren't intialized.

[ChunEon Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=bd0d0008deb431ed0b5ff820b98e226720d9cc18

commit bd0d0008deb431ed0b5ff820b98e226720d9cc18
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Tue Feb 18 22:38:02 2014 +0900

    config - fix the side effect that paths buf weren't intialized.
    
    it's caused by 5b69d97f8c20c8cbe7e8b75e97cb0c010be56430.
---
 src/bin/config_data.c | 58 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 9dc2b78..649a690 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -82,6 +82,23 @@ config_save(config_data *cd)
    eet_close(ef);
 }
 
+static Eina_Strbuf *
+config_paths_buf_load_set(Eina_List *paths)
+{
+   Eina_List *l;
+   const char *s;
+
+   Eina_Strbuf *buf = eina_strbuf_new();
+
+   EINA_LIST_FOREACH(paths, l, s)
+     {
+        eina_strbuf_append(buf, " -fd ");
+        eina_strbuf_append(buf, s);
+     }
+
+   return buf;
+}
+
 static config_data *
 config_load()
 {
@@ -102,16 +119,6 @@ config_load()
    if (!cd)
      {
         cd = calloc(1, sizeof(config_data));
-        g_cd = cd;
-
-        sprintf(buf, "%s/images", elm_app_data_dir_get());
-        config_edc_img_path_set(buf);
-        sprintf(buf, "%s/sounds", elm_app_data_dir_get());
-        config_edc_snd_path_set(buf);
-        sprintf(buf, "%s/fonts", elm_app_data_dir_get());
-        config_edc_fnt_path_set(buf);
-        sprintf(buf, "%s/data", elm_app_data_dir_get());
-        config_edc_data_path_set(buf);
 
         cd->font_size = 1.0f;
         cd->view_scale = 1;
@@ -122,6 +129,37 @@ config_load()
         cd->auto_indent = EINA_TRUE;
         cd->hotkeys = EINA_TRUE;
      }
+
+   g_cd = cd;
+
+   if (!cd->edc_img_path_list)
+     {
+        sprintf(buf, "%s/images", elm_app_data_dir_get());
+        config_edc_img_path_set(buf);
+     }
+   else cd->edc_img_path_buf = config_paths_buf_set(cd->edc_img_path_list);
+
+   if (!cd->edc_snd_path_list)
+     {
+        sprintf(buf, "%s/sounds", elm_app_data_dir_get());
+        config_edc_snd_path_set(buf);
+     }
+   else cd->edc_snd_path_buf = config_paths_buf_set(cd->edc_snd_path_list);
+
+   if (!cd->edc_fnt_path_list)
+     {
+        sprintf(buf, "%s/fonts", elm_app_data_dir_get());
+        config_edc_fnt_path_set(buf);
+     }
+   else cd->edc_fnt_path_buf = config_paths_buf_set(cd->edc_fnt_path_list);
+
+   if (!cd->edc_data_path_list)
+     {
+        sprintf(buf, "%s/data", elm_app_data_dir_get());
+        config_edc_data_path_set(buf);
+     }
+   else cd->edc_data_path_buf = config_paths_buf_set(cd->edc_data_path_list);
+
    return cd;
 }
 

--