diff options
| author | Youngjae Shin <yj99.shin@samsung.com> | 2014-03-07 14:53:45 +0900 |
|---|---|---|
| committer | Youngjae Shin <yj99.shin@samsung.com> | 2014-03-07 14:53:53 +0900 |
| commit | 8221eba4ed0529912f18e6d31fc14317c494e9fc (patch) | |
| tree | a4273784fcceb7f063f84a5549030d729961aca3 | |
| parent | 58b08a12b634408e678ecac3684a4475405a0e5d (diff) | |
| parent | f8e515af43df41060eaf9947906e21a9dbb59a9e (diff) | |
| download | ug-nfc-efl-8221eba4ed0529912f18e6d31fc14317c494e9fc.tar.gz ug-nfc-efl-8221eba4ed0529912f18e6d31fc14317c494e9fc.tar.bz2 ug-nfc-efl-8221eba4ed0529912f18e6d31fc14317c494e9fc.zip | |
Merge remote-tracking branch 'tizen_2.2' into tizen
Change-Id: I10aec3a71ef4f2ced1c3f9800fac1bd4df433008
| -rw-r--r-- | packaging/ug-nfc-efl.spec | 2 | ||||
| -rw-r--r-- | ug-nfc-share-efl/src/ug-nfc-share-main.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec index c843b63..d49e1be 100644 --- a/packaging/ug-nfc-efl.spec +++ b/packaging/ug-nfc-efl.spec @@ -4,7 +4,7 @@ Name: ug-nfc-efl Summary: UI gadget about the nfc -Version: 0.0.8 +Version: 0.0.9 Release: 0 Group: Applications/Network License: Flora 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 698389f..1c6b39d 100644 --- a/ug-nfc-share-efl/src/ug-nfc-share-main.c +++ b/ug-nfc-share-efl/src/ug-nfc-share-main.c @@ -350,7 +350,7 @@ static void _setting_on_YesNo_popup(void *data) memcpy(popup_str, IDS_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q, strlen(IDS_SERVICE_NOT_AVAILABLE_NFC_TURNED_OFF_TURN_ON_NFC_Q)); - ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_YES, UG_NFC_POPUP_RESP_OK, IDS_NO, UG_NFC_POPUP_RESP_CANCEL, NULL, 0, false, false, _setting_on_YesNo_popup_response_cb); + ug_nfc_share_create_popup(ug_data, ug_data->base_layout, popup_str, IDS_NO, UG_NFC_POPUP_RESP_CANCEL, IDS_YES, UG_NFC_POPUP_RESP_OK, NULL, 0, false, false, _setting_on_YesNo_popup_response_cb); UG_NFC_SHARE_END(); } @@ -796,6 +796,13 @@ static void __ug_nfc_share_destroy(ui_gadget_h ug, service_h service, void *priv if (ug_data == NULL) return; + if (ug_data->current_ndef) + { + if (nfc_ndef_message_destroy(ug_data->current_ndef) != NFC_ERROR_NONE) + UG_NFC_SHARE_DEBUG_ERR("nfc_ndef_message_destroy failed"); + ug_data->current_ndef = NULL; + } + /* unset callback */ ug_nfc_unset_nfc_callback(); |