Use a local variable to set locale. 83/54583/2
authorMyungki Lee <mk5004.lee@samsung.com>
Wed, 16 Dec 2015 08:37:15 +0000 (17:37 +0900)
committerMyungki Lee <mk5004.lee@samsung.com>
Wed, 16 Dec 2015 08:37:15 +0000 (17:37 +0900)
And fix strlen size.
Change-Id: I04b98ef60342a744208d88f7c29016353aba21b3
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
src/appcore-i18n.c
src/appcore.c

index ae853f6..fad7bf0 100644 (file)
@@ -42,8 +42,9 @@ void update_lang(void)
                setenv("LC_MESSAGES", lang, 1);
                r = setlocale(LC_ALL, "");
                if (r == NULL) {
-                       r = setlocale(LC_ALL, vconf_get_str(VCONFKEY_LANGSET));
-                       _DBG("*****appcore setlocale=%s\n", r);
+                       r = setlocale(LC_ALL, lang);
+                       if (r != NULL)
+                               _DBG("*****appcore setlocale=%s\n", r);
                }
                free(lang);
        }
@@ -68,7 +69,7 @@ void update_region(void)
                setenv("LC_MEASUREMENT", region, 1);
                setenv("LC_IDENTIFICATION", region, 1);
                r = setlocale(LC_ALL, "");
-               if (r == NULL)
+               if (r != NULL)
                        _DBG("*****appcore setlocale=%s\n", r);
 
                free(region);
index 407d081..2d12064 100644 (file)
@@ -520,7 +520,7 @@ static int __aul_handler(aul_type type, bundle *b, void *data)
                _DBG("[APP %d]     AUL event: AUL_START", _pid);
 #ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT
                bg = bundle_get_val(b, AUL_K_ALLOWED_BG);
-               if (bg && strncmp(bg, "ALLOWED_BG", strlen("ALLOWGED_BG")) == 0) {
+               if (bg && strncmp(bg, "ALLOWED_BG", strlen("ALLOWED_BG")) == 0) {
                        _DBG("[__SUSPEND__] allowed background");
                        ac->allowed_bg = true;
                        __remove_suspend_timer(data);