diff options
| author | Junyong Sim <junyong.sim@samsung.com> | 2012-11-09 19:34:39 +0900 |
|---|---|---|
| committer | Junyong Sim <junyong.sim@samsung.com> | 2012-11-09 19:35:53 +0900 |
| commit | 67ad215228d4bc5d8a713ce0c06d265b638e2c90 (patch) | |
| tree | c32ef0abb5cc2b8cedb9206642a6b5260ad9abbf | |
| parent | 256b20b2eec31359b7259a7499c2a527ea197f8e (diff) | |
| download | ug-nfc-efl-67ad215228d4bc5d8a713ce0c06d265b638e2c90.tar.gz ug-nfc-efl-67ad215228d4bc5d8a713ce0c06d265b638e2c90.tar.bz2 ug-nfc-efl-67ad215228d4bc5d8a713ce0c06d265b638e2c90.zip | |
remove mdm exception
Change-Id: I14d80ad954f8195c271f3bb4f2a37d6a518adfd4
| -rw-r--r-- | packaging/ug-nfc-efl.spec | 2 | ||||
| -rw-r--r-- | ug-nfc-setting-efl/src/ug-nfc-setting-main.c | 6 | ||||
| -rw-r--r-- | ug-nfc-share-efl/src/ug-nfc-share-main.c | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec index d3ce0a5..09359a9 100644 --- a/packaging/ug-nfc-efl.spec +++ b/packaging/ug-nfc-efl.spec @@ -5,7 +5,7 @@ Name: ug-nfc-efl Summary: UI gadget about the nfc Version: 0.0.2 -Release: 36 +Release: 37 Group: TO_BE/FILLED_IN License: Samsung Proprietary License Source0: %{name}-%{version}.tar.gz diff --git a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c index cad3b18..97732c5 100644 --- a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c +++ b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c @@ -339,11 +339,7 @@ static void _change_nfc_onoff_setting(void *data) LOGD("[%s(): %d] vconf_get_bool status [%d]\n", __FUNCTION__, __LINE__, status); result = nfc_manager_set_activation(!status, NULL, NULL); - if (result == NFC_ERROR_SECURITY_RESTRICTED) - { - _mdm_restricted_popup(ug_data); - return; - } + _set_pending_status(TRUE); } else diff --git a/ug-nfc-share-efl/src/ug-nfc-share-main.c b/ug-nfc-share-efl/src/ug-nfc-share-main.c index 3e29c1d..5db072b 100644 --- a/ug-nfc-share-efl/src/ug-nfc-share-main.c +++ b/ug-nfc-share-efl/src/ug-nfc-share-main.c @@ -481,11 +481,7 @@ static void _setting_on_YesNo_popup_response_cb(void *data, Evas_Object *obj, vo LOGD("setting is on >>>>", __FUNCTION__, __LINE__); result = nfc_manager_set_activation(TRUE, _activation_completed_cb, ug_data); - if (result == NFC_ERROR_SECURITY_RESTRICTED) - { - LOGD("mdmPopup_timer START "); - mdmPopup_timer = ecore_timer_add(0.25, _mdm_restricted_popup, ug_data); - } + break; case UG_NFC_POPUP_RESP_CANCEL : |