summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wayland/ecore_wl_window.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2015-12-18 14:51:04 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2015-12-18 14:51:04 +0100
commit337939ef14e2c158251c355f99d1d8b854665e78 (patch)
treea2779211c930eb26bc071290dc51dc498ecdec61 /src/lib/ecore_wayland/ecore_wl_window.c
parent1b6a400a29df00493f6799b20470f45f91af8846 (diff)
ecore_wayland: rename session recovery to align namespace
Align out extension naming with other unstable wayland protocols. The unstable protocols from the wayland-protocols repo are prefixed with a zwp additionally we keep a e prefix for now as we are still developing this here. No functional change, just rename. Pointed out by Derek that the session-recovery interface name is a bit to generic here.
Diffstat (limited to 'src/lib/ecore_wayland/ecore_wl_window.c')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 44a3ef4d74..39764d42e7 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -15,7 +15,7 @@ static char *_ecore_wl_window_id_str_get(unsigned int win_id);
15static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial); 15static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial);
16static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface); 16static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface);
17static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup); 17static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup);
18static void _ecore_session_recovery_uuid(void *data, struct session_recovery *session_recovery, const char *uuid); 18static void _ecore_session_recovery_uuid(void *data, struct zwp_e_session_recovery *session_recovery, const char *uuid);
19 19
20/* local variables */ 20/* local variables */
21static Eina_Hash *_windows = NULL; 21static Eina_Hash *_windows = NULL;
@@ -39,7 +39,7 @@ static const struct xdg_popup_listener _ecore_xdg_popup_listener =
39 _ecore_xdg_handle_popup_done, 39 _ecore_xdg_handle_popup_done,
40}; 40};
41 41
42static const struct session_recovery_listener _ecore_session_recovery_listener = 42static const struct zwp_e_session_recovery_listener _ecore_session_recovery_listener =
43{ 43{
44 _ecore_session_recovery_uuid, 44 _ecore_session_recovery_uuid,
45}; 45};
@@ -403,12 +403,12 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
403 403
404 if (_ecore_wl_disp->wl.session_recovery && getenv("EFL_WAYLAND_SESSION_RECOVERY")) 404 if (_ecore_wl_disp->wl.session_recovery && getenv("EFL_WAYLAND_SESSION_RECOVERY"))
405 { 405 {
406 session_recovery_add_listener(_ecore_wl_disp->wl.session_recovery, 406 zwp_e_session_recovery_add_listener(_ecore_wl_disp->wl.session_recovery,
407 &_ecore_session_recovery_listener, win); 407 &_ecore_session_recovery_listener, win);
408 if (!uuid_is_null(win->uuid)) 408 if (!uuid_is_null(win->uuid))
409 { 409 {
410 uuid_unparse(win->uuid, uuid); 410 uuid_unparse(win->uuid, uuid);
411 session_recovery_provide_uuid(_ecore_wl_disp->wl.session_recovery, uuid); 411 zwp_e_session_recovery_provide_uuid(_ecore_wl_disp->wl.session_recovery, uuid);
412 } 412 }
413 } 413 }
414 win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface); 414 win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface);
@@ -1102,7 +1102,7 @@ _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup)
1102} 1102}
1103 1103
1104static void 1104static void
1105_ecore_session_recovery_uuid(void *data EINA_UNUSED, struct session_recovery *session_recovery, const char *uuid) 1105_ecore_session_recovery_uuid(void *data EINA_UNUSED, struct zwp_e_session_recovery *session_recovery, const char *uuid)
1106{ 1106{
1107 Ecore_Wl_Window *win; 1107 Ecore_Wl_Window *win;
1108 char uuid_string[37]; 1108 char uuid_string[37];