enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e_comp_wl: follow wayland session recovery namning change from efl. 

Align out extension naming with other unstable wayland protocols.
No functional change, just rename.
This commit is contained in:
Stefan Schmidt 2015-12-18 14:47:58 +01:00
parent f174008a83
commit 46fbcd3f9b
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_comp_wl.c
View File

@ -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); 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, _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; 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"); ERR("Could not create session_recovery interface");
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
@ -2564,7 +2564,7 @@ _e_comp_wl_compositor_create(void)
} }
/* try to add session_recovery to wayland globals */ /* 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)) e_comp, _e_comp_wl_session_recovery_cb_bind))
{ {
ERR("Could not add session_recovery to wayland globals: %m"); ERR("Could not add session_recovery to wayland globals: %m");

12
src/bin/session-recovery-protocol.c
View File

@ -7,17 +7,17 @@ static const struct wl_interface *types[] = {
NULL, NULL,
}; };
static const struct wl_message session_recovery_requests[] = { static const struct wl_message zwp_e_session_recovery_requests[] = {
{ "provide_uuid", "s", types + 0 }, { "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 }, { "uuid", "s", types + 0 },
}; };
WL_EXPORT const struct wl_interface session_recovery_interface = { WL_EXPORT const struct wl_interface zwp_e_session_recovery_interface = {
"session_recovery", 1, "zwp_e_session_recovery", 1,
1, session_recovery_requests, 1, zwp_e_session_recovery_requests,
1, session_recovery_events, 1, zwp_e_session_recovery_events,
}; };

20
src/bin/session-recovery-server-protocol.h
View File

@ -1,5 +1,5 @@
#ifndef SESSION_RECOVERY_SERVER_PROTOCOL_H #ifndef E_SESSION_RECOVERY_SERVER_PROTOCOL_H
#define SESSION_RECOVERY_SERVER_PROTOCOL_H #define E_SESSION_RECOVERY_SERVER_PROTOCOL_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -7,16 +7,16 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include "wayland-util.h" #include "wayland-server.h"
struct wl_client; struct wl_client;
struct wl_resource; 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) * provide_uuid - (none)
* @uuid: (none) * @uuid: (none)
@ -26,14 +26,14 @@ struct session_recovery_interface {
const char *uuid); 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 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 #ifdef __cplusplus

4
src/bin/session-recovery.xml
View File

@ -1,6 +1,6 @@
<protocol name="session_recovery"> <protocol name="e_session_recovery">
<interface name="session_recovery" version="1"> <interface name="zwp_e_session_recovery" version="1">
<request name="provide_uuid"> <request name="provide_uuid">
<arg name="uuid" type="string"/> <arg name="uuid" type="string"/>
</request> </request>