Remove feature : Dual Sim 32/42732/1 accepted/tizen/mobile/20150708.015038 accepted/tizen/tv/20150708.015137 accepted/tizen/wearable/20150708.015230 submit/tizen/20150630.051205 submit/tizen/20150702.103311
authorEunyoung Lee <ey928.lee@samsung.com>
Thu, 2 Jul 2015 02:59:23 +0000 (11:59 +0900)
committerEunyoung Lee <ey928.lee@samsung.com>
Thu, 2 Jul 2015 02:59:23 +0000 (11:59 +0900)
Change-Id: I98305c36da4ac50b553952fcd311c8f5b09cfad5

38 files changed:
daemon/main.c
daemon/main.h
data/resource/icons/Dual SIM/B03_Dual_Sim_00.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_01.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_1.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_2.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_MMS.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_SMS.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_data.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_global.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_heart.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_home.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_messages.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_office.png [deleted file]
data/resource/icons/Dual SIM/B03_Dual_Sim_phone.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_1.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_2.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_MMS.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_SMS.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_global.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_heart.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_home.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_office.png [deleted file]
data/resource/icons/Processing/B03_Call_divert_Sim_phone.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_00.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_01.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_02.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_03.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_04.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_00.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_01.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_02.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_03.png [deleted file]
data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_04.png [deleted file]
modules/connection/connection.c
modules/network/rssi.c
modules/network/rssi.h [deleted file]
modules/processing/call_divert.c

index cd0d8db..a18e2cc 100644 (file)
@@ -666,7 +666,7 @@ static void _create_win(void* data)
 
 //     root = ecore_x_window_root_first_get();
 //     ecore_x_window_size_get(root, &root_w, &root_h);
-#if 1
+#if 0
        if (root_w > qHD_RESOLUTION_WIDTH) { // HD
                _D("Window w, h (%d,%d)", root_w, root_h);
                ad->win.port_w = root_w;
@@ -687,15 +687,29 @@ static void _create_win(void* data)
 
        /* Create socket window */
        ad->win.win = elm_win_add(NULL, "portrait_indicator", ELM_WIN_SOCKET_IMAGE);
+       ret_if(!(ad->win.win));
        indi_name = "elm_indicator";
        elm_win_title_set(ad->win.win, "win sock test:port");
 
-       /*FIXME*/
+       /* FIXME : get indicator width and height withour ecore_x API */
+       elm_win_screen_size_get(ad->win.win, NULL, NULL, &root_w, &root_h);
+       _D("Window w (%d)", root_w);
 
+       if (root_w > qHD_RESOLUTION_WIDTH) { // HD
+               ad->win.port_w = root_w;
+               ad->win.land_w = 1280;
+               ad->win.h = root_h;
+       } else if (root_w < qHD_RESOLUTION_WIDTH) { // WVGA
+               ad->win.port_w = root_w;
+               ad->win.land_w = 800;
+               ad->win.h = root_h;
+       } else { // qHD
+               ad->win.port_w = root_w;
+               ad->win.land_w = 960;
+               ad->win.h = root_h;
+       }
        ad->win.w = root_w;
 
-       ret_if(!(ad->win.win));
-
        if (!elm_win_socket_listen(ad->win.win , indi_name, 0, EINA_FALSE)) {
                _E("failed 1st to elm_win_socket_listen() %x", ad->win.win);
                /* Start timer */
@@ -810,13 +824,11 @@ static void _init_win_info(void * data)
 
 static void _init_tel_info(void * data)
 {
-       int i = 0;
        struct appdata *ad = data;
-       retif(data == NULL, , "Invalid parameter!");
 
-       for(i = 0; i < SIM_CNT_MAX; i++) {
-               memset(&(ad->tel_info[i]),0x00,sizeof(telephony_info));
-       }
+       ret_if(!ad);
+
+       memset(&(ad->tel_info), 0x00, sizeof(telephony_info));
 }
 
 
index 1a06ff1..3998861 100644 (file)
@@ -84,8 +84,6 @@
 
 #define MSG_DOMAIN_CONTROL_ACCESS (int)ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL
 
-#define SIM_CNT_MAX 2
-
 enum _win_type {
        /* Clock view */
        TOP_WIN_NORMAL = 0,
@@ -122,7 +120,7 @@ typedef struct _telephony_info
 struct appdata {
 
        win_info win;
-       telephony_info tel_info[SIM_CNT_MAX];
+       telephony_info tel_info;
        int prefered_data;      // Data prefered
        Evas_Object* win_overlay;
 
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_00.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_00.png
deleted file mode 100755 (executable)
index 44da375..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_00.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_01.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_01.png
deleted file mode 100755 (executable)
index 1553dc9..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_01.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_1.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_1.png
deleted file mode 100755 (executable)
index aad2046..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_1.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_2.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_2.png
deleted file mode 100755 (executable)
index 7fe6021..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_2.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_MMS.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_MMS.png
deleted file mode 100755 (executable)
index 47d5864..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_MMS.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_SMS.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_SMS.png
deleted file mode 100755 (executable)
index 2e9862d..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_SMS.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_data.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_data.png
deleted file mode 100755 (executable)
index 5ca850a..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_data.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_global.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_global.png
deleted file mode 100755 (executable)
index ece731c..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_global.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_heart.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_heart.png
deleted file mode 100755 (executable)
index ff78ba0..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_heart.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_home.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_home.png
deleted file mode 100755 (executable)
index a2aa223..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_home.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_messages.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_messages.png
deleted file mode 100755 (executable)
index 2e9862d..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_messages.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_office.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_office.png
deleted file mode 100755 (executable)
index 4f2783b..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_office.png and /dev/null differ
diff --git a/data/resource/icons/Dual SIM/B03_Dual_Sim_phone.png b/data/resource/icons/Dual SIM/B03_Dual_Sim_phone.png
deleted file mode 100755 (executable)
index 42b07da..0000000
Binary files a/data/resource/icons/Dual SIM/B03_Dual_Sim_phone.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_1.png b/data/resource/icons/Processing/B03_Call_divert_Sim_1.png
deleted file mode 100644 (file)
index 45c9397..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_1.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_2.png b/data/resource/icons/Processing/B03_Call_divert_Sim_2.png
deleted file mode 100644 (file)
index 84de167..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_2.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_MMS.png b/data/resource/icons/Processing/B03_Call_divert_Sim_MMS.png
deleted file mode 100644 (file)
index f5c33a5..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_MMS.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_SMS.png b/data/resource/icons/Processing/B03_Call_divert_Sim_SMS.png
deleted file mode 100644 (file)
index cae35ff..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_SMS.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_global.png b/data/resource/icons/Processing/B03_Call_divert_Sim_global.png
deleted file mode 100644 (file)
index 6c1cdc5..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_global.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_heart.png b/data/resource/icons/Processing/B03_Call_divert_Sim_heart.png
deleted file mode 100644 (file)
index 43493fa..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_heart.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_home.png b/data/resource/icons/Processing/B03_Call_divert_Sim_home.png
deleted file mode 100644 (file)
index 2d56a14..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_home.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_office.png b/data/resource/icons/Processing/B03_Call_divert_Sim_office.png
deleted file mode 100644 (file)
index c056822..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_office.png and /dev/null differ
diff --git a/data/resource/icons/Processing/B03_Call_divert_Sim_phone.png b/data/resource/icons/Processing/B03_Call_divert_Sim_phone.png
deleted file mode 100644 (file)
index cf1e69f..0000000
Binary files a/data/resource/icons/Processing/B03_Call_divert_Sim_phone.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_00.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_00.png
deleted file mode 100755 (executable)
index 4a4da54..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_00.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_01.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_01.png
deleted file mode 100755 (executable)
index cd3590d..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_01.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_02.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_02.png
deleted file mode 100755 (executable)
index ef40006..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_02.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_03.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_03.png
deleted file mode 100755 (executable)
index fef9d76..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_03.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_04.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_04.png
deleted file mode 100755 (executable)
index d2c29b8..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_04.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_00.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_00.png
deleted file mode 100755 (executable)
index bb75695..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_00.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_01.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_01.png
deleted file mode 100755 (executable)
index 5e1d0ff..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_01.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_02.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_02.png
deleted file mode 100755 (executable)
index 1b0aef8..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_02.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_03.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_03.png
deleted file mode 100755 (executable)
index a246d8c..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_03.png and /dev/null differ
diff --git a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_04.png b/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_04.png
deleted file mode 100755 (executable)
index 37c1302..0000000
Binary files a/data/resource/icons/RSSI/B03_RSSI_Dual_Sim_roaming_04.png and /dev/null differ
index 8591a04..c15100d 100644 (file)
@@ -37,7 +37,6 @@
 #include "util.h"
 #include "box.h"
 #include "log.h"
-#include "network/rssi.h"
 
 #define ICON_PRIORITY  INDICATOR_PRIORITY_FIXED5
 #define MODULE_NAME            "connection"
@@ -289,9 +288,7 @@ static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, voi
                }
        }
 
-       int index = rssi_get_sim_number(handle_obj);
-       default_subscription = ad->tel_info[index].prefered_data;
-
+       default_subscription = ad->tel_info.prefered_data;
        if(default_subscription == TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN)
        {
                hide_image_icon();
@@ -309,13 +306,15 @@ static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, voi
                        }
                }
 
-               val = ad->tel_info[0].network_service_type;
-               ps_type = ad->tel_info[0].network_ps_type;
+               val = ad->tel_info.network_service_type;
+               ps_type = ad->tel_info.network_ps_type;
 
                DBG("TAPI_NETWORK_DEFAULT_DATA_SUBS_SIM1 %d",val);
                DBG("TAPI_NETWORK_DEFAULT_DATA_SUBS_SIM1 %d",ps_type);
                _show_proper_icon(val,ps_type, user_data);
        }
