diff options
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/view_pin.c | 24 |
2 files changed, 13 insertions, 13 deletions
@@ -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; } |