summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-04-16 11:49:41 -0400
committerChris Michael <cp.michael@samsung.com>2015-04-16 11:49:41 -0400
commit292ad0575e3a98c63d55b7686c9f09fdb8c2ab4c (patch)
tree68d98eb28365f4f81c21ac898c8f42004c29a7a4
parent257452f46d344b64d611aa555a8aacdd509a492e (diff)
downloadelementary-292ad0575e3a98c63d55b7686c9f09fdb8c2ab4c.tar.gz
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.
-rw-r--r--src/lib/elm_win.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 9296df842..8674105ea 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