+       /* FIXME : remove? */
+#if 0
        else
        {
                int ret = 0;
@@ -336,6 +335,7 @@ static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, voi
                DBG("TAPI_NETWORK_DEFAULT_DATA_SUBS_SIM2 %d",ps_type);
                _show_proper_icon(val,ps_type, user_data);
        }
+#endif
 }
 
 
@@ -580,11 +580,11 @@ static void dnet_state_callback(keynode_t *node, void *data)
 
 
 
-static void dnet2_state_callback(keynode_t *node, void *data)
+/*static void dnet2_state_callback(keynode_t *node, void *data)
 {
        DBG("dnet_state_callback");
        on_noti(tapi_handle[1], NULL, NULL, data);
-}
+}*/
 
 
 
index b1a4ed4..c5d2c94 100644 (file)
@@ -17,7 +17,6 @@
  *
  */
 
-
 #include <tapi_common.h>
 #include <TelNetwork.h>
 #include <TelSim.h>
@@ -38,6 +37,7 @@
 #include "util.h"
 #include "connection/connection.h"
 #include "processing/call_divert.h"
+#include "log.h"
 
 #define VCONFKEY_TELEPHONY_PREFERRED_VOICE_SUBSCRIPTION        "db/telephony/dualsim/preferred_voice_subscription"
 
@@ -46,8 +46,6 @@
 #define SIMCARD_ICON_PRIORITY  INDICATOR_PRIORITY_FIXED4
 
 #define MODULE_NAME                    "RSSI"
-#define MODULE_NAME_SIM2               "RSSI2"
-#define MODULE_NAME_DUAL_SIM   "RSSI_DS"
 
 #define ICON_NOSIM             _("IDS_COM_BODY_NO_SIM")
 #define ICON_SEARCH            _("IDS_COM_BODY_SEARCHING")
@@ -59,8 +57,7 @@ static int register_rssi_module(void *data);
 static int unregister_rssi_module(void);
 static int language_changed_cb(void *data);
 static int wake_up_cb(void *data);
-static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data);
-static int _get_sim_icon(int sim_number);
+static void _on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data);
 static void _flight_mode(keynode_t *key, void *data);
 #ifdef _SUPPORT_SCREEN_READER
 static char *access_info_cb(void *data, Evas_Object *obj);
@@ -68,24 +65,6 @@ static char *access_info_cb(void *data, Evas_Object *obj);
 
 TapiHandle *tapi_handle[TAPI_HANDLE_MAX+1] = {0, };
 
