c++ test fixes(2)

- removed code using environment variable
- translation set up in app_init()

Change-Id: I1361292601733ee56bb5f86e58675cb7e5061990
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/org.tizen.setting.xml.in b/org.tizen.setting.xml.in
index 8d144f1b090c298a86e01107c4a1cb565bfaee40..228a6bfda0c231102fee7914f33948e5551187c3 100644 (file)
--- a/org.tizen.setting.xml.in
+++ b/org.tizen.setting.xml.in
@@ -63,7 +63,7 @@
                <app-control>
                        <operation name="http://tizen.org/appcontrol/operation/setting"/>
                </app-control>
-</ui-application>
+       </ui-application>
        <ui-application appid="org.tizen.setting-display" exec="@TZ_SYS_RO_APP@/org.tizen.setting/bin/setting-display" type="capp" nodisplay="true" taskmanage="false" hw-acceleration="on" launch_mode="caller">
                        <icon>@TZ_SYS_RO_ICONS@/default/small/org.tizen.setting.png</icon>
                        <label>Display</label>

diff --git a/setting-about/src/setting-about.c b/setting-about/src/setting-about.c
index 492102d1e1573c636aebb6cb08b1cfa8bd8fea6c..d4dbb680f952e2ae90d9c183269f07745b632b5d 100755 (executable)
--- a/setting-about/src/setting-about.c
+++ b/setting-about/src/setting-about.c
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
                .pause = on_app_pause,
                .resume = on_app_resume,
                .terminate = on_app_terminate,
-               .app_control = on_app_control,
+               .app_control = on_app_control
        };
 
        ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY],

