Merge from TIZEN 2.3

[platform/core/uifw/e17.git] / src / bin / e_config.c

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 79dfe2b..c6127dc 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -155,9 +155,6 @@ e_config_init(void)
                {
                   /* use system if no user profile config */
                   e_prefix_data_concat_static(buf, "data/config/profile.cfg");
-#ifdef _F_COPY_FROM_DATA_DIR_
-                  e_prefix_data_concat_static(buf, "config/e/config/profile.cfg");
-#endif
                   ef = eet_open(buf, EET_FILE_MODE_READ);
                }
           }
@@ -1658,18 +1655,6 @@ e_config_domain_load(const char *domain, E_Config_DD *edd)
              if (data) return data;
           }
      }
-#ifdef _F_COPY_FROM_DATA_DIR_
-   if(data = e_config_domain_system_load(domain, edd))
-     {
-        char cmd[PATH_MAX];
-        e_prefix_data_snprintf(buf, sizeof(buf), "config");
-
-        snprintf(cmd, sizeof(cmd), "/bin/cp -rf %s/* %s/.e", buf, getenv("HOME"));
-        system(cmd);
-
-        return e_config_domain_load(domain, edd);
-     }
-#endif
    return e_config_domain_system_load(domain, edd);
 }
 
@@ -1682,10 +1667,6 @@ e_config_domain_system_load(const char *domain, E_Config_DD *edd)
 
    e_prefix_data_snprintf(buf, sizeof(buf), "data/config/%s/%s.cfg",
                           _e_config_profile, domain);
-#ifdef _F_COPY_FROM_DATA_DIR_
-   e_prefix_data_snprintf(buf, sizeof(buf), "config/e/config/%s/%s.cfg",
-                          _e_config_profile, domain);
-#endif
    ef = eet_open(buf, EET_FILE_MODE_READ);
    if (ef)
      {