-static int registered = 0;
-
-
-icon_s rssi_ds = {
-       .type = INDICATOR_IMG_ICON,
-       .name = MODULE_NAME_DUAL_SIM,
-       .priority = SIMCARD_ICON_PRIORITY,
-       .always_top = EINA_FALSE,
-       .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
-       .obj_exist = EINA_FALSE,
-       .area = INDICATOR_ICON_AREA_FIXED,
-#ifdef _SUPPORT_SCREEN_READER
-       .tts_enable = EINA_TRUE,
-       .access_cb = access_info_cb
-#endif
-};
-
 icon_s rssi = {
        .type = INDICATOR_IMG_ICON,
        .name = MODULE_NAME,
@@ -105,26 +84,6 @@ icon_s rssi = {
 #endif
 };
 
-icon_s rssi2 = {
-       .type = INDICATOR_IMG_ICON,
-       .name = MODULE_NAME_SIM2,
-       .priority = RSSI2_ICON_PRIORITY,
-       .always_top = EINA_FALSE,
-       .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
-       .obj_exist = EINA_FALSE,
-       .area = INDICATOR_ICON_AREA_FIXED,
-#ifdef _SUPPORT_SCREEN_READER
-       .tts_enable = EINA_TRUE,
-       .access_cb = access_info_cb
-#endif
-};
-
-enum {
-       SIM_1 = 1,
-       SIM_2
-};
-
 enum {
        LEVEL_RSSI_MIN = 0,
        LEVEL_FLIGHT,
@@ -137,40 +96,19 @@ enum {
        LEVEL_RSSI_SIM1_2,
        LEVEL_RSSI_SIM1_3,
        LEVEL_RSSI_SIM1_4,
-       LEVEL_RSSI_SIM2_0,
-       LEVEL_RSSI_SIM2_1,
-       LEVEL_RSSI_SIM2_2,
-       LEVEL_RSSI_SIM2_3,
-       LEVEL_RSSI_SIM2_4,
        LEVEL_RSSI_ROAMING_0,
        LEVEL_RSSI_ROAMING_1,
        LEVEL_RSSI_ROAMING_2,
        LEVEL_RSSI_ROAMING_3,
        LEVEL_RSSI_ROAMING_4,
-       LEVEL_RSSI_ROAMING2_0,
-       LEVEL_RSSI_ROAMING2_1,
-       LEVEL_RSSI_ROAMING2_2,
-       LEVEL_RSSI_ROAMING2_3,
-       LEVEL_RSSI_ROAMING2_4,
-       LEVEL_SIM_ICON_SIM1,
-       LEVEL_SIM_ICON_SIM2,
-       LEVEL_SIM_ICON_CALL,
-       LEVEL_SIM_ICON_SMS,
-       LEVEL_SIM_ICON_MMS,
-       LEVEL_SIM_ICON_INTERNET,
-       LEVEL_SIM_ICON_HOME,
-       LEVEL_SIM_ICON_OFFICE,
-       LEVEL_SIM_ICON_HEART,
        LEVEL_MAX
 };
 
-static int bRoaming = 0;
+static int registered = 0;
 static int updated_while_lcd_off = 0;
-static int prevIndex = -1;
-static int prevRoam = -1;
 #ifdef _SUPPORT_SCREEN_READER
-static int bRssiShown = 0;
 #endif
+
 static const char *icon_path[LEVEL_MAX] = {
        [LEVEL_FLIGHT] = "RSSI/B03_RSSI_Flightmode.png",
        [LEVEL_NOSIM] = "RSSI/B03_RSSI_NoSim.png",
@@ -182,135 +120,48 @@ static const char *icon_path[LEVEL_MAX] = {
        [LEVEL_RSSI_SIM1_2] = "RSSI/B03_RSSI_Sim_02.png",
        [LEVEL_RSSI_SIM1_3] = "RSSI/B03_RSSI_Sim_03.png",
        [LEVEL_RSSI_SIM1_4] = "RSSI/B03_RSSI_Sim_04.png",
-       [LEVEL_RSSI_SIM2_0] = "RSSI/B03_RSSI_Dual_Sim_00.png",
-       [LEVEL_RSSI_SIM2_1] = "RSSI/B03_RSSI_Dual_Sim_01.png",
-       [LEVEL_RSSI_SIM2_2] = "RSSI/B03_RSSI_Dual_Sim_02.png",
-       [LEVEL_RSSI_SIM2_3] = "RSSI/B03_RSSI_Dual_Sim_03.png",
-       [LEVEL_RSSI_SIM2_4] = "RSSI/B03_RSSI_Dual_Sim_04.png",
        [LEVEL_RSSI_ROAMING_0] = "RSSI/B03_RSSI_roaming_00.png",
        [LEVEL_RSSI_ROAMING_1] = "RSSI/B03_RSSI_roaming_01.png",
        [LEVEL_RSSI_ROAMING_2] = "RSSI/B03_RSSI_roaming_02.png",
        [LEVEL_RSSI_ROAMING_3] = "RSSI/B03_RSSI_roaming_03.png",
        [LEVEL_RSSI_ROAMING_4] = "RSSI/B03_RSSI_roaming_04.png",
-       [LEVEL_RSSI_ROAMING2_0] = "RSSI/B03_RSSI_Dual_Sim_roaming_00.png",
-       [LEVEL_RSSI_ROAMING2_1] = "RSSI/B03_RSSI_Dual_Sim_roaming_01.png",
-       [LEVEL_RSSI_ROAMING2_2] = "RSSI/B03_RSSI_Dual_Sim_roaming_02.png",
-       [LEVEL_RSSI_ROAMING2_3] = "RSSI/B03_RSSI_Dual_Sim_roaming_03.png",
-       [LEVEL_RSSI_ROAMING2_4] = "RSSI/B03_RSSI_Dual_Sim_roaming_04.png",
-       [LEVEL_SIM_ICON_SIM1] = "Dual SIM/B03_Dual_Sim_00.png",
-       [LEVEL_SIM_ICON_SIM2] = "Dual SIM/B03_Dual_Sim_01.png",
-       [LEVEL_SIM_ICON_CALL] = "Dual SIM/B03_Dual_Sim_phone.png",
-       [LEVEL_SIM_ICON_SMS] = "Dual SIM/B03_Dual_Sim_messages.png",
-       [LEVEL_SIM_ICON_MMS] = "Dual SIM/B03_Dual_Sim_data.png",
-       [LEVEL_SIM_ICON_INTERNET] = "Dual SIM/B03_Dual_Sim_global.png",
-       [LEVEL_SIM_ICON_HOME] = "Dual SIM/B03_Dual_Sim_home.png",
-       [LEVEL_SIM_ICON_OFFICE] = "Dual SIM/B03_Dual_Sim_office.png",
-       [LEVEL_SIM_ICON_HEART] = "Dual SIM/B03_Dual_Sim_heart.png"
 };
 
 static void set_app_state(void* data)
 {
-       rssi_ds.ad = data;
        rssi.ad = data;
-       rssi2.ad = data;
-}
-
-static void show_sim_ds_image_icon(void *data, int index)
-{
-       if (index < LEVEL_RSSI_MIN)
-               index = LEVEL_RSSI_MIN;
-       else if (index >= LEVEL_MAX)
-               index = LEVEL_NOSVC;
-
-       rssi_ds.img_obj.width = DEFAULT_ICON_WIDTH;
-
-       rssi_ds.img_obj.data = icon_path[index];
-
-       icon_show(&rssi_ds);
-
-       prevRoam = bRoaming;
-       prevIndex = index;
-       isSimShowing = 1;   // It is for judgement to show S1 icon(Sound, Wi-fi direct, bluetooth) or not.
-       util_signal_emit(rssi_ds.ad,"indicator.simicon.show","indicator.prog");
 }
 
-static void show_image_icon(void *data, int index)
+static void _show_image_icon(void *data, int index)
 {
-       if (index < LEVEL_RSSI_MIN)
+       if (index < LEVEL_RSSI_MIN) {
                index = LEVEL_RSSI_MIN;
-       else if (index >= LEVEL_MAX)
+       } else if (index >= LEVEL_MAX) {
                index = LEVEL_NOSVC;
+       }
 
        rssi.img_obj.width = DEFAULT_ICON_WIDTH;
-
        rssi.img_obj.data = icon_path[index];
 
        icon_show(&rssi);
 
-       prevRoam = bRoaming;
-       prevIndex = index;
-       isRSSI1Showing = 1;
-       util_signal_emit(rssi.ad,"indicator.rssi1.show","indicator.prog");
-}
-
-static void show_sim2_image_icon(void *data, int index)
-{
-       if (index < LEVEL_RSSI_MIN)
-               index = LEVEL_RSSI_MIN;
-       else if (index >= LEVEL_MAX)
-               index = LEVEL_NOSVC;
-
-       rssi2.img_obj.width = DEFAULT_ICON_WIDTH;
-
-       rssi2.img_obj.data = icon_path[index];
-
-       icon_show(&rssi2);
-
-       prevRoam = bRoaming;
-       prevIndex = index;
-       isRSSI2Showing = 1;
-       util_signal_emit(rssi2.ad,"indicator.rssi2.show","indicator.prog");
-}
-
-static void hide_sim_ds_image_icon(void)
-{
-       icon_hide(&rssi_ds);
-
-       isSimShowing = 0;    // It is for judgement to show S1 icon(Sound, Wi-fi direct, bluetooth) or not.
-       util_signal_emit(rssi_ds.ad,"indicator.simicon.hide","indicator.prog");
-}
-
-static void hide_sim_image_icon(void)
-{
-       icon_hide(&rssi);
-
-       isRSSI1Showing = 0;
-       util_signal_emit(rssi.ad,"indicator.rssi1.hide","indicator.prog");
-}
-
-static void hide_sim2_image_icon(void)
-{
-       icon_hide(&rssi2);
-
-       isRSSI2Showing = 0;
-       util_signal_emit(rssi2.ad,"indicator.rssi2.hide","indicator.prog");
+       util_signal_emit(rssi.ad, "indicator.rssi1.show", "indicator.prog");
 }
 
 static int language_changed_cb(void *data)
 {
-       on_noti(NULL, NULL, NULL, data);
-       return OK;
+       _on_noti(NULL, NULL, NULL, data);
+
+       return INDICATOR_ERROR_NONE;
 }
 
 static int wake_up_cb(void *data)
 {
-       if(updated_while_lcd_off==0)
-       {
-               return OK;
-       }
+       if (!updated_while_lcd_off) return INDICATOR_ERROR_NONE;
 
-       on_noti(NULL, NULL, NULL, data);
-       return OK;
+       _on_noti(NULL, NULL, NULL, data);
+
+       return INDICATOR_ERROR_NONE;
 }
 
 #ifdef _SUPPORT_SCREEN_READER
@@ -322,633 +173,342 @@ static char *access_info_cb(void *data, Evas_Object *obj)
        char buf1[256] = {0,};
        int status = 0;
 
-       if(bRssiShown == 0)
-       {
-               ERR("No rssi level");
-               return NULL;
-       }
-
        vconf_get_int(VCONFKEY_TELEPHONY_RSSI, &status);
        snprintf(buf1, sizeof(buf1), _("IDS_IDLE_BODY_PD_OUT_OF_4_BARS_OF_SIGNAL_STRENGTH"), status);
 
        snprintf(buf, sizeof(buf), "%s, %s", buf1,_("IDS_IDLE_BODY_STATUS_BAR_ITEM"));
+       _D("buf: %s", buf);
 
-       INFO("buf: %s", buf);
        tmp = strdup(buf);
-       if (!tmp) return NULL;
+       retv_if(!tmp, NULL);
+
        return tmp;
 }
 #endif
 
-static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
-       DBG("On noti funtion");
        int sim1_service = 0;
-       int sim2_service = 0;
        int status = 0;
-       int sim_slot_count = 0;
        int ret = 0;
        int val = 0;
-       int preferred_subscription = 0;
        struct appdata *ad = (struct appdata *)user_data;
+       TelSimCardStatus_t sim_status_sim1 = 0x00;
 
-       if(icon_get_update_flag()==0)
-       {
+       if (!icon_get_update_flag()) {
                updated_while_lcd_off = 1;
-               DBG("need to update %d",updated_while_lcd_off);
+               _D("need to update %d", updated_while_lcd_off);
                return;
        }
-
        updated_while_lcd_off = 0;
 
        ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
        if (ret == OK && status == TRUE) {
-               DBG("RSSI Status: Flight Mode");
-               show_image_icon(user_data, LEVEL_FLIGHT);
-               hide_sim2_image_icon();
-               hide_sim_ds_image_icon();
+               _D("Flight mode");
+               _show_image_icon(user_data, LEVEL_FLIGHT);
                return;
        }
-       ret = vconf_get_int(VCONFKEY_TELEPHONY_SIM_SLOT_COUNT, &sim_slot_count);
-       if (ret != OK)
-               LOGE("Failed to get dual_sim vconf");
-       DBG("Target's Sim Slot COUNT : %d", sim_slot_count);
 
-       TelSimCardStatus_t sim_status_sim1 = 0x00;
-       TelSimCardStatus_t sim_status_sim2 = 0x00;
+       sim_status_sim1 = ad->tel_info.sim_status;
 
-       sim_status_sim1 = ad->tel_info[0].sim_status;
-       if(sim_slot_count == 1)
-       {
-               DBG("Single Sim target");
-               sim_status_sim2 = TAPI_SIM_STATUS_CARD_NOT_PRESENT;
-       }
-       else if(sim_slot_count == 2)
-       {
-               DBG("Dual Sim target");
-               sim_status_sim2 = ad->tel_info[1].sim_status;
-       }
+       if (sim_status_sim1 != TAPI_SIM_STATUS_CARD_NOT_PRESENT) {
 
-       // Sim 2
-       if(sim_status_sim2 != TAPI_SIM_STATUS_CARD_NOT_PRESENT)
-       {
-               DBG("Sim2 inserted");
-               val = ad->tel_info[1].network_service_type;
-               DBG("Get SIM2 service type : %d", val);
-               switch(val)
-               {
-                       case TAPI_NETWORK_SERVICE_TYPE_NO_SERVICE:
-                               DBG("Service type: NO_SERVICE");
-                               show_sim2_image_icon(user_data, LEVEL_NOSVC);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_EMERGENCY:
-                               DBG("Service type: EMERGENCY : Signal-strength level : %d", val);
-                               val = ad->tel_info[1].signal_level;
-                               if(ret != OK)
-                               {
-                                       ERR("Can not get signal strength level");
-                               }
-                               show_sim2_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_SEARCH:
-                               DBG("Service type: SEARCH");
-                               show_sim2_image_icon(user_data, LEVEL_SEARCH);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_UNKNOWN: DBG("Service type : UNKNOWN");
-                       default:
-                               sim2_service = 1;
-                               break;
-               }
-               if(sim2_service)
-               {
-                       val = ad->tel_info[1].signal_level;
-                       DBG("Get SIM2 signal strength level: %d", val);
-                       int roaming = 0;
-                       roaming = ad->tel_info[1].roaming_status;
-                       preferred_subscription = ad->tel_info[1].default_network;
-                       if(roaming)
-                       {
-                               if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM2  && sim_status_sim1 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-                               {
-                                       show_sim2_image_icon(user_data, LEVEL_RSSI_ROAMING2_0+val);
-                               }
-                               else
-                               {
-                                       show_sim2_image_icon(user_data, LEVEL_RSSI_ROAMING_0+val);
-                               }
-                       }
-                       else
-                       {
-                               if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM2  && sim_status_sim1 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-                               {
-                                       show_sim2_image_icon(user_data, LEVEL_RSSI_SIM2_0+val);
-                               }
-                               else
-                               {
-                                       show_sim2_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
-                               }
-                       }
-               }
-       }
+               val = ad->tel_info.network_service_type;
+               _D("Network service type : %d", val);
 
-       // SIM 1
-       if(sim_status_sim1 != TAPI_SIM_STATUS_CARD_NOT_PRESENT)
-       {
-               DBG("Sim1 inserted");
-               val = ad->tel_info[0].network_service_type;
-               DBG("Get SIM1 service type : %d", val);
-               switch(val)
-               {
-                       case TAPI_NETWORK_SERVICE_TYPE_NO_SERVICE:
-                               DBG("Service type: NO_SERVICE");
-                               show_image_icon(user_data, LEVEL_NOSVC);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_EMERGENCY:
-                               DBG("Service type: EMERGENCY : Signal-strength level : %d", val);
-                               val = ad->tel_info[0].signal_level;
-                               if(ret != OK)
-                               {
-                                       ERR("Can not get signal strength level");
-                               }
-                               show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_SEARCH:
-                               DBG("Service type: SEARCH");
-                               show_image_icon(user_data, LEVEL_SEARCH);
-                               break;
-                       case TAPI_NETWORK_SERVICE_TYPE_UNKNOWN: DBG("Service type : UNKNOWN");
-                       default:
-                               DBG("Service type : UNKNOWN (%d)", val);
-                               sim1_service = 1;
-                               break;
-               }
-               if(sim1_service)
-               {
-                       val = ad->tel_info[0].signal_level;
-                       DBG("Get SIM1 signal strength level: %d", val);
-                       int roaming = 0;
-                       roaming = ad->tel_info[0].roaming_status;
-                       preferred_subscription = ad->tel_info[0].default_network;
-                       if(roaming)
-                       {
-                               if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM1  && sim_status_sim2 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-                               {
-                                       show_image_icon(user_data, LEVEL_RSSI_ROAMING2_0+val);
-                               }
-                               else
-                               {
-                                       show_image_icon(user_data, LEVEL_RSSI_ROAMING_0+val);
-                               }
+               switch (val) {
+               case TAPI_NETWORK_SERVICE_TYPE_NO_SERVICE:
+                       _D("Service type : NO_SERVICE");
+                       _show_image_icon(user_data, LEVEL_NOSVC);
+                       break;
+               case TAPI_NETWORK_SERVICE_TYPE_EMERGENCY:
+                       _D("Service type : EMERGENCY");
+                       val = ad->tel_info.signal_level;
+                       if (ret != OK) {
+                               _E("Can not get signal strength level");
                        }
-                       else
-                       {
-                               if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM1 && sim_status_sim2 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-                               {
-                                       show_image_icon(user_data, LEVEL_RSSI_SIM2_0+val);
-                               }
-                               else
-                               {
-                                       show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
-                               }
-                       }
-
+                       _show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
+                       break;
+               case TAPI_NETWORK_SERVICE_TYPE_SEARCH:
+                       _D("Service type : SEARCH");
+                       _show_image_icon(user_data, LEVEL_SEARCH);
+                       break;
+               default:
+                       _D("Service type : UNKNOWN (%d)", val);
+                       sim1_service = 1;
+                       break;
                }
-       }
 
-       if(sim_status_sim1 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED && sim_status_sim2 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-       {
-               DBG("Dual Sim : Check preferred network subscription");
-               if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM1)
-               {
-                       DBG("Preferred voice subscription set to sim1 : %d", preferred_subscription);
-                       show_sim_ds_image_icon(user_data, _get_sim_icon(SIM_1));
+               if (sim1_service) {
+                       val = ad->tel_info.signal_level;
+                       _D("get Sim1 signal strength level: %d", val);
 
-               }
-               else if(preferred_subscription == TAPI_NETWORK_DEFAULT_SUBS_SIM2)
-               {
-                       DBG("Preferred voice subscription set to sim2 : %d", preferred_subscription);
-                       show_sim_ds_image_icon(user_data, _get_sim_icon(SIM_2));
-               }
-               else
-               {
-                       hide_sim_ds_image_icon();
-                       ERR("Preferred voice subscription is: %d", preferred_subscription);
-               }
-       }
-       else if(sim_status_sim1 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED && sim_status_sim2 != TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-       {
-               DBG("Single Sim : Show Sim card 1 icon");
-               hide_sim2_image_icon();
-               show_sim_ds_image_icon(user_data, _get_sim_icon(SIM_1));
-       }
-       else if(sim_status_sim1 != TAPI_SIM_STATUS_SIM_INIT_COMPLETED && sim_status_sim2 == TAPI_SIM_STATUS_SIM_INIT_COMPLETED)
-       {
-               DBG("Single Sim : Show Sim card 2 icon");
-               hide_sim_image_icon();
-               show_sim_ds_image_icon(user_data, _get_sim_icon(SIM_2));
-       }
+                       int roaming = 0;
+                       roaming = ad->tel_info.roaming_status;
 
-       if(sim_status_sim1 == TAPI_SIM_STATUS_CARD_NOT_PRESENT &&
-               sim_status_sim2 == TAPI_SIM_STATUS_CARD_NOT_PRESENT)
-       {
-               hide_sim_image_icon();
-               hide_sim2_image_icon();
-               hide_sim_ds_image_icon();
-               val = ad->tel_info[0].signal_level;
-               DBG("No sim card : Signal-strength level : %d", val);
-               if(ret != OK)
-               {
-                       ERR("Can not get signal strength level");
+                       if (roaming) {
+                                       _show_image_icon(user_data, LEVEL_RSSI_ROAMING_0+val);
+                       } else {
+                                       _show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
+                       }
                }
-               show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
        }
-       else if(sim_slot_count !=2 )
-       {
-               DBG("Single Sim target");
-               hide_sim2_image_icon();
-               hide_sim_ds_image_icon();
-       }
-}
-
-static int _get_sim_icon(int sim_number)
-{
-       int status = 0;
-       int ret = 0;
 
-       if(sim_number == SIM_1)
-       {
-//             ret = vconf_get_int(VCONFKEY_SETAPPL_SIM1_ICON, &status);
-               if (ret == OK)
-               {
-                       LOGD("Sim 1 icon: %d", status);
-               }
-       }
-       else
-       {
-//             ret = vconf_get_int(VCONFKEY_SETAPPL_SIM2_ICON, &status);
-               if (ret == OK)
-               {
-                       LOGD("Sim 2 icon: %d", status);
+       if (sim_status_sim1 == TAPI_SIM_STATUS_CARD_NOT_PRESENT) {
+               val = ad->tel_info.signal_level;
+               _D("No sim card : Signal-strength level : %d", val);
+               if (ret != OK) {
+                       _E("Can not get signal strength level");
                }
+               _show_image_icon(user_data, LEVEL_RSSI_SIM1_0+val);
        }
-
-       return status+LEVEL_SIM_ICON_SIM1;
-}
-
-static void _sim_icon_update(keynode_t *key, void *data)
-{
-       on_noti(NULL, NULL, NULL, data);
 }
 
 static void _flight_mode(keynode_t *key, void *data)
 {
-       on_noti(NULL, NULL, NULL, data);
+       _on_noti(NULL, NULL, NULL, data);
 }
 
-int rssi_get_sim_number(TapiHandle *handle_obj)
-{
-       DBG("tapi_handle[0](%x),tapi_handle[1](%x),current(%x)",tapi_handle[0],tapi_handle[1],handle_obj);
-
-       int ret = -1;
-       if(tapi_handle[0]!=NULL)
-       {
-               if(tapi_handle[0]==handle_obj)
-                       ret = 0;
-       }
-
-       if(tapi_handle[1]!=NULL)
-       {
-               if(tapi_handle[1]==handle_obj)
-                       ret = 1;
-       }
-
-       if(ret == -1)
-       {
-               ERR("no handle %x",handle_obj);
-               ret = 0;
-       }
-
-       DBG("sim %d",ret);
-
-       return ret;
-}
-static void init_tel_info(void* data)
+static void _init_tel_info(void* data)
 {
        int ret = 0;
        struct appdata *ad = (struct appdata *)data;
        int i = 0;
        int val = 0;
        TelSimCardStatus_t sim_status;
-       retif(data == NULL, , "invalid parameter !!");
 
-       for(i=0;i<2;i++)
-       {
-               if(tapi_handle[i]==NULL)
-               {
-                       DBG("i %d,NULL");
-                       continue;
-               }
-               DBG("tapi handle %x %d",tapi_handle[i],i);
+       ret_if(!ad);
+
+       /* FIXME : modem_num? */
+//     for (i = 0; i < 2; i++) {
+               if (!tapi_handle[i]) return;
+
                ret = tel_get_property_int(tapi_handle[i], TAPI_PROP_NETWORK_ROAMING_STATUS, &val);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_PROP_NETWORK_ROAMING_STATUS);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_PROP_NETWORK_ROAMING_STATUS);
                }
-               DBG("TAPI_PROP_NETWORK_ROAMING_STATUS %d",val);
-               ad->tel_info[i].roaming_status = val;
+               ad->tel_info.roaming_status = val;
 
                ret = tel_get_property_int(tapi_handle[i], TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, &val);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL);
                }
-               DBG("TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL %d",val);
-               ad->tel_info[i].signal_level = val;
+               ad->tel_info.signal_level = val;
 
                ret = tel_get_property_int(tapi_handle[i], TAPI_PROP_NETWORK_SERVICE_TYPE, &val);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_PROP_NETWORK_SERVICE_TYPE);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_PROP_NETWORK_SERVICE_TYPE);
                }
-               DBG("TAPI_PROP_NETWORK_SERVICE_TYPE %d",val);
-               ad->tel_info[i].network_service_type = val;
+               ad->tel_info.network_service_type = val;
 
                ret = tel_get_property_int(tapi_handle[i], TAPI_PROP_NETWORK_PS_TYPE, &val);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_PROP_NETWORK_SERVICE_TYPE);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_PROP_NETWORK_SERVICE_TYPE);
                }
