From aedf55073ab175a95ce088a412d023dbc2e85c4f Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 9 Mar 2017 11:05:28 -0600 Subject: [PATCH] ecore_wl2: Rename badly named API Oops, I broke naming convention with this, but it's unreleased and beta so I hope nobody notices as long as I change it now... --- src/lib/ecore_wl2/Ecore_Wl2.h | 2 +- src/lib/ecore_wl2/ecore_wl2_window.c | 2 +- .../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 58f3e33d4a..24ce2f5b73 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -1332,7 +1332,7 @@ EAPI void ecore_wl2_offer_finish(Ecore_Wl2_Offer *offer); * @return Returns true if the window has an associated shell surface. * @since 1.19 */ -EAPI Eina_Bool ecore_wl2_window_has_shell_surface(Ecore_Wl2_Window *win); +EAPI Eina_Bool ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *win); /** * Disable session recovery for any further connections. Must be called diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index fff93c4123..ebb10f258d 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -1271,7 +1271,7 @@ ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display) } EAPI Eina_Bool -ecore_wl2_window_has_shell_surface(Ecore_Wl2_Window *window) +ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 53e1c89c22..fc1d0d4cc7 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -1500,7 +1500,7 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event EINA_ wl_callback_add_listener(wdata->anim_callback, &_anim_listener, ee); ecore_evas_manual_render_set(ee, 1); - if (!ecore_wl2_window_has_shell_surface(wdata->win)) return; + if (!ecore_wl2_window_shell_surface_exists(wdata->win)) return; if (wdata->win->zxdg_configure_ack && wdata->win->configure_serial) wdata->win->zxdg_configure_ack(wdata->win->zxdg_surface,