From 0115cfd6250d0a4220ba41105fc0f8701f10f24a Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 27 Jul 2016 16:19:34 -0500 Subject: [PATCH] Add versions to wayland extension setup macros When we have a local extension with a version that isn't 1 this will become necessary. --- src/bin/e_comp_wl_extensions.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp_wl_extensions.c b/src/bin/e_comp_wl_extensions.c index 4f5fac89d..f0e60ece4 100644 --- a/src/bin/e_comp_wl_extensions.c +++ b/src/bin/e_comp_wl_extensions.c @@ -240,11 +240,11 @@ GLOBAL_BIND_CB(screenshooter, screenshooter_interface) GLOBAL_BIND_CB(www, www_interface) -#define GLOBAL_CREATE_OR_RETURN(NAME, IFACE) \ +#define GLOBAL_CREATE_OR_RETURN(NAME, IFACE, VERSION) \ do { \ struct wl_global *global; \ \ - global = wl_global_create(e_comp_wl->wl.disp, &(IFACE), 1, \ + global = wl_global_create(e_comp_wl->wl.disp, &(IFACE), VERSION, \ NULL, _e_comp_wl_##NAME##_cb_bind); \ if (!global) \ { \ @@ -276,9 +276,9 @@ e_comp_wl_extensions_init(void) e_comp_wl->extensions = E_NEW(E_Comp_Wl_Extension_Data, 1); /* try to add session_recovery to wayland globals */ - GLOBAL_CREATE_OR_RETURN(session_recovery, zwp_e_session_recovery_interface); - GLOBAL_CREATE_OR_RETURN(screenshooter, screenshooter_interface); - GLOBAL_CREATE_OR_RETURN(www, www_interface); + GLOBAL_CREATE_OR_RETURN(session_recovery, zwp_e_session_recovery_interface, 1); + GLOBAL_CREATE_OR_RETURN(screenshooter, screenshooter_interface, 1); + GLOBAL_CREATE_OR_RETURN(www, www_interface, 1); ecore_event_handler_add(ECORE_WL2_EVENT_SYNC_DONE, _dmabuf_add, NULL);