-               DBG("TAPI_PROP_NETWORK_PS_TYPE %d",val);
-               ad->tel_info[i].network_ps_type = val;
-
+               ad->tel_info.network_ps_type = val;
 
                TelCallPreferredVoiceSubs_t preferred_sub = TAPI_CALL_PREFERRED_VOICE_SUBS_UNKNOWN;
                ret = tel_get_call_preferred_voice_subscription(tapi_handle[i], &preferred_sub);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION);
                }
-               DBG("TAPI_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION %d",preferred_sub);
-               ad->tel_info[i].prefered_voice = preferred_sub;
+               ad->tel_info.prefered_voice = preferred_sub;
 #ifdef DEVICE_BUILD
                TelNetworkDefaultDataSubs_t preferred_data = TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN;
-               ret =  tel_get_network_default_data_subscription(tapi_handle[i], &preferred_data);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION);
+               ret = tel_get_network_default_data_subscription(tapi_handle[i], &preferred_data);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION);
                }
-               DBG("TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION %d",preferred_data);
-               ad->tel_info[i].prefered_data = preferred_data;
+               ad->tel_info.prefered_data = preferred_data;
 
                TelNetworkDefaultSubs_t default_subs = TAPI_NETWORK_DEFAULT_SUBS_UNKNOWN;
