diff options
author | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-06-24 20:06:22 +0900 |
---|---|---|
committer | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-06-24 20:06:22 +0900 |
commit | 9aade27fa6e030b8afcf62c06786ec301e981fe6 (patch) | |
tree | 6b1a073166791a533da5e8847c068a355b3d09d9 | |
parent | 43f99d61dbfb693ebad97ccb22f2f7352c102617 (diff) | |
download | app-svc-9aade27fa6e030b8afcf62c06786ec301e981fe6.tar.gz app-svc-9aade27fa6e030b8afcf62c06786ec301e981fe6.tar.bz2 app-svc-9aade27fa6e030b8afcf62c06786ec301e981fe6.zip |
merge private
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
-rwxr-xr-x | include/appsvc.h | 1 | ||||
-rw-r--r-- | packaging/app-svc.spec | 2 | ||||
-rwxr-xr-x | src/appsvc.c | 19 |
3 files changed, 21 insertions, 1 deletions
diff --git a/include/appsvc.h b/include/appsvc.h index e401489..5b9f50d 100755 --- a/include/appsvc.h +++ b/include/appsvc.h @@ -953,6 +953,7 @@ int appsvc_is_defapp(const char *appid); */ int appsvc_data_is_array(bundle *b, const char *key); +int appsvc_subapp_terminate_request_pid(int pid); #ifdef __cplusplus } diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec index 16a06d0..c5a79e4 100644 --- a/packaging/app-svc.spec +++ b/packaging/app-svc.spec @@ -1,6 +1,6 @@ Name: app-svc Summary: App svc -Version: 0.1.50 +Version: 0.1.51 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 diff --git a/src/appsvc.c b/src/appsvc.c index aed2846..905870c 100755 --- a/src/appsvc.c +++ b/src/appsvc.c @@ -65,6 +65,7 @@ typedef struct _appsvc_resolve_info_t{ char *m_type; char *s_type; char *category; + char *win_id; int mime_set; }appsvc_resolve_info_t; @@ -997,6 +998,18 @@ static Eina_Bool __transient_cb(void *data, int type, void *event) return ECORE_CALLBACK_RENEW; } +int __aul_subapp_cb(void *data) +{ + appsvc_transient_cb_info_t* cb_info; + + cb_info = (appsvc_transient_cb_info_t*) data; + + cb_info->cb_func(cb_info->data); + ecore_main_loop_quit(); + + return 0; +} + SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id) { char win_id[MAX_LOCAL_BUFSZ]; @@ -1037,7 +1050,13 @@ SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, app info->data = data; ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info); + aul_set_subapp(__aul_subapp_cb, info); return 0; } +SLPAPI int appsvc_subapp_terminate_request_pid(int pid) +{ + return aul_subapp_terminate_request_pid(pid); +} + |