summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiwoong Im <jiwoong.im@samsung.com>2016-06-17 02:29:58 (GMT)
committerJiwoong Im <jiwoong.im@samsung.com>2016-06-17 02:29:58 (GMT)
commite2ff68ceca357336c31306bf04f1ff5eb91a4a63 (patch)
tree9bca60215a1ea0a629eef25d6f4ba3ac9a59f465
parent64ca55d9ed58e80c353b588ef6ec2c03e56f7d7e (diff)
downloadui-gadget-1-e2ff68ceca357336c31306bf04f1ff5eb91a4a63.zip
ui-gadget-1-e2ff68ceca357336c31306bf04f1ff5eb91a4a63.tar.gz
ui-gadget-1-e2ff68ceca357336c31306bf04f1ff5eb91a4a63.tar.bz2
Change-Id: I3b035883b8245e72a52dcf4de73efa8f9ffdcb92 Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
-rw-r--r--include/ui-gadget.h6
-rw-r--r--src/ug.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/include/ui-gadget.h b/include/ui-gadget.h
index 6c34b19..d3fbcbf 100644
--- a/include/ui-gadget.h
+++ b/include/ui-gadget.h
@@ -221,11 +221,7 @@ int UG_INIT_EFL(void *win, enum ug_option opt);
* ...
* \endcode
*/
-#ifndef UG_WAYLAND
-int ug_init(Display *disp, Window xid, void *win, enum ug_option opt);
-#else
-int ug_init(void *win, enum ug_option opt);
-#endif
+int ug_init(void *disp, unsigned long xid, void *win, enum ug_option opt);
/**
* \par Description:
diff --git a/src/ug.c b/src/ug.c
index e35b90b..ad4bcf4 100644
--- a/src/ug.c
+++ b/src/ug.c
@@ -94,7 +94,7 @@ UG_API ui_gadget_h ug_create(ui_gadget_h parent,
}
#ifndef UG_WAYLAND
-UG_API int ug_init(Display *disp, Window xid, void *win, enum ug_option opt)
+UG_API int ug_init(void *disp, unsigned long xid, void *win, enum ug_option opt)
{
if (!win || !xid || !disp) {
_ERR("ug_init() failed: Invalid arguments");
@@ -106,10 +106,10 @@ UG_API int ug_init(Display *disp, Window xid, void *win, enum ug_option opt)
return -1;
}
- return ugman_init(disp, xid, win, opt);
+ return ugman_init((Display *)disp, (Window)xid, win, opt);
}
#else
-UG_API int ug_init(void *win, enum ug_option opt)
+UG_API int ug_init(void *disp, unsigned long xid, void *win, enum ug_option opt)
{
if (opt < UG_OPT_INDICATOR_ENABLE || opt >= UG_OPT_MAX) {
_ERR("ug_init() failed: Invalid option");