-               ret =  tel_get_network_default_subscription(tapi_handle[i], &default_subs);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
+               ret = tel_get_network_default_subscription(tapi_handle[i], &default_subs);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
                }
-               DBG("TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION %d",default_subs);
-
-               ad->tel_info[i].default_network = default_subs;
+               ad->tel_info.default_network = default_subs;
 
                ret = tel_get_property_int(tapi_handle[i], TAPI_PROP_SIM_CALL_FORWARD_STATE, &val);
-               if(ret != OK)
-               {
-                       ERR("Can not get %s",TAPI_PROP_SIM_CALL_FORWARD_STATE);
+               if (ret != OK) {
+                       _E("Can not get %s",TAPI_PROP_SIM_CALL_FORWARD_STATE);
                }
-               ad->tel_info[i].call_forward = val;
-               DBG("TAPI_PROP_SIM_CALL_FORWARD_STATE %d",val);
-#endif // DEVICE_BUILD
+               ad->tel_info.call_forward = val;
+#endif
 
                int changed = 0;
                ret = tel_get_sim_init_info(tapi_handle[i], &sim_status, &changed);
-               if(ret != OK)
-               {
-                       ERR("Can not get sim init info");
+               if (ret != OK) {
+                       _E("Can not get sim init info");
                }
-               DBG("sim info %d",sim_status);
-               ad->tel_info[i].sim_status = sim_status;
-       }
+               ad->tel_info.sim_status = sim_status;
+//     }
 }
