From: Enlightenment S. <no-...@en...> - 2012-12-19 14:41:56
|
Log: If elementary is built with wayland support (and X support), then we need to run an engine compare before trying to get wayland specific items (in this case, the ecore_evas window). NB: Fixes ticket #1992 Signed-off-by: Christopher Michael <cp....@sa...> Author: devilhorns Date: 2012-12-19 06:41:45 -0800 (Wed, 19 Dec 2012) New Revision: 81369 Trac: http://trac.enlightenment.org/e/changeset/81369 Modified: trunk/elementary/src/lib/elm_win.c Modified: trunk/elementary/src/lib/elm_win.c =================================================================== --- trunk/elementary/src/lib/elm_win.c 2012-12-19 14:21:50 UTC (rev 81368) +++ trunk/elementary/src/lib/elm_win.c 2012-12-19 14:41:45 UTC (rev 81369) @@ -2786,7 +2786,8 @@ #endif #ifdef HAVE_ELEMENTARY_WAYLAND - sd->wl.win = ecore_evas_wayland_window_get(sd->ee); + if ((ENGINE_COMPARE(ELM_WAYLAND_SHM)) || (ENGINE_COMPARE(ELM_WAYLAND_EGL))) + sd->wl.win = ecore_evas_wayland_window_get(sd->ee); #endif if ((_elm_config->bgpixmap) @@ -5012,6 +5013,10 @@ { if (!obj) return NULL; + if ((!ENGINE_COMPARE(ELM_WAYLAND_SHM)) || + (!ENGINE_COMPARE(ELM_WAYLAND_EGL))) + return NULL; + if (!evas_object_smart_type_check_ptr(obj, MY_CLASS_NAME)) { Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); |