Revert "e - fix build when wayland not enabled"

This reverts commit 413ca8046e.

broke wayland runtime: wrong define names, wrong usage
This commit is contained in:
Mike Blumenkrantz 2015-03-12 14:23:22 -04:00
parent e1394afdff
commit a7dae25236
1 changed files with 1 additions and 6 deletions

View File

@ -70,7 +70,6 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
E_Pixmap_Type type = E_PIXMAP_TYPE_X;
win = elm_win_window_id_get(o);
#ifdef HAVE_WAYLAND_CLIENTS
if (!strncmp(ecore_evas_engine_name_get(ee), "wayland", 7))
{
type = E_PIXMAP_TYPE_WL;
@ -78,16 +77,12 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
elm_win_borderless_set(o, 1);
win = e_comp_wl_id_get(win, getpid());
}
#endif
#ifndef HAVE_WAYLAND_ONLY
# ifdef HAVE_WAYLAND_CLIENT
else
# endif
{
type = E_PIXMAP_TYPE_X;
ctx->pointer = e_pointer_window_new(win, EINA_TRUE);
}
#endif
ec = e_pixmap_find_client(type, win);
if (ec)
ctx->client = ec;