summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJiwoong Im <jiwoong.im@samsung.com>2015-06-30 13:35:19 +0900
committerJiwoong Im <jiwoong.im@samsung.com>2015-06-30 16:12:32 +0900
commit33a9b2d54c03c69510ffb4bc27fd7f60ac9cd57e (patch)
treedca365c1bc3cf588450c7055b454ad0eedca504f /src
parentb12ee8c1184b9cf65b9c9c769d45bcfe66481caa (diff)
downloadui-gadget-1-33a9b2d54c03c69510ffb4bc27fd7f60ac9cd57e.tar.gz
ui-gadget-1-33a9b2d54c03c69510ffb4bc27fd7f60ac9cd57e.tar.bz2
ui-gadget-1-33a9b2d54c03c69510ffb4bc27fd7f60ac9cd57e.zip
Change-Id: I2580de7cfc88dbe54824863a7554774b6d9d627f Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/manager.c14
-rw-r--r--src/ug.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/manager.c b/src/manager.c
index 65fdff2..91ae208 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -25,7 +25,7 @@
#include <errno.h>
#include <glib.h>
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#include <Ecore_X.h>
@@ -50,7 +50,7 @@ struct ug_manager {
void *win;
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
Window win_id;
Display *disp;
#endif
@@ -129,7 +129,7 @@ static int ug_fvlist_del(ui_gadget_h c)
return 0;
}
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
static int __ug_x_get_window_property(Display *dpy, Window win, Atom atom,
Atom type, unsigned int *val,
unsigned int len)
@@ -168,7 +168,7 @@ static int __ug_x_get_window_property(Display *dpy, Window win, Atom atom,
}
#endif
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
static enum ug_event __ug_x_rotation_get(Display *dpy, Window win)
{
Window active_win;
@@ -595,7 +595,7 @@ static int ugman_ug_create(void *data)
}
if(ug_man.last_rotate_evt == UG_EVENT_NONE) {
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
ug_man.last_rotate_evt = __ug_x_rotation_get(ug_man.disp, ug_man.win_id);
#endif
}
@@ -848,7 +848,7 @@ int ugman_ug_del_all(void)
return 0;
}
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
int ugman_init(Display *disp, Window xid, void *win, enum ug_option opt)
{
ug_man.win = win;
@@ -884,7 +884,7 @@ int ugman_init(void *win, enum ug_option opt)
int ugman_init_efl(Evas_Object *win, enum ug_option opt)
{
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
Ecore_X_Window xwin = elm_win_xwindow_get(win);
if (xwin)
return ugman_init((Display *)ecore_x_display_get(), xwin, win, opt);
diff --git a/src/ug.c b/src/ug.c
index 219c69f..57c4a53 100644
--- a/src/ug.c
+++ b/src/ug.c
@@ -94,7 +94,7 @@ UG_API ui_gadget_h ug_create(ui_gadget_h parent,
return ugman_ug_load(parent, name, mode, service, cbs);
}
-#ifndef WAYLAND
+#ifndef UG_WAYLAND
UG_API int ug_init(Display *disp, Window xid, void *win, enum ug_option opt)
{
if (!win || !xid || !disp) {