diff options
| author | Junghoon Park <jh9216.park@samsung.com> | 2016-02-25 19:12:45 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-02-25 19:12:45 -0800 |
| commit | dc0d6808408ed4b31b5b6569508d25f920a59aec (patch) | |
| tree | 398662d1c3d6943fff0227a4ba416002cad742a1 | |
| parent | f2921f6ccf543571e1dab8fa26628c0dbe3afc9d (diff) | |
| parent | 422e9817b67184d69dfa396debb5733b07535b58 (diff) | |
| download | application-dc0d6808408ed4b31b5b6569508d25f920a59aec.tar.gz application-dc0d6808408ed4b31b5b6569508d25f920a59aec.tar.bz2 application-dc0d6808408ed4b31b5b6569508d25f920a59aec.zip | |
Merge "Use modified API" into tizensubmit/tizen/20160226.031502accepted/tizen/wearable/20160226.095331accepted/tizen/tv/20160226.095309accepted/tizen/mobile/20160226.095252accepted/tizen/ivi/20160226.095350accepted/tizen/common/20160229.160540
| -rw-r--r-- | app_control/app_control.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app_control/app_control.c b/app_control/app_control.c index f455d7b..09ab375 100644 --- a/app_control/app_control.c +++ b/app_control/app_control.c @@ -75,7 +75,6 @@ typedef struct app_control_request_context_s { extern int appsvc_allow_transient_app(bundle *b, unsigned int id); extern int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsvc_host_res_fn cbfunc, void *data); -extern int aul_invoke_caller_cb(int launch_pid); static int app_control_create_reply(bundle *data, struct app_control_s **app_control); static const char* app_control_error_to_string(app_control_error_e error) @@ -299,7 +298,7 @@ int app_control_destroy(app_control_h app_control) if (app_control->type == APP_CONTROL_TYPE_REQUEST && app_control->launch_pid > 0 && bundle_get_val(app_control->data, AUL_SVC_K_LAUNCH_RESULT_APP_STARTED) == NULL) - aul_remove_caller_cb(app_control->launch_pid); + aul_remove_caller_cb(app_control->launch_pid, app_control); bundle_free(app_control->data); app_control->data = NULL; @@ -763,7 +762,7 @@ int app_control_send_launch_request(app_control_h app_control, app_control_reply /* launched without app selector */ if (strncmp(callee, APP_SELECTOR, strlen(APP_SELECTOR)) != 0) - aul_invoke_caller_cb(launch_pid); + aul_invoke_caller_cb(request_context); } else { /* default case */ aul_add_caller_cb(launch_pid, __update_launch_pid, app_control); |