Code cleaning(5)

- dead code removal
- i18 initialization moved to common

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

diff --git a/setting-about/src/setting-about.c b/setting-about/src/setting-about.c
index e794ff715d0857b4d0c75656f70204dea25f26fc..492102d1e1573c636aebb6cb08b1cfa8bd8fea6c 100755 (executable)
--- a/setting-about/src/setting-about.c
+++ b/setting-about/src/setting-about.c
@@ -45,8 +45,6 @@ static bool on_app_create(void *data)
        SettingAbout *ad = (SettingAbout *)data;
        retv_if(!ad, false);
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        if (app_init(&ad->md, SETTING_ABOUT_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-applications/src/setting-applications.c b/setting-applications/src/setting-applications.c
index f72a05fbf04850afeedf66d653e19e2a24e8a6e5..5d8b934debf0120d13653e26f57f9c441e746329 100644 (file)
--- a/setting-applications/src/setting-applications.c
+++ b/setting-applications/src/setting-applications.c
@@ -155,8 +155,6 @@ static bool on_app_create(void *priv)
        SettingApplications *ad = priv;
        setting_retvm_if((!priv), NULL, "!priv");
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        if (app_init(&ad->md, SETTING_APPLICATIONS_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-appmgr/src/setting-appmgr.c b/setting-appmgr/src/setting-appmgr.c
index 54a523efc25243d9dc5ddac7d1f0efbf4585fe90..484e1de559e1aa4292c9499d7ce8697530bf3b34 100644 (file)
--- a/setting-appmgr/src/setting-appmgr.c
+++ b/setting-appmgr/src/setting-appmgr.c
@@ -215,7 +215,6 @@ static bool _setting_appmgr_app_create(void *data)
 
        SettingAppMgr *appmgr_ad = (SettingAppMgr *)data;
 
-       setting_set_i18n("setting", SETTING_LOCALEDIR);
        if (app_init(&appmgr_ad->md, SETTING_APPMGR_PACKAGE_NAME)
                                != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-backup-and-reset/src/setting-backup-and-reset.c b/setting-backup-and-reset/src/setting-backup-and-reset.c
index 7405d6fb4f55c7a1f45800e3fd26b128507876b7..5c493c88c2479d4f105e509c33cf1311c0430af7 100644 (file)
--- a/setting-backup-and-reset/src/setting-backup-and-reset.c
+++ b/setting-backup-and-reset/src/setting-backup-and-reset.c
@@ -51,7 +51,6 @@ static bool _app_create(void *data)
 
        setting_retvm_if(NULL == data, false, "!data");
 
-       setting_set_i18n("setting", SETTING_LOCALEDIR);
        if (app_init(&ad->md, "org.tizen.setting-backup-and-reset")
                                != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-common/include/setting-common-data-slp-setting.h b/setting-common/include/setting-common-data-slp-setting.h
index 2df51505cdc6235e32adc7637407f2c32b8796d4..1f9a75c8d27bc96bbe1e4c59f9f20fa913b96640 100644 (file)
--- a/setting-common/include/setting-common-data-slp-setting.h
+++ b/setting-common/include/setting-common-data-slp-setting.h
@@ -28,19 +28,8 @@
 
 #define LANGLIST_FILE_PATH \
        _TZ_SYS_RO_APP"/org.tizen.setting/def_config/langlist.xml"
-#define LANGLIST_ALL_FILE_PATH \
-       _TZ_SYS_RW_APP"/org.tizen.setting/data/langlist_all.xml"
-
 
 #define SETTING_STR_SLP_LEN 256
-#define VCONFKEY_SETAPPL_USE_PACKET_DATA_BOOL \
-       VCONFKEY_SETAPPL_PREFIX"/use_packet_data"
-
-
-
-#ifndef VCONFKEY_SETAPPL_SIM_LANGUAGE_STR
-#define VCONFKEY_SETAPPL_SIM_LANGUAGE_STR      "memory/setting/sim_language"
-#endif
 
 #ifndef VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME
 #define VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME \
@@ -57,9 +46,6 @@
 
 /** @todo verify if the below keys need to be added in libslp-setting*/
 
-/* added 11.07.11 */
-#define VCONFKEY_SETAPPL_STATE_PARENTAL_MODE_BOOL \
-       VCONFKEY_SETAPPL_PREFIX"/parental_mode"
 #define VCONFKEY_SETAPPL_DATA_EACH_MONTH_INT \
        VCONFKEY_SETAPPL_PREFIX"/data_each_month"
 #define VCONFKEY_SETAPPL_DATA_EACH_MONTH_APP_INT \
@@ -74,30 +60,8 @@
 /*Driving Mode(DM) */
 #define VCONFKEY_SETAPPL_DM_DRIVING_MODE \
        VCONFKEY_SETAPPL_PREFIX"/drivingmode/drivingmode"
-#define VCONFKEY_SETAPPL_DM_INCOMING_CALL \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/incomingcall"
-#define VCONFKEY_SETAPPL_DM_MESSAGE \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/message"
-#define VCONFKEY_SETAPPL_DM_EMAIL \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/newemails"
-#define VCONFKEY_SETAPPL_DM_VOICEMAIL \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/newvoicemails"
-#define VCONFKEY_SETAPPL_DM_ALARM \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/alarm"
-#define VCONFKEY_SETAPPL_DM_SCHEDULE \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/schedule"
-#define VCONFKEY_SETAPPL_DM_UNLOCK_SCREEN \
-       VCONFKEY_SETAPPL_PREFIX"/drivingmode/unlockscreen"
-
-/*about phone ug */
-#define VCONFKEY_SETAPPL_ASSISTIVE_LIGHT_REMINDER \
-       VCONFKEY_SETAPPL_PREFIX"/accessibility/assistive_light_reminder"
 
 /* firewall block type */
-#define VCONFKEY_SETAPPL_FIREWALL_NETWORK_BLOCK_TYPE \
-       VCONFKEY_SETAPPL_PREFIX"/firewall_network_block"
-#define VCONFKEY_SETAPPL_FIREWALL_PROTOCOL_BLOCK_TYPE \
-       VCONFKEY_SETAPPL_PREFIX"/firewall_protocol_block"
 
 #ifndef VCONFKEY_SETAPPL_DEFAULT_MEM_WIFI_DIRECT_INT
 #define VCONFKEY_SETAPPL_DEFAULT_MEM_WIFI_DIRECT_INT \
@@ -120,13 +84,6 @@
 #define VCONFKEY_SETAPPL_SET_DATA_USAGE_LIMIT_ROAMING_BOOL \
        VCONFKEY_SETAPPL_PREFIX"/set_data_usage_limit_roaming"
 
-#ifndef VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE
-#define VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE \
-       VCONFKEY_SETAPPL_PREFIX"/auto_adjust_screen_tone"
-#endif
-
-
-
 typedef enum {
        SETTING_SEC_PW_PASSWORD,
        SETTING_SEC_PW_SIMPLE_PASSWD,

diff --git a/setting-common/include/setting-common-general-func.h b/setting-common/include/setting-common-general-func.h
index da4b99e0a4ab80544ba5b331c2583f14497e0ec4..3ca71693a8effae5c8dac65c2cf27888cf83f431 100755 (executable)
--- a/setting-common/include/setting-common-general-func.h
+++ b/setting-common/include/setting-common-general-func.h
@@ -27,15 +27,6 @@
 
 #define SETTING_FILE_NAME_PATTERN      "[\\<>:;*\"|?/]"
 
-#ifdef _
-#undef _
-#undef N_
-#undef S_
-#endif
-#define _(s)                   setting_gettext(s)
-#define __(s, domainname)      setting_gettext2(s, domainname)
-#define S_(s)                  setting_gettext(s)
-
 #define btn_type(obj) get_popup_btn_response_type(obj)
 
 #define SAFE_STRDUP(src) (src) ? strdup(src) : NULL
@@ -55,7 +46,6 @@ extern char *get_pa_date_format_str();
 extern char *get_pa_select_network();
 extern double get_widgets_factor();
 extern char *setting_gettext(const char *s);
-extern char *setting_gettext2(const char *s, const char *domainname);
 
 extern int safeStrCmp(const char *s1, const char *s2);
 extern int safeStrNCmp(const char *s1, const char *s2, int len);
@@ -70,14 +60,12 @@ extern char *safeStrRStr(const char *str, const char *strSearch);
 extern int is_slp_binary();
 extern bool isEmulBin();
 extern int get_popup_btn_response_type(Evas_Object *obj);
-extern void clear_system_service_data();
 
 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 setting_set_i18n_force(char *pkgname, char *localedir);
 
 extern int app_launcher(const char *pkg_name, app_control_reply_cb callback,
                void *user_data);

diff --git a/setting-common/src/setting-common-data-slp-setting.c b/setting-common/src/setting-common-data-slp-setting.c
index 7186138e51da41ee65834f9326ce504929e59c0e..c2d60e04fd121559c1deae9ae9509b86c22c6972 100755 (executable)
--- a/setting-common/src/setting-common-data-slp-setting.c
+++ b/setting-common/src/setting-common-data-slp-setting.c
@@ -25,9 +25,6 @@
 #include <libxml/tree.h>
 #include <json-glib/json-glib.h>
 
-#define SETTING_DATA_DIR_PATH _TZ_SYS_RW_APP"/org.tizen.setting/data/"
-#define SETTING_CFG_JSON_FILE_PATH     SETTING_DATA_DIR_PATH"exported.json"
-
 typedef enum {
        eBOOL, eINT, eSTRING,
 } vconftype;
@@ -56,8 +53,6 @@ struct VconfNode {
 int get_vconf(VconfNode node, VconfNode *result);
 int set_vconf(VconfNode node, VconfNode *result);
 
-static VconfNode *g_sortedarr;
-
 /*-------------------------------------------------------------------------- */
 
 /* export function for each vconf key */
@@ -814,122 +809,6 @@ static VconfNode g_stable[] = {
                import_default },
 };
 
-static int getconfsize()
-{
-       /*---- */
-       int bcount = sizeof(g_btable) / sizeof(g_btable[0]) - 1;
-       int icount = sizeof(g_itable) / sizeof(g_itable[0]) - 1;
-       /* why?? buggy */
-       int scount = sizeof(g_stable) / sizeof(g_stable[0]) - 1;
-       int total = bcount + icount + scount;
-
-       return total;
-}
-
-/**
- * leaf node
- *
- * g_sortedarr from caller
- */
-void __foreach_attr(JsonObject *object, const gchar *public_key,
-               JsonNode *member_node, gpointer user_data)
-{
-       char *public_groupname = (char *)user_data;
-       char *retstr = (char *)json_object_get_string_member(object,
-                       public_key);
-
-       /*SETTING_TRACE(" public_groupname : %s", public_groupname); */
-
-       /* LOOKUP(group, key) ----> vconf_key */
-       int total = getconfsize();
-
-       int i;
-       static int ncount = 0;
-       int run = 1;
-       for (i = 0; i < total && run == 1; i++) {
-               /*SETTING_TRACE(" >> g_sortedarr[%d].public_groupkey : %s",i,
-                * g_sortedarr[i].public_groupkey ); */
-               /*SETTING_TRACE(" >> g_sortedarr[%d].public_key : %s",i,
-                * g_sortedarr[i].public_key ); */
-               /*SETTING_TRACE(" >> public_key : %s",public_key ); */
-
-               if (g_sortedarr[i].public_groupkey
-                               && safeStrCmp(g_sortedarr[i].public_groupkey, public_groupname) == 0
-                               && g_sortedarr[i].public_key
-                               && safeStrCmp(g_sortedarr[i].public_key, public_key) == 0) {
-                       ncount += 1;
-                       SETTING_TRACE(" FOUND ---> group name %s : public key " "%s --- vconf key (%s) - type (%d) -- " "strval : [%s] ",
-                                       g_sortedarr[i].public_groupkey,
-                                       g_sortedarr[i].public_key,
-                                       g_sortedarr[i].vconf_key,
-                                       g_sortedarr[i].type, retstr);
-
-                       /* set value from vconf (key/value) */
-                       /* retstr */
-                       VconfNode result;
-                       switch (g_sortedarr[i].type) {
-                       case eBOOL:
-                               /* "true"  --> 1  "false" --> 0 */
-                               if (retstr && safeStrCmp(retstr, "true") == 0)
-                                       g_sortedarr[i].value.b = 1;
-                               else if (retstr && safeStrCmp(retstr, "false") == 0)
-                                       g_sortedarr[i].value.b = 0;
-
-                               break;
-
-                       case eINT: {
-                               int num = -1;
-                               /* "111" --> 1111 */
-                               if (retstr)
-                                       num = atoi(retstr);
-                               g_sortedarr[i].value.i = num;
-                       }
-                               break;
-
-                       case eSTRING:
-                               /* "hello world"  --> "hello world" */
-                               if (retstr)
-                                       g_sortedarr[i].value.c = retstr;
-                               else
-                                       /* error handler */
-                                       g_sortedarr[i].value.c = "";
-                               break;
-
-                       }
-
-                       if (g_sortedarr[i].vconf_key)
-                               set_vconf(g_sortedarr[i], &result);
-                       else
-                               SETTING_TRACE("vconf key is NULL");
-
-                       run = 0; /* stop loop */
-               }
-       }
-       SETTING_TRACE(" n - FOUND %d ", ncount);
-}
-
-void __func_cb(JsonObject *object, const gchar *member_name,
-               JsonNode *member_node, gpointer user_data)
-{
-       /*JsonArray *array = json_node_get_array(member_node); */
-       /*SETTING_TRACE(" ----> member name : %s ", member_name); */
-       JsonObject *child = json_object_get_object_member(object, member_name);
-       json_object_foreach_member(child, __foreach_attr,
-                       (gpointer)member_name);
-}
-
-int __compareByCategory(const void *arg1, const void *arg2)
-{
-       char *str1 = (char *)(((VconfNode *)arg1)->public_groupkey);
-       char *str2 = (char *)(((VconfNode *)arg2)->public_groupkey);
-
-       if (!str1 || !str2)
-               return -1;
-
-       return safeStrCmp(str1, str2);
-}
-
-
 int set_vconf(VconfNode node, VconfNode *result)
 {
        /*SETTING_TRACE_BEGIN; */

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index c6f1a1a8909f64a133c77d55d9384b3ce48662f0..3a9793c18d74e9187470cb6dbf025ceb7191a563 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -27,7 +27,6 @@
 #include <system_settings.h>
 #include "setting-cfg.h"
 #include <pkgmgr-info.h>
-#include <app_control_internal.h>
 
 EXPORT_PUBLIC
 char *get_application_default_icon(const char *appid)
@@ -415,20 +414,6 @@ EXPORT_PUBLIC char *setting_gettext(const char *s)
        return p;
 }
 
-EXPORT_PUBLIC char *setting_gettext2(const char *s, const char *domainname)
-{
-       retv_if(s == NULL, "NULL");
-
-       /* fisrt find in app pg */
-       char *p = dgettext(domainname, s);
-
-       if (!safeStrCmp(s, p)) { /* not found */
-               /* find in system pkg */
-               p = dgettext(SYSTEM_PACKAGE, s);
-       }
-       return p;
-}
-
 /*remove sub string from a parent string */
 EXPORT_PUBLIC char *remove_first_substring(const char *parent, const char *pat)
 {
@@ -924,16 +909,6 @@ int setting_set_i18n(char *pkgname, char *localedir)
        return __set_i18n(pkgname, localedir);
 }
 
-EXPORT_PUBLIC
-int setting_set_i18n_force(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 4f6025edcced5382bd3e62d5d02fd6693f9c0dc7..0fd45e0a4776a8e49f600677e3197ccd9063e733 100644 (file)
--- a/setting-common/src/setting-common-init.c
+++ b/setting-common/src/setting-common-init.c
@@ -52,6 +52,8 @@ int app_init(MainData *md, char *name)
 
        elm_app_base_scale_set(2.4);
 
+       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
+
        /* create window */
        md->window = _create_main_window(name);
        setting_retvm_if(md->window == NULL, SETTING_RETURN_FAIL,

diff --git a/setting-connectivity/src/setting-connectivity.c b/setting-connectivity/src/setting-connectivity.c
index 5a2bb8e2834165026b83828a93bffb6778996fd0..39a78da1e869760af348ad6f0b4f636c9691cf50 100644 (file)
--- a/setting-connectivity/src/setting-connectivity.c
+++ b/setting-connectivity/src/setting-connectivity.c
@@ -101,8 +101,6 @@ static bool on_app_create(void *priv)
                return false;
        }
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        /* register view node table */
        setting_view_node_table_intialize();
        setting_view_node_table_register(&setting_view_connectivity_usb, NULL);

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index 0beb83fcfdcebc46abec3d8f903cf4519f18178e..c202d5c2e37bab43e020a106fce6ff8ecc47f19c 100644 (file)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -73,8 +73,6 @@ static bool _setting_display_app_create(void *data)
 
        SettingDisplay *display_ad = (SettingDisplay *)data;
 
-       setting_set_i18n("setting", SETTING_LOCALEDIR);
-
        if (app_init(&display_ad->md, SETTING_DISPLAY_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-fileview/src/setting-fileview.c b/setting-fileview/src/setting-fileview.c
index 8d273871bb80fa7d67726996fc091d0c1ca3e860..6cf1c9e05a8e619cd8e40fd5f799d940ff7d2d8e 100755 (executable)
--- a/setting-fileview/src/setting-fileview.c
+++ b/setting-fileview/src/setting-fileview.c
@@ -81,7 +81,6 @@ bool on_app_create(void *priv)
                return false;
        }
 
-       setting_set_i18n(SETTING_PACKAGE, FILEVIEW_LOCALEDIR);
        return true;
 }
 

diff --git a/setting-flightmode/src/setting-flightmode.c b/setting-flightmode/src/setting-flightmode.c
index 46a051c78650d31acb133b55d01f91203cc66a37..51b835e40c7f5aa43286a83e64dabc26de46cda5 100755 (executable)
--- a/setting-flightmode/src/setting-flightmode.c
+++ b/setting-flightmode/src/setting-flightmode.c
@@ -34,8 +34,6 @@ static bool on_app_create(void *data)
        SettingFlightMode *ad = (SettingFlightMode *)data;
        retv_if(!ad, false);
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        if (app_init(&ad->md, SETTING_FLIGHTMODE_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-font/src/setting-font.c b/setting-font/src/setting-font.c
index d78843f9a86dcdc7c2868fa748791860dac3701e..3877dbb58162dfbeba014ce3bfa54b66151714bd 100644 (file)
--- a/setting-font/src/setting-font.c
+++ b/setting-font/src/setting-font.c
@@ -176,8 +176,6 @@ static bool _setting_font_app_create(void *priv)
        setting_retvm_if((!priv), NULL, "!priv");
        SettingFontData *ad = priv;
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        if (app_init(&ad->md, SETTING_FONT_PACKAGE_NAME)
                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 60a174bafb8d1eb65a52d158a612a165c2c41b8a..8c5a81e2c8c4467c2d43efd2de74fe918fcb0670 100644 (file)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -273,8 +273,6 @@ static bool on_app_create(void *priv)
                return false;
        }
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        /* Base view initialization before appctl: */
        ret = view_init(&ad->md, _("IDS_ST_BODY_NETWORK"));
        if (ret != SETTING_RETURN_SUCCESS)

diff --git a/setting-privacy/src/setting-privacy.c b/setting-privacy/src/setting-privacy.c
index 77aef7681a1e85e251b3686373c873187f93be12..6447373a96c57b79c0c546713ec702cc78b83211 100755 (executable)
--- a/setting-privacy/src/setting-privacy.c
+++ b/setting-privacy/src/setting-privacy.c
@@ -35,8 +35,6 @@ bool on_app_create(void *priv)
                return false;
        }
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        /* register view node table */
        setting_view_node_table_intialize();
        setting_view_node_table_register(&setting_view_privacy_main,

diff --git a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
index 68b3a814fc4a49554d7c78b55ce44cb4a85a9a18..7d1d2b7aedb1d046e794800a4069e25aa3922ad6 100755 (executable)
--- a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
+++ b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
@@ -51,7 +51,6 @@ static bool _smartmgr_battery_app_create(void *data)
 
        SmartMgrBattery *ad = (SmartMgrBattery *)data;
 
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
        if (app_init(&ad->md, SMARTMANAGER_BATTERY_PACKAGE_NAME)
                != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index ad41b199b74919033ff486b30d6e21384aa979b8..eb71f13072cf41d7089ab51aa50b1f075056e47b 100755 (executable)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -166,7 +166,6 @@ static bool _setting_storage_app_create(void *data)
        SETTING_TRACE(" -----> [TIME-1] before ");
        appcore_measure_start();
 
-       setting_set_i18n("setting", SETTING_LOCALEDIR);
        if (app_init(&ad->md, SETTING_STORAGE_PACKAGE_NAME)
                                                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 2c5f91eaf186acbfb212f3edf9c2cd6b710a0fea..bbdd06c8bbf8f23a5b56ca461859f1c299c1da30 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -895,8 +895,6 @@ static int setting_time_main_create(void *cb)
                SETTING_TRACE_ERROR("ad->data_time is NULL");
        }
 
-       setting_set_i18n("worldclock", SETTING_TIME_SHARE_LOCAL_PATH);
-
        displayTimezone = get_timezone_displayname();
 
        if (displayTimezone != NULL) {

diff --git a/setting-time/src/setting-time.c b/setting-time/src/setting-time.c
index 8df0d3a91fcbce13ebca4ceef0bf68b4f8986b38..1580fade3a33e5edd061367e0b7bdccf64250356 100644 (file)
--- a/setting-time/src/setting-time.c
+++ b/setting-time/src/setting-time.c
@@ -48,9 +48,6 @@ static bool _setting_time_app_create(void *priv)
 
        ad->pop_progress = NULL;
 
-       /* set launguage */
-       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
-
        setting_view_node_table_intialize();
        setting_view_node_table_register(&setting_view_time_main, NULL);