Apply new VCONF Keys.

 - VCONFKEY_SETAPPL_DATA_EACH_MONTH
 - VCONFKEY_SETAPPL_DATA_LIMIT_UNIT_BOOL

Change-Id: I719eae5ccd35f69388ae555813f925b40d83d9af
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/setting-datausage.c b/src/setting-datausage.c
index 481ee2f6eb0b2e608452612c16e09738ed88b4f3..66e5da8791f11da099389312f68b68c82457e89a 100644 (file)
--- a/src/setting-datausage.c
+++ b/src/setting-datausage.c
@@ -32,11 +32,6 @@
 #include <app_control.h>
 #include <semaphore.h>
 
-#ifndef VCONFKEY_SETAPPL_DATA_LIMIT_UNIT_BOOL
-#define VCONFKEY_SETAPPL_DATA_LIMIT_UNIT_BOOL "db/setting/data_limit_unit"
-#define VCONFKEY_SETAPPL_DATA_START_DATE_INT  "db/setting/data_each_month"
-#endif
-
 static GMainLoop* multi_main_loop = NULL;
 
 typedef enum {
@@ -434,8 +429,8 @@ static int set_mobile_data_limit()
 
        if (vconf_get_int(VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT, &cycle) < 0)
                ERR("Error! to get VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT");
-       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, &start_interval) < 0)
-               ERR("Error! to get VCONFKEY_SETAPPL_DATA_START_DATE_INT");
+       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, &start_interval) < 0)
+               ERR("Error! to get VCONFKEY_SETAPPL_DATA_EACH_MONTH");
 
        _initialize_cycle(&g_sim_limit);
 
@@ -922,8 +917,8 @@ static int get_total_data_usage()
 
        if (vconf_get_int(VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT, &cycle) < 0)
                ERR("Error! to get VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT");
-       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, &start_interval) < 0)
-               ERR("Error! to get VCONFKEY_SETAPPL_DATA_START_DATE_INT");
+       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, &start_interval) < 0)
+               ERR("Error! to get VCONFKEY_SETAPPL_DATA_EACH_MONTH");
 
        _initialize_cycle(&g_sim_limit);
 
@@ -1020,7 +1015,7 @@ void _data_usage_detail_cb(void *data, Evas_Object *obj, void *event_info)
        localtime_r(&now, &ts);
        strftime(mon, sizeof(mon)-1, "%b", &ts);
 
-       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, &start_day) < 0)
+       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, &start_day) < 0)
                ERR("Error! to get VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT");
 
        get_data_int_amount_str(g_sim_limit.total_data_used, total, sizeof(total)-1);
@@ -1065,7 +1060,7 @@ char *_gl_data_usage_title_get(void *data, Evas_Object *obj, const char *part)
                                                data_usage_cycle_menu_its[cycle].name);
                break;
                case SETTING_DATAUSAGE_START_DATE:
-                       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, &val) < 0)
+                       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, &val) < 0)
                                ERR("Error! to get VCONFKEY_SETAPPL_DATA_USAGE_CYCLE_INT");
                        snprintf(buf, sizeof(buf) - 1, "<font color=#4DCFFFC9>%2d</font>", val);
                break;
@@ -1631,8 +1626,8 @@ static void _start_day_done_clicked_cb(void* data, Evas_Object* obj, void* event
 {
        int _startDate = elm_spinner_value_get(g_start_spinner);
 
-       if (vconf_set_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, _startDate) < 0)
-               ERR("Error! to set VCONFKEY_SETAPPL_DATA_START_DATE_INT");
+       if (vconf_set_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, _startDate) < 0)
+               ERR("Error! to set VCONFKEY_SETAPPL_DATA_EACH_MONTH");
 
        ERR("_startDate:%d",  _startDate);
        elm_naviframe_item_pop(g_app_context->nf);
@@ -1672,8 +1667,8 @@ void _start_day_cb(void *data, Evas_Object *obj, void *event_info)
        elm_object_part_text_set(g_start_spinner, "elm.text", "Date");
 
        int _startDate = 1;
-       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_START_DATE_INT, &_startDate) < 0)
-               ERR("Error! to set VCONFKEY_SETAPPL_DATA_START_DATE_INT");
+       if (vconf_get_int(VCONFKEY_SETAPPL_DATA_EACH_MONTH, &_startDate) < 0)
+               ERR("Error! to set VCONFKEY_SETAPPL_DATA_EACH_MONTH");
 
        elm_spinner_wrap_set(g_start_spinner, EINA_TRUE);
        elm_spinner_min_max_set(g_start_spinner, 1, 31);