diff --git a/setting-accessibility/src/setting-accessibility.c b/setting-accessibility/src/setting-accessibility.c
index b0bce0fd2bd1135cc495abb5c3a9e78d8e4de88d..0936d9d4af22fd94ad2d3add26852e38aa09f566 100644 (file)
--- a/setting-accessibility/src/setting-accessibility.c
+++ b/setting-accessibility/src/setting-accessibility.c
@@ -137,8 +137,6 @@ static bool on_app_create(void *priv)
        ad->itc_multiline_sub.func.text_get = _universal_switch_gendial_new_text_get;
        int ret;
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        if (app_init(&ad->md, SETTING_ACCESSIBILITY_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-common/include/setting-common-general-func.h b/setting-common/include/setting-common-general-func.h
index 3ca71693a8effae5c8dac65c2cf27888cf83f431..1226acf6c957b6b08fc063860ef9d040ce9f50d6 100755 (executable)
--- a/setting-common/include/setting-common-general-func.h
+++ b/setting-common/include/setting-common-general-func.h
@@ -65,8 +65,6 @@ extern char *cur_font_get();
 extern void font_size_set();
 extern char *_get_default_font();
 
-extern int setting_set_i18n(char *pkgname, char *localedir);
-
 extern int app_launcher(const char *pkg_name, app_control_reply_cb callback,
                void *user_data);
 extern int app_launcher_svc(const char *pkg_name, app_control_h service,

diff --git a/setting-common/src/setting-common-data-slp-setting.c b/setting-common/src/setting-common-data-slp-setting.c
index 83c0611b8f926d46943a68cf13d5b32d7c39aa79..34625bcb711c4617c0713e0a8135b28b3187f152 100755 (executable)
--- a/setting-common/src/setting-common-data-slp-setting.c
+++ b/setting-common/src/setting-common-data-slp-setting.c
@@ -95,7 +95,7 @@ void export_json(VconfNode *node, void *root)
                        /*type = "int"; */
 
                        SETTING_TRACE(">>(%d)<<", result.value.i);
-                       snprintf(arr, 1024, "%d", result.value.i);
+                       snprintf(arr, sizeof(arr), "%d", result.value.i);
                        /*node->value.i */
                        val = arr;
                        break;

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index 038e062c96ba034108f1ada3188c4939e1b452cf..7b365b4dcf0a8b2839945f2132060f7adbda3f24 100644 (file)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -600,7 +600,8 @@ char *__setting_phone_lang_get_by_pattern(const char *locale,
 {
        /*remove ".UTF-8" in locale */
        char locale_tmp[DEF_BUF_SIZE] = { 0, };
-       strncpy(locale_tmp, locale, DEF_BUF_SIZE);
+       if (locale)
+               strncpy(locale_tmp, locale, sizeof(locale_tmp));
        locale_tmp[DEF_BUF_SIZE - 1] = '\0';
 
        char *p = safeStrStr(locale_tmp, ".UTF-8");

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 27cf94191cfa4acd5adb3494bd0a4921835cca45..f86aa1d3a545d9eca3c13f8ca5dff2a930b8579a 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -835,74 +835,6 @@ void font_size_set()
        SETTING_TRACE_END;
 }
 
-static int _set;
-EXPORT_PUBLIC void update_lang(void)
-{
-       char *lang;
-       char *r;
-
-       lang = vconf_get_str(VCONFKEY_LANGSET);
-       if (lang) {
-               setenv("LANG", lang, 1);
-               setenv("LC_MESSAGES", lang, 1);
-               r = setlocale(LC_ALL, "");
-               if (r == NULL)
-                       setlocale(LC_ALL, vconf_get_str(VCONFKEY_LANGSET));
-
-               free(lang);
-       }
-}
-
-EXPORT_PUBLIC void update_region(void)
-{
-       char *region;
-
-       region = vconf_get_str(VCONFKEY_REGIONFORMAT);
-       if (region) {
-               setenv("LC_CTYPE", region, 1);
-               setenv("LC_NUMERIC", region, 1);
-               setenv("LC_TIME", region, 1);
-               setenv("LC_COLLATE", region, 1);
-               setenv("LC_MONETARY", region, 1);
-               setenv("LC_PAPER", region, 1);
-               setenv("LC_NAME", region, 1);
-               setenv("LC_ADDRESS", region, 1);
-               setenv("LC_TELEPHONE", region, 1);
-               setenv("LC_MEASUREMENT", region, 1);
-               setenv("LC_IDENTIFICATION", region, 1);
-               free(region);
-       }
-}
-
-static int __set_i18n(const char *domain, const char *dir)
-{
-       char *r;
-       if (domain == NULL) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       r = setlocale(LC_ALL, "");
-       /* if locale is not set properly, try again to set as language base */
-       if (r == NULL)
-               r = setlocale(LC_ALL, vconf_get_str(VCONFKEY_LANGSET));
-
-       bindtextdomain(domain, dir);
-       textdomain(domain);
-       return 0;
-}
-
-EXPORT_PUBLIC
-int setting_set_i18n(char *pkgname, char *localedir)
-{
-       if (_set)
-               return 0;
-       update_lang();
-       update_region();
-
-       return __set_i18n(pkgname, localedir);
-}
-
 /*example 1:  app_launcher("setting-myaccount-efl|mode:account_list"); */
 /*example 2:  app_launcher("emergency-msg-setting-efl"); */
 /*example 3:  app_launcher(

diff --git a/setting-common/src/setting-common-init.c b/setting-common/src/setting-common-init.c
index 0fd45e0a4776a8e49f600677e3197ccd9063e733..a85fa381449bd8853ef5ef473582b7caf9d5a052 100644 (file)
--- a/setting-common/src/setting-common-init.c
+++ b/setting-common/src/setting-common-init.c
@@ -52,12 +52,12 @@ int app_init(MainData *md, char *name)
 
        elm_app_base_scale_set(2.4);
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
+       bindtextdomain(SETTING_PACKAGE, SETTING_LOCALEDIR);
+       textdomain(SETTING_PACKAGE);
 
        /* create window */
        md->window = _create_main_window(name);
-       setting_retvm_if(md->window == NULL, SETTING_RETURN_FAIL,
-                       "window is null");
+       setting_retvm_if(md->window == NULL, SETTING_RETURN_FAIL, "window is null");
 
        md->evas = evas_object_evas_get(md->window);
        view_rotate_support(md);