From ac1650f54297391ee9dc5ab831f425123b63e909 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 20 Apr 2016 20:23:10 +0900 Subject: [PATCH] Remove unused type (TETHERING_TYPE_RESERVED) Change-Id: I7bc94db560516860f56158d7be8f87447532122e Signed-off-by: Seonah Moon --- packaging/ug-setting-mobileap-efl.spec | 2 +- src/mh_func_onoff.c | 5 ----- src/mh_main_ug.c | 24 ------------------------ src/mh_popup.c | 7 ------- 4 files changed, 1 insertion(+), 37 deletions(-) diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec index 8019128..d50507b 100755 --- a/packaging/ug-setting-mobileap-efl.spec +++ b/packaging/ug-setting-mobileap-efl.spec @@ -3,7 +3,7 @@ Name: ug-setting-mobileap-efl Summary: Tethering UI Gadget Library -Version: 1.0.130 +Version: 1.0.131 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/src/mh_func_onoff.c b/src/mh_func_onoff.c index 0aa647a..fcf3163 100644 --- a/src/mh_func_onoff.c +++ b/src/mh_func_onoff.c @@ -415,11 +415,6 @@ void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_reques ad->popup = NULL; } _update_main_view(ad, type); - if (type == TETHERING_TYPE_RESERVED) { - DBG("MobileAP is turned on\n"); - _prepare_popup(MH_POPUP_WIFI_AP_OFF, STR_WIFI_AP_CONTROLLED_ANOTHER_APP); - _create_popup(ad); - } return; } diff --git a/src/mh_main_ug.c b/src/mh_main_ug.c index 02f0206..bc48a7e 100755 --- a/src/mh_main_ug.c +++ b/src/mh_main_ug.c @@ -56,11 +56,6 @@ static void __set_callbacks(tethering_h handle, void *user_data) if (ret != TETHERING_ERROR_NONE) ERR("tethering_set_enabled_cb [0x%X]\n", ret); - ret = tethering_set_enabled_cb(handle, TETHERING_TYPE_RESERVED, - _enabled_cb, user_data); - if (ret != TETHERING_ERROR_NONE) - ERR("tethering_set_enabled_cb [0x%X]\n", ret); - ret = tethering_wifi_set_passphrase_changed_cb(handle, _passphrase_changed_cb, user_data); if (ret != TETHERING_ERROR_NONE) @@ -81,11 +76,6 @@ static void __set_callbacks(tethering_h handle, void *user_data) if (ret != TETHERING_ERROR_NONE) ERR("tethering_set_disabled_cb [0x%X]\n", ret); - ret = tethering_set_disabled_cb(handle, TETHERING_TYPE_RESERVED, - _disabled_cb, user_data); - if (ret != TETHERING_ERROR_NONE) - ERR("tethering_set_disabled_cb [0x%X]\n", ret); - ret = tethering_set_connection_state_changed_cb(handle, TETHERING_TYPE_ALL, _connection_changed_cb, user_data); @@ -125,10 +115,6 @@ static void __unset_callbacks(tethering_h handle) if (ret != TETHERING_ERROR_NONE) ERR("tethering_unset_connection_state_changed_cb[0x%X]\n", ret); - ret = tethering_unset_disabled_cb(handle, TETHERING_TYPE_RESERVED); - if (ret != TETHERING_ERROR_NONE) - ERR("tethering_unset_disabled_cb [0x%X]\n", ret); - ret = tethering_unset_disabled_cb(handle, TETHERING_TYPE_ALL); if (ret != TETHERING_ERROR_NONE) ERR("tethering_unset_disabled_cb [0x%X]\n", ret); @@ -145,10 +131,6 @@ static void __unset_callbacks(tethering_h handle) if (ret != TETHERING_ERROR_NONE) ERR("tethering_wifi_unset_passphrase_changed_cb [0x%X]\n", ret); - ret = tethering_unset_enabled_cb(handle, TETHERING_TYPE_RESERVED); - if (ret != TETHERING_ERROR_NONE) - ERR("tethering_unset_enabled [0x%X]\n", ret); - ret = tethering_unset_enabled_cb(handle, TETHERING_TYPE_ALL); if (ret != TETHERING_ERROR_NONE) ERR("tethering_unset_enabled [0x%X]\n", ret); @@ -283,12 +265,6 @@ static void on_start(ui_gadget_h ug, app_control_h app_control, void *priv) } } - if (tethering_is_enabled(NULL, TETHERING_TYPE_RESERVED) == true) { - DBG("MobileAP is turned on\n"); - _prepare_popup(MH_POPUP_WIFI_AP_OFF, STR_WIFI_AP_CONTROLLED_ANOTHER_APP); - _create_popup(ad); - } - app_control_get_extra_data(app_control, "viewtype", &viewtype); if (viewtype != NULL) { diff --git a/src/mh_popup.c b/src/mh_popup.c index 6df4aca..b786c86 100755 --- a/src/mh_popup.c +++ b/src/mh_popup.c @@ -121,13 +121,6 @@ static void __handle_popup_resp(void *data, bool response) } break; - case MH_POPUP_WIFI_AP_OFF: - ret = tethering_disable(ad->handle, TETHERING_TYPE_RESERVED); - if (ret != TETHERING_ERROR_NONE) { - ERR("MobileAP off is failed : %d\n", ret); - } - break; - case MH_POPUP_WIFI_OFF: ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI); if (ret != TETHERING_ERROR_NONE) { -- 2.7.4