e_comp_wl: remove the use of session-recovery protocol

It is not used.

Change-Id: I03c2f678cf598a79917bb871c431266cef92614b

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 15db08c..e851b9e 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -210,8 +210,6 @@ src/bin/e_util_transform.c \
 src/bin/e_output.c \
 src/bin/e_info_protocol.c \
 src/bin/e_uuid_store.c \
-src/bin/session-recovery-protocol.c \
-src/bin/session-recovery-server-protocol.h \
 src/bin/e_comp_wl_data.c \
 src/bin/e_comp_wl_input.c \
 src/bin/e_comp_wl.c \

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c94f851..1fdb974 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -16,7 +16,6 @@
 #define E_COM_WL_PREPARE_GAP_LOG_TIME 2000
 
 EINTERN int E_EVENT_WAYLAND_GLOBAL_ADD = -1;
-#include "session-recovery-server-protocol.h"
 
 #ifndef EGL_HEIGHT
 # define EGL_HEIGHT                    0x3056
@@ -3711,33 +3710,6 @@ _e_comp_wl_compositor_cb_bind(struct wl_client *client, void *data EINA_UNUSED,
 }
 
 static void
-_e_comp_wl_sr_cb_provide_uuid(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED, const char *uuid)
-{
-   DBG("Provide UUID callback called for UUID: %s", uuid);
-}
-
-static const struct session_recovery_interface _e_session_recovery_interface =
-{
-   _e_comp_wl_sr_cb_provide_uuid,
-};
-
-static void
-_e_comp_wl_session_recovery_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t version EINA_UNUSED, uint32_t id)
-{
-   struct wl_resource *res;
-
-   if (!(res = wl_resource_create(client, &session_recovery_interface, 1, id)))
-     {
-        ERR("Could not create session_recovery interface");
-        wl_client_post_no_memory(client);
-        return;
-     }
-
-   /* set implementation on resource */
-   wl_resource_set_implementation(res, &_e_session_recovery_interface, e_comp, NULL);
-}
-
-static void
 _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
 {
    Ecore_Window win;
@@ -4352,14 +4324,6 @@ _e_comp_wl_compositor_create(void)
         goto comp_global_err;
      }
 
-   /* try to add session_recovery to wayland globals */
-   if (!wl_global_create(wl_cdata->wl.disp, &session_recovery_interface, 1,
-                         e_comp, _e_comp_wl_session_recovery_cb_bind))
-     {
-        ERR("Could not add session_recovery to wayland globals: %m");
-        goto comp_global_err;
-     }
-
    /* initialize shm mechanism */
    wl_display_init_shm(wl_cdata->wl.disp);
 
@@ -4978,7 +4942,7 @@ e_comp_wl_output_init(const char *id, const char *make, const char *model,
 
         e_comp_wl->outputs = eina_list_append(e_comp_wl->outputs, output);
 
-        output->global = 
+        output->global =
           wl_global_create(e_comp_wl->wl.disp, &wl_output_interface,
                            2, output, _e_comp_wl_cb_output_bind);