e_compositor: Remove obsolete function

Change-Id: I64f3e81189840c82bd5118f4230d2d37262c0082

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 3e0397f..caaefde 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -24,6 +24,7 @@
 #include "e_view_rect.h"
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
+#include "e_compositor_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 
@@ -6596,7 +6597,7 @@ e_client_from_surface_resource(struct wl_resource *surface_resource)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface_resource, NULL);
 
-   return e_comp_wl_util_client_from_surface_resource(surface_resource);
+   return e_surface_ec_get(e_surface_from_resource(surface_resource));
 }
 
 EINTERN void

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index f66f057..24d0216 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -6098,12 +6098,6 @@ EINTERN void e_comp_wl_client_surface_set(E_Client *ec, struct wl_resource *surf
    g_mutex_unlock(&ec->comp_data->surface_mutex);
 }
 
-EINTERN E_Client *
-e_comp_wl_util_client_from_surface_resource(struct wl_resource *surface_resource)
-{
-   return e_compositor_util_client_from_surface_resource(surface_resource);
-}
-
 EINTERN void
 e_comp_wl_client_surface_pending_buffer_set(E_Client *ec, E_Comp_Wl_Buffer *buffer, int32_t sx, int32_t sy)
 {

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index 5daa935..cd67b28 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -180,21 +180,6 @@ e_compositor_init(struct wl_display *display)
    return EINA_TRUE;
 }
 
-EINTERN E_Client *
-e_compositor_util_client_from_surface_resource(struct wl_resource *surface_resource)
-{
-   E_Surface *surface;
-   struct ds_surface *ds_surface;
-
-   ds_surface = ds_surface_from_resource(surface_resource);
-   if (!ds_surface)
-     return NULL;
-
-   surface = _e_surface_from_ds_surface(ds_surface);
-
-   return surface->ec;
-}
-
 EINTERN Eina_Bool
 e_comp_wl_subsurface_add(struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource, struct wl_resource *parent_resource)
 {

diff --git a/src/bin/server/e_compositor_intern.h b/src/bin/server/e_compositor_intern.h
index 06f4ba6..e47fc35 100644 (file)
--- a/src/bin/server/e_compositor_intern.h
+++ b/src/bin/server/e_compositor_intern.h
@@ -10,7 +10,6 @@ typedef struct _E_Surface E_Surface;
 typedef struct _E_Subsurface E_Subsurface;
 
 EINTERN Eina_Bool e_compositor_init(struct wl_display *display);
-EINTERN E_Client *e_compositor_util_client_from_surface_resource(struct wl_resource *surface_resource);
 
 EINTERN E_Surface *e_surface_from_resource(struct wl_resource *surface_resource);
 EINTERN void e_surface_destroy_listener_add(E_Surface *surface, struct wl_listener *listener);