Remove unused vconf-keys

Change-Id: I3002b194b024bb3c8059a1927db5558e97c46204

diff --git a/debian/tel-plugin-vconf.postinst b/debian/tel-plugin-vconf.postinst
index 3db7bad..f5cc636 100644 (file)
--- a/debian/tel-plugin-vconf.postinst
+++ b/debian/tel-plugin-vconf.postinst
@@ -14,33 +14,22 @@ vconftool set -t int memory/telephony/ps_type 0 -i -f
 vconftool set -t int memory/telephony/rssi 0 -i -f
 vconftool set -t int memory/telephony/sim_slot 0 -i -f
 vconftool set -t int memory/telephony/svc_roam 0 -i -f
-vconftool set -t int memory/telephony/event_system_ready 0 -i -f
 vconftool set -t int memory/telephony/plmn 0 -i -f
 vconftool set -t int memory/telephony/lac 0 -i -f
 vconftool set -t int memory/telephony/cell_id 0 -i -f
 vconftool set -t int memory/telephony/svc_cs 0 -i -f
 vconftool set -t int memory/telephony/svc_ps 0 -i -f
-vconftool set -t int memory/telephony/zone_type 0 -i -f
-vconftool set -t int memory/telephony/sim_init 0 -i -f
-vconftool set -t int memory/telephony/sim_chv 255
 vconftool set -t int memory/telephony/pb_init 0 -i -f
 vconftool set -t int memory/telephony/call_state 0 -i -f
 vconftool set -t int memory/telephony/call_forward_state 0 -i -f
 vconftool set -t int memory/telephony/tapi_state 0 -i -f
 vconftool set -t int memory/telephony/spn_disp_condition 0 -i -f
-vconftool set -t int memory/telephony/sat_idle 0 -i -f
-vconftool set -t int memory/telephony/sat_state 0 -i -f
 vconftool set -t int memory/telephony/zuhause_zone 0 -i -f
-vconftool set -t int memory/telephony/low_battery 0 -i -f
-vconftool set -t string memory/telephony/idle_text "" -i -f
 vconftool set -t string memory/telephony/spn "" -i -f
 vconftool set -t string memory/telephony/nw_name "" -i -f
 vconftool set -t string memory/telephony/imei "" -i -f
 vconftool set -t string memory/telephony/szSubscriberNumber "" -i -f
-vconftool set -t string memory/telephony/szSubscriberAlpha "" -i -f
 vconftool set -t string memory/telephony/szSWVersion "" -i -f
 vconftool set -t string memory/telephony/szHWVersion "" -i -f
-vconftool set -t string memory/telephony/szCalDate "" -i -f
-vconftool set -t string memory/telephony/productCode "" -i -f
 vconftool set -t string db/private/tel-plugin-vconf/imsi "" -f
 vconftool set -t int db/telephony/emergency 0 -i -f

diff --git a/packaging/tel-plugin-vconf.spec b/packaging/tel-plugin-vconf.spec
index 9c1e1e7..880c01b 100644 (file)
--- a/packaging/tel-plugin-vconf.spec
+++ b/packaging/tel-plugin-vconf.spec
@@ -47,34 +47,23 @@ vconftool set -t int memory/telephony/ps_type 0 -i -f
 vconftool set -t int memory/telephony/rssi 0 -i -f
 vconftool set -t int memory/telephony/sim_slot 0 -i -f
 vconftool set -t int memory/telephony/svc_roam 0 -i -f
-vconftool set -t int memory/telephony/event_system_ready 0 -i -f
 vconftool set -t int memory/telephony/plmn 0 -i -f
 vconftool set -t int memory/telephony/lac 0 -i -f
 vconftool set -t int memory/telephony/cell_id 0 -i -f
 vconftool set -t int memory/telephony/svc_cs 0 -i -f
 vconftool set -t int memory/telephony/svc_ps 0 -i -f
-vconftool set -t int memory/telephony/zone_type 0 -i -f
-vconftool set -t int memory/telephony/sim_init 0 -i -f
-vconftool set -t int memory/telephony/sim_chv 255
 vconftool set -t int memory/telephony/pb_init 0 -i -f
 vconftool set -t int memory/telephony/call_state 0 -i -f
 vconftool set -t int db/telephony/call_forward_state 0 -i -f
 vconftool set -t int memory/telephony/tapi_state 0 -i -f
 vconftool set -t int memory/telephony/spn_disp_condition 0 -i -f