-static void signal_strength_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+
+static void _signal_strength_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *sig_level = data;
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
-       DBG ("property(%s) receive !!", TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL);
-       DBG (" - sig_level = %d", *sig_level);
 
-       ad->tel_info[sim_number].signal_level= *sig_level;
+       ret_if(!ad);
+
+       _D("Signal level = %d", *sig_level);
+
+       ad->tel_info.signal_level= *sig_level;
 
-       on_noti(handle_obj,noti_id,data,user_data);
+       _on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void sim_status_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _sim_status_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *sim_status = data;
-
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       ERR ("sim %d",sim_number);
 
-       ERR ("property(%s) receive !!", TAPI_NOTI_SIM_STATUS);
-       ERR (" - sim_status = %d", *sim_status);
+       ret_if(!ad);
+
+       _D("Sim status = %d ", *sim_status);
 
-       ad->tel_info[sim_number].sim_status= *sim_status;
+       ad->tel_info.sim_status= *sim_status;
 
-       on_noti(handle_obj,noti_id,data,user_data);
-       connection_icon_on_noti(handle_obj,noti_id,data,user_data);
+       _on_noti(handle_obj, noti_id, data, user_data);
+       connection_icon_on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void network_service_type_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _network_service_type_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *service_type = data;
-
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
 
-       DBG ("property(%s) receive !!", TAPI_PROP_NETWORK_SERVICE_TYPE);
-       DBG (" - service_type = %d", *service_type);
+       ret_if(!ad);
 
-       ad->tel_info[sim_number].network_service_type= *service_type;
+       _D ("Network service type = %d", *service_type);
 
-       on_noti(handle_obj,noti_id,data,user_data);
-       connection_icon_on_noti(handle_obj,noti_id,data,user_data);
+       ad->tel_info.network_service_type= *service_type;
+
+       _on_noti(handle_obj, noti_id, data, user_data);
+       connection_icon_on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void network_ps_type_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _network_ps_type_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *ps_type = data;
-
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
 
-       DBG ("property(%s) receive !!", TAPI_PROP_NETWORK_PS_TYPE);
-       DBG (" - ps_type = %d", *ps_type);
+       ret_if(!ad);
+
+       _D ("Network ps type = %d", *ps_type);
 
-       ad->tel_info[sim_number].network_ps_type= *ps_type;
+       ad->tel_info.network_ps_type= *ps_type;
 
-       connection_icon_on_noti(handle_obj,noti_id,data,user_data);
+       connection_icon_on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void roaming_status_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _roaming_status_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *roaming_status = data;
-
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
-
-       DBG ("property(%s) receive !!", TAPI_PROP_NETWORK_ROAMING_STATUS);
-       DBG (" - roaming_status = %d", *roaming_status);
-
-       ad->tel_info[sim_number].roaming_status= *roaming_status;
 
-       on_noti(handle_obj,noti_id,data,user_data);
-}
-
-
-#if 0
-static void preferred_voice_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
-{
-       int *prefered_voice = data;
-
-       struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
+       ret_if(!ad);
 
-       DBG ("property(%s) receive !!", TAPI_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION);
-       DBG (" - preferred_voice = %d", *prefered_voice);
+       _D ("Roaming status = %d", *roaming_status);
 
-       ad->tel_info[sim_number].prefered_voice = *prefered_voice;
+       ad->tel_info.roaming_status= *roaming_status;
 
-       on_noti(handle_obj,noti_id,data,user_data);
+       _on_noti(handle_obj, noti_id, data, user_data);
 }
-#endif
-
-
-static void preferred_data_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+/* FIXME : remove? */
+static void _preferred_data_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
-       struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
        struct tel_noti_network_default_data_subs *noti = data;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
+       struct appdata *ad = (struct appdata *)user_data;
+
+       ret_if(!ad);
 
-       DBG ("property(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION);
-       DBG (" - preferred_data = %d", noti->default_subs);
+       _D ("Preferred data = %d", noti->default_subs);
 
        //Data preferred calback comes from only the sim handle which changed
        //SIM1->SIM2 , callback comes only for SIM2 handle
-       ad->tel_info[0].prefered_data = noti->default_subs;
-       ad->tel_info[1].prefered_data = noti->default_subs;
+       ad->tel_info.prefered_data = noti->default_subs;
        //data prefered is not controllered
 
-       connection_icon_on_noti(handle_obj,noti_id,data,user_data);
+       connection_icon_on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void default_network_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _default_network_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
-       struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
        struct tel_noti_network_default_subs *noti = data;
-       sim_number = rssi_get_sim_number(handle_obj);
-       DBG ("sim %d",sim_number);
+       struct appdata *ad = (struct appdata *)user_data;
+
+       ret_if(!ad);
 
-       DBG ("property(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
-       DBG (" - default_network = %d", noti->default_subs);
+       _D ("Default network = %d", noti->default_subs);
 
-       ad->tel_info[sim_number].default_network = noti->default_subs;
+       ad->tel_info.default_network = noti->default_subs;
 
-       on_noti(handle_obj,noti_id,data,user_data);
+       _on_noti(handle_obj, noti_id, data, user_data);
 }
 
-static void call_forward_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _call_forward_cb(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
        int *call_forward = data;
-
        struct appdata *ad = (struct appdata *)user_data;
-       retif(user_data == NULL, , "invalid parameter!!");
-       int sim_number = 0;
-       sim_number = rssi_get_sim_number(handle_obj);
 
-       DBG ("sim %d",sim_number);
-#ifdef DEVICE_BUILD
-       DBG ("property(%s) receive !!", TAPI_PROP_SIM_CALL_FORWARD_STATE);
-#endif // DEVICE_BUILD
-       DBG (" - call_forward = %d", *call_forward);
+       ret_if(!ad);
 
-       ad->tel_info[sim_number].call_forward = *call_forward;
+       _D ("Call forward = %d", *call_forward);
 
-       call_forward_on_noti(handle_obj,noti_id,data,user_data);
-}
+       ad->tel_info.call_forward = *call_forward;
 
+       call_forward_on_noti(handle_obj, noti_id,data, user_data);
+}
 
 /* Initialize TAPI */
-static void __init_tel(void *data)
+static void _init_tel(void *data)
 {
-       DBG("__init_tel");
        char **cp_list = NULL;
        unsigned int modem_num = 0;
 
-       if(registered ==1)
-       {
-               ERR("already registered");
+       _D("Initialize TAPI");
+
+       if (registered) {
+               _E("TAPI Already registered");
                return;
        }
 
        cp_list = tel_get_cp_name_list();
-       retif(cp_list == NULL, , "tel_get_cp_name_list() return NULL !!");
+       ret_if(!cp_list);
+
        while (cp_list[modem_num]) {
                tapi_handle[modem_num] = tel_init(cp_list[modem_num]);
-               if(!tapi_handle[modem_num])
-               {
-                       ERR("tapi_handle[%d] is null !!", modem_num);
-               }
-               else
-               {
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, signal_strength_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_SIM_STATUS, sim_status_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_SERVICE_TYPE, network_service_type_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_PS_TYPE, network_ps_type_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_ROAMING_STATUS, roaming_status_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, preferred_data_cb, data);
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION, default_network_cb, data);
+               if (!tapi_handle[modem_num]) {
+                       _E("tapi_handle[%d] is NULL", modem_num);
+               } else {
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, _signal_strength_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_SIM_STATUS, _sim_status_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_SERVICE_TYPE, _network_service_type_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_PS_TYPE, _network_ps_type_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_NETWORK_ROAMING_STATUS, _roaming_status_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, _preferred_data_cb, data);
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION, _default_network_cb, data);
 #ifdef DEVICE_BUILD
-                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_SIM_CALL_FORWARD_STATE , call_forward_cb, data);
-#endif // DEVICE_BUILD
+                       tel_register_noti_event(tapi_handle[modem_num], TAPI_PROP_SIM_CALL_FORWARD_STATE , _call_forward_cb, data);
+#endif
                }
                modem_num++;
        }
