From ac26121c129f0710d859a57dbce3e28f04fa0438 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Fri, 13 Sep 2013 20:08:17 +0900 Subject: [PATCH] apply nfc-manger 0.1.2 Change-Id: Ibd581d8ecc5ab41b6ffe46958984a59f19d2b65b --- packaging/capi-network-nfc.spec | 13 +++++-------- src/nfc.c | 15 ++++++--------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec index a3ccee6..bc413da 100644 --- a/packaging/capi-network-nfc.spec +++ b/packaging/capi-network-nfc.spec @@ -1,6 +1,6 @@ Name: capi-network-nfc -Summary: A NFC library in SLP C API -Version: 0.1.1 +Summary: NFC Core API +Version: 0.1.2 Release: 0 Group: Network & Connectivity/NFC License: Apache-2.0 @@ -11,7 +11,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: nfc-client-lib-devel -BuildRequires: nfc-common-lib-devel +BuildRequires: nfc-common-devel BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(ecore-x) @@ -19,17 +19,14 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description -A NFC library in SLP C API. - +A library for Tizen NFC Core API. %package devel -Summary: A NFC library in SLP C API -- Development Files +Summary: NFC Core API (devel) Group: Network & Connectivity/Development Requires: %{name} = %{version}-%{release} %description devel -A NFC library in SLP C API. - This package contains the development files for %{name}. diff --git a/src/nfc.c b/src/nfc.c index e85d7cd..99ec890 100644 --- a/src/nfc.c +++ b/src/nfc.c @@ -1508,9 +1508,9 @@ int nfc_manager_set_system_handler_enable(bool enable) int state; if (enable == true) { - state = 0; + state = NET_NFC_LAUNCH_APP_SELECT; } else { - state = 1; + state = NET_NFC_NO_LAUNCH_APP_SELECT; } ret = net_nfc_client_sys_handler_set_launch_popup_state(state); @@ -1524,9 +1524,9 @@ int nfc_manager_set_system_handler_enable_force(bool enable) int state; if (enable == true) { - state = 0; + state = NET_NFC_LAUNCH_APP_SELECT; } else { - state = 1; + state = NET_NFC_NO_LAUNCH_APP_SELECT; } ret = net_nfc_client_sys_handler_set_launch_popup_state_force(state); @@ -1950,8 +1950,7 @@ static void _net_nfc_manager_snep_start_client( break; } - callback(arg_handle, snep_event, - _convert_error_code(__func__, result), + callback(arg_handle, snep_event, _convert_error_code(__func__, result), msg, user_param); if (snep_event == NFC_SNEP_EVENT_STOP) { @@ -2084,9 +2083,7 @@ static void _snep_event_cb(net_nfc_snep_handle_h target, net_nfc_snep_type_t eve break; } - callback(target, event, - _convert_error_code(__func__, result), - (ndef_message_h)msg, user_param); + callback(target, event, _convert_error_code(__func__, result), (ndef_message_h)msg, user_param); } if ((int)event == NFC_SNEP_EVENT_UNREGISTER) { -- 2.7.4