-vconftool set -t int memory/telephony/sat_idle 0 -i -f
-vconftool set -t int memory/telephony/sat_state 0 -i -f
 vconftool set -t int memory/telephony/zuhause_zone 0 -i -f
-vconftool set -t int memory/telephony/low_battery 0 -i -f
-vconftool set -t string memory/telephony/idle_text "" -i -f
 vconftool set -t string memory/telephony/spn "" -i -f
 vconftool set -t string memory/telephony/nw_name "" -i -f
 vconftool set -t string memory/telephony/imei "" -i -f
 vconftool set -t string memory/telephony/szSubscriberNumber "" -i -f
-vconftool set -t string memory/telephony/szSubscriberAlpha "" -i -f
 vconftool set -t string memory/telephony/szSWVersion "" -i -f
 vconftool set -t string memory/telephony/szHWVersion "" -i -f
-vconftool set -t string memory/telephony/szCalDate "" -i -f
-vconftool set -t string memory/telephony/productCode "" -i -f
 vconftool set -t string db/private/tel-plugin-vconf/imsi "" -f
 vconftool set -t int db/telephony/emergency 0 -i -f
 vconftool set -t bool memory/telephony/telephony_ready 0 -i -f

diff --git a/src/desc-vconf.c b/src/desc-vconf.c
index 4117a5a..f449e24 100644 (file)
--- a/src/desc-vconf.c
+++ b/src/desc-vconf.c
@@ -59,12 +59,6 @@ static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
                        return VCONFKEY_TELEPHONY_SVC_PS;
                case STORAGE_KEY_TELEPHONY_SVC_ROAM:
                        return VCONFKEY_TELEPHONY_SVC_ROAM;
-               case STORAGE_KEY_TELEPHONY_ZONE_TYPE:
-                       return VCONFKEY_TELEPHONY_ZONE_TYPE;
-               case STORAGE_KEY_TELEPHONY_SIM_INIT:
-                       return VCONFKEY_TELEPHONY_SIM_INIT;
-               case STORAGE_KEY_TELEPHONY_SIM_CHV:
-                       return VCONFKEY_TELEPHONY_SIM_CHV;
                case STORAGE_KEY_TELEPHONY_SIM_PB_INIT:
                        return VCONFKEY_TELEPHONY_SIM_PB_INIT;
                case STORAGE_KEY_TELEPHONY_CALL_STATE:
@@ -75,16 +69,10 @@ static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
                        return VCONFKEY_TELEPHONY_TAPI_STATE;
                case STORAGE_KEY_TELEPHONY_SPN_DISP_CONDITION:
                        return VCONFKEY_TELEPHONY_SPN_DISP_CONDITION;
-               case STORAGE_KEY_TELEPHONY_SAT_STATE:
-                       return VCONFKEY_TELEPHONY_SAT_STATE;
                case STORAGE_KEY_TELEPHONY_ZONE_ZUHAUSE:
                        return VCONFKEY_TELEPHONY_ZONE_ZUHAUSE;
                case STORAGE_KEY_TELEPHONY_RSSI:
                        return VCONFKEY_TELEPHONY_RSSI;
-               case STORAGE_KEY_TELEPHONY_LOW_BATTERY:
-                       return VCONFKEY_TELEPHONY_LOW_BATTERY;
-               case STORAGE_KEY_TELEPHONY_EVENT_SYSTEM_READY:
-                       return "memory/telephony/event_system_ready";
                case STORAGE_KEY_TELEPHONY_READY:
                        return VCONFKEY_TELEPHONY_READY;
                case STORAGE_KEY_TELEPHONY_SIM_SLOT:
@@ -105,26 +93,18 @@ static const gchar* convert_strgkey_to_vconf(enum tcore_storage_key key)
                        return VCONFKEY_TELEPHONY_NWNAME;
                case STORAGE_KEY_TELEPHONY_SPN_NAME:
                        return VCONFKEY_TELEPHONY_SPN_NAME;
