From 9575700492eb7bd03c8799f3145e39f25077ac3b Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Fri, 6 Nov 2015 15:06:37 +0900 Subject: [PATCH] replace service to app_control Change-Id: I6a848dcb56bd949e21600612566f130b3431eaad Signed-off-by: Jiwoong Im --- src/main.c | 2 +- src/view_pin.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main.c b/src/main.c index c2c33a6..73589ba 100644 --- a/src/main.c +++ b/src/main.c @@ -401,7 +401,7 @@ static void _control(app_control_h control, void *data) ad = data; r = app_control_get_extra_data(control, KEY_SVCID, &svcid); - if (r != SERVICE_ERROR_NONE) + if (r != APP_CONTROL_ERROR_NONE) return; ad->service_id = atoll(svcid); diff --git a/src/view_pin.c b/src/view_pin.c index b91800e..aa65d5e 100644 --- a/src/view_pin.c +++ b/src/view_pin.c @@ -32,25 +32,25 @@ struct _priv { static void _send_message(struct _priv *priv, const char *result) { - service_h service; + app_control_h app_control; int r; - r = service_create(&service); - if (r != SERVICE_ERROR_NONE) { - _ERR("failed to create service"); + r = app_control_create(&app_control); + if (r != APP_CONTROL_ERROR_NONE) { + _ERR("failed to create app_control"); return; } - r = service_add_extra_data(service, PARAM_PIN, result); - if (r != SERVICE_ERROR_NONE) { + r = app_control_add_extra_data(app_control, PARAM_PIN, result); + if (r != APP_CONTROL_ERROR_NONE) { _ERR("failed to add data"); - service_destroy(service); + app_control_destroy(app_control); return; } - ug_send_message(priv->ug, service); + ug_send_message(priv->ug, app_control); - service_destroy(service); + app_control_destroy(app_control); } static void _check_pincode(struct _priv *priv, char *pincode) @@ -89,7 +89,7 @@ static void _check_pincode(struct _priv *priv, char *pincode) tv_channel_del_info(channel_info); } -static void _ug_result_cb(ui_gadget_h ug, service_h result, void *p) +static void _ug_result_cb(ui_gadget_h ug, app_control_h result, void *p) { char *pincode; int r; @@ -99,8 +99,8 @@ static void _ug_result_cb(ui_gadget_h ug, service_h result, void *p) return; } - r = service_get_extra_data(result, PARAM_PIN, &pincode); - if (r != SERVICE_ERROR_NONE || !pincode) { + r = app_control_get_extra_data(result, PARAM_PIN, &pincode); + if (r != APP_CONTROL_ERROR_NONE || !pincode) { _ERR("failed to get data"); return; } -- 2.7.4