bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch from Juan Zhao <juan.j.zhao@linux.intel.com> to fix correct 

usage of HAVE_ELEMENTARY_WAYLAND.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 80301
This commit is contained in:
Christopher Michael 2012-12-06 07:30:27 +00:00 committed by Christopher Michael
parent 4e17a72fc7
commit 29dbb8804d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/src/lib/elm_win.c
View File

@ -5008,6 +5008,7 @@ _xwindow_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
*ret = 0;
}
#if HAVE_ELEMENTARY_WAYLAND
EAPI Ecore_Wl_Window *
elm_win_wl_window_get(const Evas_Object *obj)
{
@ -5029,7 +5030,6 @@ static void
_wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
{
Ecore_Wl_Window **ret = va_arg(*list, Ecore_Wl_Window **);
#if HAVE_ELEMENTARY_WAYLAND
Elm_Win_Smart_Data *sd = _pd;
if (sd->wl.win)
{
@ -5041,9 +5041,9 @@ _wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
*ret = elm_win_wl_window_get(sd->parent);
return;
}
#endif
*ret = NULL;
}
#endif
EAPI Eina_Bool
elm_win_trap_set(const Elm_Win_Trap *t)

2
legacy/elementary/src/lib/elm_win.h
View File

@ -2651,6 +2651,7 @@ EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *s
*/
EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
#ifdef HAVE_ELEMENTARY_WAYLAND
/* Wayland specific call - returns NULL on non-Wayland engines */
/**
* Get the Ecore_Wl_Window of and Evas_Object
@ -2662,6 +2663,7 @@ EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
* @ingroup Win
*/
EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj);
#endif
/**
* @typedef Elm_Win_Trap