-               case STORAGE_KEY_TELEPHONY_SAT_SETUP_IDLE_TEXT:
-                       return VCONFKEY_TELEPHONY_SAT_SETUP_IDLE_TEXT;
                case STORAGE_KEY_TELEPHONY_IMEI:
                        return VCONFKEY_TELEPHONY_IMEI;
                case STORAGE_KEY_TELEPHONY_SUBSCRIBER_NUMBER:
                        return VCONFKEY_TELEPHONY_SUBSCRIBER_NUMBER;
-               case STORAGE_KEY_TELEPHONY_SUBSCRIBER_NAME:
-                       return VCONFKEY_TELEPHONY_SUBSCRIBER_NAME;
                case STORAGE_KEY_TELEPHONY_SWVERSION:
                        return VCONFKEY_TELEPHONY_SWVERSION;
                case STORAGE_KEY_TELEPHONY_HWVERSION:
                        return VCONFKEY_TELEPHONY_HWVERSION;
-               case STORAGE_KEY_TELEPHONY_CALDATE:
-                       return VCONFKEY_TELEPHONY_CALDATE;
                case STORAGE_KEY_TELEPHONY_IMEI_FACTORY_REBOOT:
                        return VCONFKEY_TELEPHONY_IMEI_FACTORY_REBOOT;
                case STORAGE_KEY_TELEPHONY_SIM_FACTORY_MODE:
                        return VCONFKEY_TELEPHONY_SIM_FACTORY_MODE;
-               case STORAGE_KEY_TELEPHONY_PRODUCTCODE:
-                       return VCONFKEY_TELEPHONY_PRODUCTCODE;
                case STORAGE_KEY_TELEPHONY_FACTORY_KSTRINGB:
                        return VCONFKEY_TELEPHONY_FACTORY_KSTRINGB;
                case STORAGE_KEY_TELEPHONY_IMSI:
@@ -175,15 +155,6 @@ static enum tcore_storage_key convert_vconf_to_strgkey(const gchar* key)
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SVC_ROAM) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SVC_ROAM;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_ZONE_TYPE) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_ZONE_TYPE;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_INIT) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_SIM_INIT;
-       }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_CHV) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_SIM_CHV;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_PB_INIT) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SIM_PB_INIT;
        }
@@ -199,21 +170,12 @@ static enum tcore_storage_key convert_vconf_to_strgkey(const gchar* key)
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_DISP_CONDITION) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SPN_DISP_CONDITION;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SAT_STATE) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_SAT_STATE;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_ZONE_ZUHAUSE) == TRUE) {
                return STORAGE_KEY_TELEPHONY_ZONE_ZUHAUSE;
        }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_RSSI) == TRUE) {
                return STORAGE_KEY_TELEPHONY_RSSI;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_LOW_BATTERY) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_LOW_BATTERY;
-       }
-       else if (g_str_equal(key, "memory/telephony/event_system_ready") == TRUE) {
-               return STORAGE_KEY_TELEPHONY_EVENT_SYSTEM_READY;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_READY) == TRUE) {
                return STORAGE_KEY_TELEPHONY_READY;
        }
@@ -244,36 +206,24 @@ static enum tcore_storage_key convert_vconf_to_strgkey(const gchar* key)
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SPN_NAME) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SPN_NAME;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SAT_SETUP_IDLE_TEXT) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_SAT_SETUP_IDLE_TEXT;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_IMEI) == TRUE) {
                return STORAGE_KEY_TELEPHONY_IMEI;
        }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SUBSCRIBER_NUMBER) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SUBSCRIBER_NUMBER;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_SUBSCRIBER_NAME) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_SUBSCRIBER_NAME;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SWVERSION) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SWVERSION;
        }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_HWVERSION) == TRUE) {
                return STORAGE_KEY_TELEPHONY_HWVERSION;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_CALDATE) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_CALDATE;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_IMEI_FACTORY_REBOOT) == TRUE) {
                return STORAGE_KEY_TELEPHONY_IMEI_FACTORY_REBOOT;
        }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_SIM_FACTORY_MODE) == TRUE) {
                return STORAGE_KEY_TELEPHONY_SIM_FACTORY_MODE;
        }
