devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=292ad0575e3a98c63d55b7686c9f09fdb8c2ab4c
commit 292ad0575e3a98c63d55b7686c9f09fdb8c2ab4c Author: Chris Michael <cp.mich...@samsung.com> Date: Thu Apr 16 11:49:41 2015 -0400 Revert "elementary: Fix elm_win_window_id_get for wayland" This reverts commit 257452f46d344b64d611aa555a8aacdd509a492e. Have to revert this as it breaks E compositor functionality wrt pixmap id. --- src/lib/elm_win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 9296df8..8674105 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -5098,13 +5098,13 @@ _elm_win_window_id_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd) (!strcmp(engine_name, ELM_WAYLAND_EGL))))) { #if HAVE_ELEMENTARY_WAYLAND - if (sd->wl.win) return (Ecore_Window)ecore_wl_window_id_get(sd->wl.win); + if (sd->wl.win) return (Ecore_Window)ecore_wl_window_surface_id_get(sd->wl.win); if (sd->parent) { Ecore_Wl_Window *parent; parent = elm_win_wl_window_get(sd->parent); - if (parent) return (Ecore_Window)ecore_wl_window_id_get(parent); + if (parent) return (Ecore_Window)ecore_wl_window_surface_id_get(parent); return 0; } #endif --