e_pixmap: Drop e_pixmap_cdata_get

The e_client_cdata_get is the replacement for e_pixmap_cdata_get.

Change-Id: Ie9fb7087d49b1013609225eebcfd9fb617e3e9cf

diff --git a/src/bin/core/e_pixmap.c b/src/bin/core/e_pixmap.c
index 836be247e5a1103d5f88e2ba253fcc486516f6d4..85e2cf9734aca455d00f619dc1dfabd577e416c9 100644 (file)
--- a/src/bin/core/e_pixmap.c
+++ b/src/bin/core/e_pixmap.c
@@ -823,14 +823,6 @@ e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h)
    if (h) *h = cp->opaque.h;
 }
 
-E_API E_Comp_Wl_Client_Data *
-e_pixmap_cdata_get(E_Pixmap *cp)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(cp->client, NULL);
-   return e_client_cdata_get(cp->client);
-}
-
 E_API E_Pixmap_Hook *
 e_pixmap_hook_add(E_Pixmap_Hook_Point hookpoint, E_Pixmap_Hook_Cb func, const void *data)
 {

diff --git a/src/bin/server/e_comp_wl_tbm.c b/src/bin/server/e_comp_wl_tbm.c
index e45cafd409969794885fde2ed811513f0629a6c0..1a05514d4c47e9380963959179a43af051964394 100644 (file)
--- a/src/bin/server/e_comp_wl_tbm.c
+++ b/src/bin/server/e_comp_wl_tbm.c
@@ -393,7 +393,7 @@ e_comp_wl_tbm_client_queue_get(E_Client *ec)
    EINA_SAFETY_ON_NULL_RETURN_VAL(comp_wl, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
 
-   cdata = e_pixmap_cdata_get(ec->pixmap);
+   cdata = e_client_cdata_get(ec);
    if (!cdata) return NULL;
    if (!cdata->wl_surface) return NULL;
 

diff --git a/src/include/e_pixmap.h b/src/include/e_pixmap.h
index dbc835e9c49295897ff8dd614d4170d624387478..66dd30435bdd0bfb4b4e56efa465f96b5e1d7ca1 100644 (file)
--- a/src/include/e_pixmap.h
+++ b/src/include/e_pixmap.h
@@ -33,7 +33,6 @@ E_API int                    e_pixmap_free(E_Pixmap *cp);
 E_API E_Pixmap              *e_pixmap_ref(E_Pixmap *cp);
 E_API E_Pixmap_Type          e_pixmap_type_get(const E_Pixmap *cp);
 E_API void                  *e_pixmap_resource_get(E_Pixmap *cp);
-E_API E_Comp_Wl_Client_Data *e_pixmap_cdata_get(E_Pixmap *cp);
 E_API void                   e_pixmap_resource_set(E_Pixmap *cp, void *resource);
 E_API void                   e_pixmap_clear(E_Pixmap *cp);
 E_API Eina_Bool              e_pixmap_usable_get(const E_Pixmap *cp);