On 06/12/12 09:20, Enlightenment SVN wrote: > Log: > elementary: let's not break the work when we don't use Wayland. >
I disagree. If you don't use Wayland then you're world is already broken :P Thanks for the fix ;) dh > > Author: cedric > Date: 2012-12-06 01:20:37 -0800 (Thu, 06 Dec 2012) > New Revision: 80325 > Trac: http://trac.enlightenment.org/e/changeset/80325 > > Modified: > trunk/elementary/src/lib/elm_win.c trunk/elementary/src/lib/elm_win.h > > Modified: trunk/elementary/src/lib/elm_win.c > =================================================================== > --- trunk/elementary/src/lib/elm_win.c 2012-12-06 09:16:15 UTC (rev > 80324) > +++ trunk/elementary/src/lib/elm_win.c 2012-12-06 09:20:37 UTC (rev > 80325) > @@ -5008,10 +5008,10 @@ > *ret = 0; > } > > -#if HAVE_ELEMENTARY_WAYLAND > EAPI Ecore_Wl_Window * > elm_win_wl_window_get(const Evas_Object *obj) > { > +#if HAVE_ELEMENTARY_WAYLAND > if (!obj) return NULL; > > if (!evas_object_smart_type_check_ptr(obj, MY_CLASS_NAME)) > @@ -5024,8 +5024,12 @@ > Ecore_Wl_Window *ret = NULL; > eo_do((Eo *) obj, elm_obj_win_wl_window_get(&ret)); > return ret; > +#else > + return NULL; > +#end > } > > +#if HAVE_ELEMENTARY_WAYLAND > static void > _wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) > { > @@ -5043,7 +5047,7 @@ > } > *ret = NULL; > } > -#endif > +#endif > > EAPI Eina_Bool > elm_win_trap_set(const Elm_Win_Trap *t) > @@ -5200,7 +5204,9 @@ > > EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET), > _focus_highlight_style_get), > EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN), > _socket_listen), > EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_XWINDOW_GET), > _xwindow_get), > +#if HAVE_ELEMENTARY_WAYLAND > EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET), > _wl_window_get), > +#endif > EO_OP_FUNC_SENTINEL > }; > > @@ -5297,7 +5303,9 @@ > EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET, "Get > the style set for the focus highlight object."), > EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN, "Create a socket > to provide the service for Plug widget."), > EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_XWINDOW_GET, "Get the > Ecore_X_Window of an Evas_Object."), > +#if HAVE_ELEMENTARY_WAYLAND > EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET, "Get the > Ecore_Wl_Window of and Evas_Object."), > +#endif > EO_OP_DESCRIPTION_SENTINEL > }; > > > Modified: trunk/elementary/src/lib/elm_win.h > =================================================================== > --- trunk/elementary/src/lib/elm_win.h 2012-12-06 09:16:15 UTC (rev > 80324) > +++ trunk/elementary/src/lib/elm_win.h 2012-12-06 09:20:37 UTC (rev > 80325) > @@ -2651,7 +2651,6 @@ > */ > 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 > @@ -2663,7 +2662,6 @@ > * @ingroup Win > */ > EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj); > -#endif > > /** > * @typedef Elm_Win_Trap ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