-       DBG("Model num: %d", modem_num);
+       _D("modem num: %d", modem_num);
+
        tapi_handle[modem_num] = NULL;
        g_strfreev(cp_list);
-       init_tel_info(data);
-       on_noti(NULL, NULL, NULL, data);
+       _init_tel_info(data);
+       _on_noti(NULL, NULL, NULL, data);
 
        registered = 1;
 }
 
 /* De-initialize TAPI */
-static void __deinit_tel()
+static void _deinit_tel()
 {
-       DBG("__deinit_tel");
+       _D("De-initialize TAPI");
        unsigned int i = 0;
 
        while (tapi_handle[i]) {
@@ -963,7 +523,7 @@ static void __deinit_tel()
                        tel_deregister_noti_event(tapi_handle[i], TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
 #ifdef DEVICE_BUILD
                        tel_deregister_noti_event(tapi_handle[i], TAPI_PROP_SIM_CALL_FORWARD_STATE);
-#endif // DEVICE_BUILD
+#endif
                }
                tel_deinit(tapi_handle[i]);
                tapi_handle[i] = NULL;
@@ -974,75 +534,61 @@ static void __deinit_tel()
        registered = 0;
 }
 
-static void tel_ready_cb(keynode_t *key, void *data)
+static void _tel_ready_cb(keynode_t *key, void *data)
 {
        gboolean status = FALSE;
 
        status = vconf_keynode_get_bool(key);
        if (status == TRUE) {    /* Telephony State - READY */
-               __init_tel(data);
+               _init_tel(data);
        }
-       else {                   /* Telephony State – NOT READY */
+       else { /* Telephony State – NOT READY */
                /* De-initialization is optional here (ONLY if required) */
-               __deinit_tel();
+               _deinit_tel();
        }
 }
 
 static int register_rssi_module(void *data)
 {
-       int r = 0;
-
        gboolean state = FALSE;
+       int ret;
 
-       retif(data == NULL, FAIL, "Invalid parameter!");
+       retv_if(!data, 0);
 
        set_app_state(data);
 
-       DBG("RSSI initialization");
-       vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode, data);
-//     vconf_notify_key_changed(VCONFKEY_SETAPPL_SIM1_ICON, _sim_icon_update, data);
-//     vconf_notify_key_changed(VCONFKEY_SETAPPL_SIM2_ICON, _sim_icon_update, data);
-
-       vconf_get_bool(VCONFKEY_TELEPHONY_READY, &state);
+       ret = vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode, data);
+       if (ret != OK) _E("Failed to register callback for VCONFKEY_TELEPHONY_FLIGHT_MODE");
 
-       if(state)
-       {
-               DBG("Telephony ready");
-               __init_tel(data);
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_READY, &state);
+       if (ret != OK) {
+               _E("Failed to get value for VCONFKEY_TELEPHONY_READY");
+               return ret;
        }
-       else
-       {
-               DBG("Telephony not ready");
-               vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, tel_ready_cb, data);
+
+       if(state) {
+               _D("Telephony ready");
+               _init_tel(data);
+       } else {
+               _D("Telephony not ready");
+               vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, _tel_ready_cb, data);
        }
 
-       r = OK;
-       return r;
+       return ret;
 }
 
 static int unregister_rssi_module(void)
 {
        int ret;
 
-       ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_READY,
-                                          tel_ready_cb);
-       if (ret != OK)
-               ERR("Failed to unregister callback!");
-
-       ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-                                          _flight_mode);
-       if (ret != OK)
-               ERR("Failed to unregister callback!");
-#if 0
-       ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SIM1_ICON, _sim_icon_update);
-       if (ret != OK)
-               ERR("Failed to unregister callback!");
-
-       ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SIM2_ICON, _sim_icon_update);
-       if (ret != OK)
-               ERR("Failed to unregister callback!");
-#endif
-       __deinit_tel();
-       ret = OK;
+       ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_READY, _tel_ready_cb);
+       if (ret != OK) _E("Failed to unregister callback for VCONFKEY_TELEPHONY_READY");
+
+       ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode);
+       if (ret != OK) _E("Failed to unregister callback for VCONFKEY_TELEPHONY_FLIGHT_MODE");
+
+       _deinit_tel();
+
        return ret;
 }
+/* End of file */
diff --git a/modules/network/rssi.h b/modules/network/rssi.h
deleted file mode 100644 (file)
index 0ace0dd..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Indicator
- *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-
-#ifndef __INDICATOR_RSSI_H__
-#define __INDICATOR_RSSI_H__
-
-extern int rssi_get_sim_number(TapiHandle *handle_obj);
-
-#endif
index 0973d03..01a2f55 100644 (file)
@@ -17,7 +17,6 @@
  *
  */
 
-
 #include <tapi_common.h>
 #include <TelNetwork.h>
 #include <TelSim.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <vconf.h>
+
 #include "common.h"
 #include "indicator.h"
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY  INDICATOR_PRIORITY_SYSTEM_2
 #define MODULE_NAME            "call_divert"
-#define MODULE_NAME_SIM2               "call_divert2"
 
 #define TAPI_HANDLE_MAX  2
 
 static int register_call_divert_module(void *data);
 static int unregister_call_divert_module(void);
+static void _on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data);
 #ifdef _SUPPORT_SCREEN_READER
 static char *access_info_cb(void *data, Evas_Object *obj);
 #endif
 
