diff options
| author | Radoslaw Czerski <r.czerski@samsung.com> | 2016-03-11 16:45:17 +0100 |
|---|---|---|
| committer | Radoslaw Czerski <r.czerski@samsung.com> | 2016-03-12 05:32:34 -0800 |
| commit | c9a5089130a52313427defb17ee6ec44ada69d19 (patch) | |
| tree | 9aa4dc2d571813996761dbeef8a7c477329aa9fe /src | |
| parent | 97d50f893f4d5281882298bbc9d62c272474093a (diff) | |
| download | indicator-win-c9a5089130a52313427defb17ee6ec44ada69d19.tar.gz indicator-win-c9a5089130a52313427defb17ee6ec44ada69d19.tar.bz2 indicator-win-c9a5089130a52313427defb17ee6ec44ada69d19.zip | |
modules/network/rssi: Fail fixed.
Change-Id: I1fa533d4998ff655c478bf30732bc27c3430e1e6
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/network/rssi.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/modules/network/rssi.c b/src/modules/network/rssi.c index a41b925..8dadb6b 100644 --- a/src/modules/network/rssi.c +++ b/src/modules/network/rssi.c @@ -92,7 +92,6 @@ typedef enum { LEVEL_MAX } rssi_icon_e; -static int registered = 0; static int updated_while_lcd_off = 0; static const char *icon_path[LEVEL_MAX] = { @@ -277,11 +276,6 @@ static void _init_tel(void *data) _D("Initialize telephony..."); - retm_if(registered, "Telephony already registered"); - - ret = telephony_init(&tel_list); - retm_if(ret != TELEPHONY_ERROR_NONE, "telephony_init failed %s", get_error_message(ret)); - telephony_noti_e events[] = { TELEPHONY_NOTI_NETWORK_SIGNALSTRENGTH_LEVEL, TELEPHONY_NOTI_SIM_STATUS, TELEPHONY_NOTI_NETWORK_SERVICE_STATE, TELEPHONY_NOTI_NETWORK_PS_TYPE, TELEPHONY_NOTI_NETWORK_ROAMING_STATUS, TELEPHONY_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, TELEPHONY_NOTI_NETWORK_DEFAULT_SUBSCRIPTION}; @@ -295,24 +289,21 @@ static void _init_tel(void *data) _view_update(data); - registered = 1; } /* De-initialize TAPI */ static void _deinit_tel() { _D("De-initialize TAPI"); - if (registered) - telephony_deinit(&tel_list); - registered = 0; + telephony_deinit(&tel_list); } static void _tel_ready_cb(telephony_state_e state, void *user_data) { - if (state == TELEPHONY_STATE_READY) + if (state == TELEPHONY_STATE_READY) { _init_tel(user_data); - else if (state == TELEPHONY_STATE_NOT_READY) - _deinit_tel(); + _view_update(user_data); + } } static int register_rssi_module(void *data) @@ -327,6 +318,9 @@ static int register_rssi_module(void *data) ret = util_system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _flight_mode, data); retvm_if(ret, FAIL, "util_system_settings_set_changed_cb failed: %s", get_error_message(ret)); + ret = telephony_init(&tel_list); + retvm_if(ret != TELEPHONY_ERROR_NONE, FAIL, "telephony_init failed: %s", get_error_message(ret)); + ret = telephony_set_state_changed_cb(_tel_ready_cb, data); if (ret != TELEPHONY_ERROR_NONE) { _E("telephony_set_state_changed_cb failed %s", get_error_message(ret)); @@ -345,9 +339,8 @@ static int register_rssi_module(void *data) if (state == TELEPHONY_STATE_READY) { _D("Telephony ready"); _init_tel(data); - } else if (state == TELEPHONY_STATE_NOT_READY) { + } else if (state == TELEPHONY_STATE_NOT_READY) _D("Telephony not ready"); - } return ret; } |