-       else if (g_str_equal(key, VCONFKEY_TELEPHONY_PRODUCTCODE) == TRUE) {
-               return STORAGE_KEY_TELEPHONY_PRODUCTCODE;
-       }
        else if (g_str_equal(key, VCONFKEY_TELEPHONY_FACTORY_KSTRINGB) == TRUE) {
                return STORAGE_KEY_TELEPHONY_FACTORY_KSTRINGB;
        }
@@ -728,8 +678,6 @@ static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source, en
 
        dbg("vconf set (sim_status = %d)", sim->sim_status);
 
-       vconf_set_int(VCONFKEY_TELEPHONY_SIM_CHV, sim->sim_status);
-
        switch (sim->sim_status) {
                case SIM_STATUS_CARD_ERROR:
                        vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_CARD_ERROR);
@@ -744,7 +692,6 @@ static enum tcore_hook_return on_hook_sim_init(Server *s, CoreObject *source, en
 
                case SIM_STATUS_INIT_COMPLETED:
                        vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_INSERTED);
-                       vconf_set_int(VCONFKEY_TELEPHONY_SIM_INIT, VCONFKEY_TELEPHONY_SIM_INIT_COMPLETED);
                        break;
 
                case SIM_STATUS_INITIALIZING:
@@ -846,23 +793,16 @@ static void reset_vconf()
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_CS, VCONFKEY_TELEPHONY_SVC_CS_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_PS, VCONFKEY_TELEPHONY_SVC_PS_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_ROAM, VCONFKEY_TELEPHONY_SVC_ROAM_OFF);
-       vconf_set_int(VCONFKEY_TELEPHONY_ZONE_TYPE, VCONFKEY_TELEPHONY_ZONE_NONE);
-       vconf_set_int(VCONFKEY_TELEPHONY_SIM_INIT, VCONFKEY_TELEPHONY_SIM_INIT_NONE);
-       vconf_set_int(VCONFKEY_TELEPHONY_SIM_CHV, 0xFF);
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_PB_INIT, VCONFKEY_TELEPHONY_SIM_PB_INIT_NONE);
        vconf_set_int(VCONFKEY_TELEPHONY_CALL_STATE, VCONFKEY_TELEPHONY_CALL_CONNECT_IDLE);
        vconf_set_int(VCONFKEY_TELEPHONY_TAPI_STATE, VCONFKEY_TELEPHONY_TAPI_STATE_NONE);
        vconf_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_INVALID);
        vconf_set_str(VCONFKEY_TELEPHONY_SPN_NAME, "");
-       vconf_set_int(VCONFKEY_TELEPHONY_SAT_STATE, VCONFKEY_TELEPHONY_SAT_NONE);
-       vconf_set_str(VCONFKEY_TELEPHONY_SAT_SETUP_IDLE_TEXT, "");
        vconf_set_int(VCONFKEY_TELEPHONY_ZONE_ZUHAUSE, 0);
        vconf_set_int(VCONFKEY_TELEPHONY_RSSI, VCONFKEY_TELEPHONY_RSSI_0);
-       vconf_set_int(VCONFKEY_TELEPHONY_LOW_BATTERY, VCONFKEY_TELEPHONY_BATT_NORMAL_LEVEL);
        vconf_set_str(VCONFKEY_TELEPHONY_IMEI, "deprecated_vconf_imei");
        vconf_set_str(VCONFKEY_TELEPHONY_SUBSCRIBER_NUMBER, "");
-       vconf_set_str(VCONFKEY_TELEPHONY_SUBSCRIBER_NAME, "");
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_PB_INIT, VCONFKEY_TELEPHONY_SIM_PB_INIT_NONE);
        vconf_set_bool(VCONFKEY_TELEPHONY_READY, 0);
        vconf_set_int(VCONFKEY_TELEPHONY_NITZ_GMT, 0);
@@ -891,7 +831,6 @@ static gboolean on_init(TcorePlugin *p)
 
        reset_vconf();
 
-       vconf_set_int(VCONFKEY_TELEPHONY_LOW_BATTERY, VCONFKEY_TELEPHONY_BATT_NORMAL_LEVEL);
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_ROAM, VCONFKEY_TELEPHONY_SVC_ROAM_OFF);
 
        s = tcore_plugin_ref_server(p);