-static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data);
-
 icon_s call_divert = {
        .type = INDICATOR_IMG_ICON,
        .name = MODULE_NAME,
@@ -64,92 +63,24 @@ icon_s call_divert = {
 #endif
 };
 
-icon_s call_divert2 = {
-       .type = INDICATOR_IMG_ICON,
-       .name = MODULE_NAME_SIM2,
-       .priority = ICON_PRIORITY,
-       .always_top = EINA_FALSE,
-       .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
-       .obj_exist = EINA_FALSE,
-       .area = INDICATOR_ICON_AREA_SYSTEM,
-#ifdef _SUPPORT_SCREEN_READER
-       .tts_enable = EINA_TRUE,
-       .access_cb = access_info_cb
-#endif
-};
-
-/*FIXME*/
-enum {
-       SIM_ICON_SIM1 = 0,
-       SIM_ICON_SIM2,
-       SIM_ICON_CALL,
-       SIM_ICON_SMS,
-       SIM_ICON_MMS,
-       SIM_ICON_INTERNET,
-       SIM_ICON_HOME,
-       SIM_ICON_OFFICE,
-       SIM_ICON_HEART,
-       SIM_ICON_MAX
-};
-
-static const char *icon_path[SIM_ICON_MAX] = {
-       [SIM_ICON_SIM1] = "Processing/B03_Call_divert_Sim_1.png",
-       [SIM_ICON_SIM2] = "Processing/B03_Call_divert_Sim_2.png",
-       [SIM_ICON_CALL] = "Processing/B03_Call_divert_Sim_phone.png",
-       [SIM_ICON_SMS] = "Processing/B03_Call_divert_Sim_SMS.png",
-       [SIM_ICON_MMS] = "Processing/B03_Call_divert_Sim_MMS.png",
-       [SIM_ICON_INTERNET] = "Processing/B03_Call_divert_Sim_global.png",
-       [SIM_ICON_HOME] = "Processing/B03_Call_divert_Sim_home.png",
-       [SIM_ICON_OFFICE] = "Processing/B03_Call_divert_Sim_office.png",
-       [SIM_ICON_HEART] = "Processing/B03_Call_divert_Sim_heart.png",
-};
-
-enum {
-       SIM_1 = 1,
-       SIM_2
-};
-
-
+static const char *icon_path = "call_devert/B03_Call_divert_default.png";
 
 static void set_app_state(void* data)
 {
        call_divert.ad = data;
-       call_divert2.ad = data;
 }
 
-
-
-static void show_image_icon(void *data, int icon)
+static void _show_image_icon(void *data)
 {
-       call_divert.img_obj.data = icon_path[icon];
+       call_divert.img_obj.data = icon_path;
        icon_show(&call_divert);
 }
 
-
-
-static void hide_image_icon(void)
+static void _hide_image_icon(void)
 {
        icon_hide(&call_divert);
 }
 
-
-
-static void show_sim2_image_icon(void *data, int icon)
-{
-       call_divert2.img_obj.data = icon_path[icon];
-       icon_show(&call_divert2);
-}
-
-
-
-static void hide_sim2_image_icon(void)
-{
-       icon_hide(&call_divert2);
-}
-
-
-
 #ifdef _SUPPORT_SCREEN_READER
 static char *access_info_cb(void *data, Evas_Object *obj)
 {
@@ -157,8 +88,7 @@ static char *access_info_cb(void *data, Evas_Object *obj)
        char buf[256] = {0,};
        int status = 0;
 
-       switch (status)
-       {
+       switch (status) {
        case VCONFKEY_TELEPHONY_CALL_FORWARD_ON:
                snprintf(buf, sizeof(buf), "%s, %s, %s",_("IDS_CST_BODY_CALL_FORWARDING"),_("IDS_IDLE_BODY_ICON"),_("IDS_IDLE_BODY_STATUS_BAR_ITEM"));
                break;
@@ -168,143 +98,113 @@ static char *access_info_cb(void *data, Evas_Object *obj)
 
        tmp = strdup(buf);
        if (!tmp) return NULL;
+
        return tmp;
 }
 #endif
 
-static int _get_sim_icon(int sim_number)
-{
-       int status = 0;
-//     int ret = 0;
-
-       if(sim_number == SIM_1)
-       {
-       /*      ret = vconf_get_int(VCONFKEY_SETAPPL_SIM1_ICON, &status);
-               if (ret == OK)
-               {
-                       LOGD("Sim 1 icon: %d", status);
-               }*/
-       }
-       else
-       {
-       /*      ret = vconf_get_int(VCONFKEY_SETAPPL_SIM2_ICON, &status);
-               if (ret == OK)
-               {
-                       LOGD("Sim 2 icon: %d", status);
-               }*/
-       }
-
-       return status;
-}
-
-static void on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
+static void _on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
-       DBG("on_noti");
        int status = 0;
        int ret = 0;
-       int ret_for_sim1 = 0;
-       int ret_for_sim2 = 0;
-       int icon = 0;
-       retif(user_data == NULL, , "invalid parameter!!");
+       int call_divert_state = 0;
+
+       ret_if(!user_data);
 
        ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
        if (ret == OK && status == TRUE) {
-               DBG("Flight Mode");
-               hide_sim2_image_icon();
-               hide_image_icon();
+               _D("Flight Mode");
+               _hide_image_icon();
                return;
        }
 
-       if(ret_for_sim1 == VCONFKEY_TELEPHONY_CALL_FORWARD_ON)
-       {
-               DBG("Show call_farward 1 icon.");
-               icon = _get_sim_icon(SIM_1);
-               show_image_icon(data, icon);
-       }
-       else    // VCONFKEY_TELEPHONY_CALL_FORWARD_OFF
-       {
-               DBG("Hide call_farward 1 icon.");
-               hide_image_icon();
+       /*
+        *\note
+        * Call forward function like call divert.
+        */
+       /* FIXME */
+       if (call_divert_state == VCONFKEY_TELEPHONY_CALL_FORWARD_ON) {
+               _D("Show call divert icon");
+               _show_image_icon(data);
+       } else { /* VCONFKEY_TELEPHONY_CALL_FORWARD_OFF */
+               _D("Hide call divert icon");
+               _hide_image_icon();
        }
 
-       if(ret_for_sim2 == VCONFKEY_TELEPHONY_CALL_FORWARD_ON)
-       {
-               DBG("Show call_farward 2 icon.");
-               icon = _get_sim_icon(SIM_2);
-               show_sim2_image_icon(data, icon);
-       }
-       else    // VCONFKEY_TELEPHONY_CALL_FORWARD_OFF
-       {
-               DBG("Hide call_farward 2 icon.");
-               hide_sim2_image_icon();
-       }
+       return;
 }
 
 void call_forward_on_noti(TapiHandle *handle_obj, const char *noti_id, void *data, void *user_data)
 {
-       DBG("");
-       on_noti(NULL, NULL, NULL, user_data);
+       _D("");
+       _on_noti(NULL, NULL, NULL, user_data);
 
 }
 
 /* Initialize TAPI */
-static void __init_tel(void *data)
+static void _init_tel(void *data)
 {
-       on_noti(NULL, NULL, NULL, data);
+       _on_noti(NULL, NULL, NULL, data);
 }
 
 /* De-initialize TAPI */
-static void __deinit_tel()
+static void _deinit_tel()
 {
-       DBG("__deinit_tel");
+       _D("");
 }
 
-static void tel_ready_cb(keynode_t *key, void *data)
+static void _tel_ready_cb(keynode_t *key, void *data)
 {
        gboolean status = FALSE;
 
        status = vconf_keynode_get_bool(key);
-       if (status == TRUE) {    /* Telephony State - READY */
-               __init_tel(data);
-       }
-       else {                   /* Telephony State – NOT READY */
-               /* De-initialization is optional here (ONLY if required) */
-               __deinit_tel();
+       if (status == TRUE) { /* Telephony State - READY */
+               _init_tel(data);
+       } else { /* Telephony State – NOT READY */
+               /*
+                *\note
+                * De-initialization is optional here. (ONLY if required)
+                */
+               _deinit_tel();
        }
 }
 
 static void _flight_mode(keynode_t *key, void *data)
 {
-       on_noti(NULL, NULL, NULL, data);
+       _on_noti(NULL, NULL, NULL, data);
 }
-#if 0
+
 static void _sim_icon_update(keynode_t *key, void *data)
 {
-       on_noti(NULL, NULL, NULL, data);
+       _on_noti(NULL, NULL, NULL, data);
 }
-#endif
+
 static int register_call_divert_module(void *data)
 {
-       int ret = 0;
-
-       retif(data == NULL, FAIL, "Invalid parameter!");
-
        gboolean state = FALSE;
+       int ret;
+
+       retv_if(!data, 0);
 
        set_app_state(data);
-       vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode, data);
 
-       vconf_get_bool(VCONFKEY_TELEPHONY_READY, &state);
+       ret = vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode, data);
+       if (ret != OK) {
+               _E("Failed to register callback for VCONFKEY_TELEPHONY_FLIGHT_MODE");
+       }
 
-       if(state)
-       {
-               DBG("Telephony ready");
-               __init_tel(data);
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_READY, &state);
+       if (ret != OK) {
+               _E("Failed to get value for VCONFKEY_TELEPHONY_READY");
+               return ret;
        }
-       else
-       {
-               DBG("Telephony not ready");
-               vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, tel_ready_cb, data);
+
+       if (state) {
+               _D("Telephony ready");
+               _init_tel(data);
+       } else {
+               _D("Telephony not ready");
+               vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, _tel_ready_cb, data);
        }
 
        return ret;
@@ -314,11 +214,10 @@ static int unregister_call_divert_module(void)
 {
        int ret = 0;
 
-       __deinit_tel();
+       _deinit_tel();
 
        vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, _flight_mode);
-       //vconf_ignore_key_changed(VCONFKEY_SETAPPL_SIM1_ICON, _sim_icon_update);
-       //vconf_ignore_key_changed(VCONFKEY_SETAPPL_SIM2_ICON, _sim_icon_update);
 
        return ret;
 }
+/* End of file */