diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 69ee96cad..a63dba0d9 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2069,7 +2069,7 @@ _e_comp_wl_sr_cb_provide_uuid(struct wl_client *client EINA_UNUSED, struct wl_re DBG("Provide UUID callback called for UUID: %s", uuid); } -static const struct session_recovery_interface _e_session_recovery_interface = +static const struct zwp_e_session_recovery_interface _e_session_recovery_interface = { _e_comp_wl_sr_cb_provide_uuid, }; @@ -2079,7 +2079,7 @@ _e_comp_wl_session_recovery_cb_bind(struct wl_client *client, void *data EINA_UN { struct wl_resource *res; - if (!(res = wl_resource_create(client, &session_recovery_interface, 1, id))) + if (!(res = wl_resource_create(client, &zwp_e_session_recovery_interface, 1, id))) { ERR("Could not create session_recovery interface"); wl_client_post_no_memory(client); @@ -2564,7 +2564,7 @@ _e_comp_wl_compositor_create(void) } /* try to add session_recovery to wayland globals */ - if (!wl_global_create(cdata->wl.disp, &session_recovery_interface, 1, + if (!wl_global_create(cdata->wl.disp, &zwp_e_session_recovery_interface, 1, e_comp, _e_comp_wl_session_recovery_cb_bind)) { ERR("Could not add session_recovery to wayland globals: %m"); diff --git a/src/bin/session-recovery-protocol.c b/src/bin/session-recovery-protocol.c index 5e0a835f4..32ddbcbef 100644 --- a/src/bin/session-recovery-protocol.c +++ b/src/bin/session-recovery-protocol.c @@ -7,17 +7,17 @@ static const struct wl_interface *types[] = { NULL, }; -static const struct wl_message session_recovery_requests[] = { +static const struct wl_message zwp_e_session_recovery_requests[] = { { "provide_uuid", "s", types + 0 }, }; -static const struct wl_message session_recovery_events[] = { +static const struct wl_message zwp_e_session_recovery_events[] = { { "uuid", "s", types + 0 }, }; -WL_EXPORT const struct wl_interface session_recovery_interface = { - "session_recovery", 1, - 1, session_recovery_requests, - 1, session_recovery_events, +WL_EXPORT const struct wl_interface zwp_e_session_recovery_interface = { + "zwp_e_session_recovery", 1, + 1, zwp_e_session_recovery_requests, + 1, zwp_e_session_recovery_events, }; diff --git a/src/bin/session-recovery-server-protocol.h b/src/bin/session-recovery-server-protocol.h index 4b5f5d02c..c08800212 100644 --- a/src/bin/session-recovery-server-protocol.h +++ b/src/bin/session-recovery-server-protocol.h @@ -1,5 +1,5 @@ -#ifndef SESSION_RECOVERY_SERVER_PROTOCOL_H -#define SESSION_RECOVERY_SERVER_PROTOCOL_H +#ifndef E_SESSION_RECOVERY_SERVER_PROTOCOL_H +#define E_SESSION_RECOVERY_SERVER_PROTOCOL_H #ifdef __cplusplus extern "C" { @@ -7,16 +7,16 @@ extern "C" { #include #include -#include "wayland-util.h" +#include "wayland-server.h" struct wl_client; struct wl_resource; -struct session_recovery; +struct zwp_e_session_recovery; -extern const struct wl_interface session_recovery_interface; +extern const struct wl_interface zwp_e_session_recovery_interface; -struct session_recovery_interface { +struct zwp_e_session_recovery_interface { /** * provide_uuid - (none) * @uuid: (none) @@ -26,14 +26,14 @@ struct session_recovery_interface { const char *uuid); }; -#define SESSION_RECOVERY_UUID 0 +#define ZWP_E_SESSION_RECOVERY_UUID 0 -#define SESSION_RECOVERY_UUID_SINCE_VERSION 1 +#define ZWP_E_SESSION_RECOVERY_UUID_SINCE_VERSION 1 static inline void -session_recovery_send_uuid(struct wl_resource *resource_, const char *uuid) +zwp_e_session_recovery_send_uuid(struct wl_resource *resource_, const char *uuid) { - wl_resource_post_event(resource_, SESSION_RECOVERY_UUID, uuid); + wl_resource_post_event(resource_, ZWP_E_SESSION_RECOVERY_UUID, uuid); } #ifdef __cplusplus diff --git a/src/bin/session-recovery.xml b/src/bin/session-recovery.xml index d996b6dae..469871e26 100644 --- a/src/bin/session-recovery.xml +++ b/src/bin/session-recovery.xml @@ -1,6 +1,6 @@ - + - +