summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJiwoong Im <jiwoong.im@samsung.com>2015-11-06 15:05:31 +0900
committerJiwoong Im <jiwoong.im@samsung.com>2015-11-09 14:22:48 +0900
commitcab60029f324cfd5a668a3e68d06ba42e76e6741 (patch)
tree834ddfa32160277d9ee6448561481269f7bf6fbd /src
parent35a3446ce6475f4fc452a37a64f25adf4164e619 (diff)
downloadui-gadget-1-cab60029f324cfd5a668a3e68d06ba42e76e6741.tar.gz
ui-gadget-1-cab60029f324cfd5a668a3e68d06ba42e76e6741.tar.bz2
ui-gadget-1-cab60029f324cfd5a668a3e68d06ba42e76e6741.zip
Change-Id: Ib50b5c5e057f570e2bbd656dd4437d4b3eb8c4bd Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/manager.c24
-rw-r--r--src/ug.c42
2 files changed, 33 insertions, 33 deletions
diff --git a/src/manager.c b/src/manager.c
index 91ae208..0880b63 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -304,7 +304,7 @@ static void ugman_ug_start(void *data)
ops = &ug->module->ops;
if (ops && ops->start)
- ops->start(ug, ug->service, ops->priv);
+ ops->start(ug, ug->app_control, ops->priv);
return;
}
@@ -334,7 +334,7 @@ static int ugman_ug_pause(void *data)
ops = &ug->module->ops;
if (ops && ops->pause)
- ops->pause(ug, ug->service, ops->priv);
+ ops->pause(ug, ug->app_control, ops->priv);
end:
job_end();
@@ -378,7 +378,7 @@ static int ugman_ug_resume(void *data)
ops = &ug->module->ops;
if (ops && ops->resume)
- ops->resume(ug, ug->service, ops->priv);
+ ops->resume(ug, ug->app_control, ops->priv);
end:
job_end();
@@ -446,7 +446,7 @@ static int ugman_ug_event(ui_gadget_h ug, enum ug_event event)
_DBG("ug_event_cb : ug(%p) / event(%d)", ug, event);
if (ops && ops->event)
- ops->event(ug, event, ug->service, ops->priv);
+ ops->event(ug, event, ug->app_control, ops->priv);
return 0;
}
@@ -496,7 +496,7 @@ static int ugman_ug_destroy(void *data)
if (ops && ops->destroy) {
_DBG("ug(%p) module destory cb call", ug);
- ops->destroy(ug, ug->service, ops->priv);
+ ops->destroy(ug, ug->app_control, ops->priv);
}
cbs = &ug->cbs;
@@ -572,7 +572,7 @@ static int ugman_ug_create(void *data)
eng_ops = &ug_man.engine->ops;
if (ops && ops->create) {
- ug->layout = ops->create(ug, ug->mode, ug->service, ops->priv);
+ ug->layout = ops->create(ug, ug->mode, ug->app_control, ops->priv);
if (!ug->layout) {
ug_relation_del(ug);
_ERR("ug(%p) layout is null", ug);
@@ -664,7 +664,7 @@ int ugman_ug_add(ui_gadget_h parent, ui_gadget_h ug)
ui_gadget_h ugman_ug_load(ui_gadget_h parent,
const char *name,
enum ug_mode mode,
- service_h service, struct ug_cbs *cbs)
+ app_control_h app_control, struct ug_cbs *cbs)
{
int r;
ui_gadget_h ug;
@@ -684,7 +684,7 @@ ui_gadget_h ugman_ug_load(ui_gadget_h parent,
ug->name = strdup(name);
ug->mode = mode;
- service_clone(&ug->service, service);
+ app_control_clone(&ug->app_control, app_control);
ug->opt = ug->module->ops.opt;
ug->state = UG_STATE_READY;
ug->children = NULL;
@@ -718,7 +718,7 @@ int ugman_ug_destroying(ui_gadget_h ug)
ops = &ug->module->ops;
if (ops && ops->destroying)
- ops->destroying(ug, ug->service, ops->priv);
+ ops->destroying(ug, ug->app_control, ops->priv);
return 0;
}
@@ -999,7 +999,7 @@ static int ugman_send_key_event_to_ug(ui_gadget_h ug,
}
if (ops && ops->key_event) {
- ops->key_event(ug, event, ug->service, ops->priv);
+ ops->key_event(ug, event, ug->app_control, ops->priv);
} else {
return -1;
}
@@ -1023,7 +1023,7 @@ int ugman_send_key_event(enum ug_key_event event)
return ugman_send_key_event_to_ug(ug_man.fv_top, event);
}
-int ugman_send_message(ui_gadget_h ug, service_h msg)
+int ugman_send_message(ui_gadget_h ug, app_control_h msg)
{
struct ug_module_ops *ops = NULL;
if (!ug || !ugman_ug_exist(ug) || ug->state == UG_STATE_DESTROYED) {
@@ -1042,7 +1042,7 @@ int ugman_send_message(ui_gadget_h ug, service_h msg)
ops = &ug->module->ops;
if (ops && ops->message)
- ops->message(ug, msg, ug->service, ops->priv);
+ ops->message(ug, msg, ug->app_control, ops->priv);
return 0;
}
diff --git a/src/ug.c b/src/ug.c
index 57c4a53..91d284c 100644
--- a/src/ug.c
+++ b/src/ug.c
@@ -65,9 +65,9 @@ int ug_free(ui_gadget_h ug)
free((void *)ug->name);
ug->name = NULL;
}
- if (ug->service) {
- service_destroy(ug->service);
- ug->service = NULL;
+ if (ug->app_control) {
+ app_control_destroy(ug->app_control);
+ ug->app_control = NULL;
}
free(ug);
ug = NULL;
@@ -77,7 +77,7 @@ int ug_free(ui_gadget_h ug)
UG_API ui_gadget_h ug_create(ui_gadget_h parent,
const char *name,
enum ug_mode mode,
- service_h service, struct ug_cbs *cbs)
+ app_control_h app_control, struct ug_cbs *cbs)
{
if (!name) {
_ERR("ug_create() failed: Invalid name");
@@ -91,7 +91,7 @@ UG_API ui_gadget_h ug_create(ui_gadget_h parent,
return NULL;
}
- return ugman_ug_load(parent, name, mode, service, cbs);
+ return ugman_ug_load(parent, name, mode, app_control, cbs);
}
#ifndef UG_WAYLAND
@@ -246,9 +246,9 @@ UG_API int ug_send_key_event(enum ug_key_event event)
return ugman_send_key_event(event);
}
-UG_API int ug_send_result(ui_gadget_h ug, service_h send)
+UG_API int ug_send_result(ui_gadget_h ug, app_control_h send)
{
- service_h send_dup = NULL;
+ app_control_h send_dup = NULL;
if (!ug || !ugman_ug_exist(ug)) {
_ERR("ug_send_result() failed: Invalid ug");
@@ -262,9 +262,9 @@ UG_API int ug_send_result(ui_gadget_h ug, service_h send)
}
if (send) {
- service_clone(&send_dup, send);
+ app_control_clone(&send_dup, send);
if (!send_dup) {
- _ERR("ug_send_result() failed: service_destroy failed");
+ _ERR("ug_send_result() failed: app_control_destroy failed");
return -1;
}
}
@@ -272,14 +272,14 @@ UG_API int ug_send_result(ui_gadget_h ug, service_h send)
ug->cbs.result_cb(ug, send_dup, ug->cbs.priv);
if (send_dup)
- service_destroy(send_dup);
+ app_control_destroy(send_dup);
return 0;
}
-UG_API int ug_send_result_full(ui_gadget_h ug, service_h send, service_result_e result)
+UG_API int ug_send_result_full(ui_gadget_h ug, app_control_h send, app_control_result_e result)
{
- service_h send_dup = NULL;
+ app_control_h send_dup = NULL;
char tmp_result[4] = {0,};
if (!ug || !ugman_ug_exist(ug)) {
@@ -294,34 +294,34 @@ UG_API int ug_send_result_full(ui_gadget_h ug, service_h send, service_result_e
}
if (send) {
- service_clone(&send_dup, send);
+ app_control_clone(&send_dup, send);
if (!send_dup) {
- _ERR("ug_send_result() failed: service_destroy failed");
+ _ERR("ug_send_result() failed: app_control_destroy failed");
return -1;
}
}
snprintf(tmp_result, 4, "%d", result);
- service_add_extra_data(send_dup, UG_SERVICE_DATA_RESULT, (const char*)tmp_result);
+ app_control_add_extra_data(send_dup, UG_SERVICE_DATA_RESULT, (const char*)tmp_result);
ug->cbs.result_cb(ug, send_dup, ug->cbs.priv);
if (send_dup)
- service_destroy(send_dup);
+ app_control_destroy(send_dup);
return 0;
}
-UG_API int ug_send_message(ui_gadget_h ug, service_h msg)
+UG_API int ug_send_message(ui_gadget_h ug, app_control_h msg)
{
int r;
- service_h msg_dup = NULL;
+ app_control_h msg_dup = NULL;
if (msg) {
- service_clone(&msg_dup, msg);
+ app_control_clone(&msg_dup, msg);
if (!msg_dup) {
- _ERR("ug_send_message() failed: service_destroy failed");
+ _ERR("ug_send_message() failed: app_control_destroy failed");
return -1;
}
}
@@ -329,7 +329,7 @@ UG_API int ug_send_message(ui_gadget_h ug, service_h msg)
r = ugman_send_message(ug, msg_dup);
if (msg_dup)
- service_destroy(msg_dup);
+ app_control_destroy(msg_dup);
return r;
}