fiX a bug on Display Language Setting

- problem : handle wrong string with ".UTF-8" when set a key, SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY

Change-Id: I7837e56d78298723f49cf76238ff29e59a86bd6c
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-language-and-input/src/setting-display-language-view.c b/setting-language-and-input/src/setting-display-language-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 361c5a0..5a962ed
--- a/setting-language-and-input/src/setting-display-language-view.c
+++ b/setting-language-and-input/src/setting-display-language-view.c
@@ -208,7 +208,6 @@ static void _close_popup_ex(void *data)
                                        system_settings_set_value_string(
                                                        SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY,
                                                        pnode->locale);
-
                                        int ret = __set_dateformat(
                                                        pnode->locale, ad);
                                        if (ret == SETTING_RETURN_FAIL) {
@@ -244,9 +243,14 @@ static void _close_popup_ex(void *data)
                        ad);
        if (ret == SETTING_RETURN_FAIL)
                SETTING_TRACE_ERROR("[Error] set date format fail");
+       FREE(pa_lang);
 
        char *lang = vconf_get_str(VCONFKEY_LANGSET);
        if (lang) {
+               char *q = strchr(lang, '.');
+               if (q)
+                       *q = '\0';
+
                ret = system_settings_set_value_string(
                                SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, lang);
                if (ret != 0) {
@@ -260,7 +264,6 @@ static void _close_popup_ex(void *data)
        add_app_reply(&ad->md, "result", "rbutton_click");
        ui_app_exit();
 
-       FREE(pa_lang);
 }
 
 /**