sync prototype of ug_init with tizen_2.4

Change-Id: I3b035883b8245e72a52dcf4de73efa8f9ffdcb92
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>

diff --git a/include/ui-gadget.h b/include/ui-gadget.h
index 6c34b19..d3fbcbf 100644 (file)
--- 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 (file)
--- 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");