From 6d42e024f49fff668bad2503ca58bfabc2ae541a Mon Sep 17 00:00:00 2001 From: Wang Quanxian Date: Fri, 1 Feb 2013 10:24:45 +0800 Subject: [PATCH] Keep compatible with Wayland xid and disp are not needed by Wayland instead of only by X server. --- src/ug.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ug.c b/src/ug.c index 2aaba2d..05e62ec 100755 --- a/src/ug.c +++ b/src/ug.c @@ -90,10 +90,14 @@ UG_API ui_gadget_h ug_create(ui_gadget_h parent, UG_API int ug_init(Display *disp, Window xid, void *win, enum ug_option opt) { - if (!win || !xid || !disp) { + /* XXX Start Hooks for Wayland */ + char *d = getenv("DISPLAY"); + /* xid and disp are not needed by wayland instead of only by X.*/ + if (!win || (d && (!xid || !disp))) { _ERR("ug_init() failed: Invalid arguments\n"); return -1; } + /* XXX End Hooks for Wayland */ if (opt < UG_OPT_INDICATOR_ENABLE || opt >= UG_OPT_MAX) { _ERR("ug_init() failed: Invalid option\n"); -- 2.7.4