e_compositor: Remove e_surface_name_set

Use e_client_netwm_name_set instead of using e_surface_name_set since a
surface is not supposed to have name.

Change-Id: I5b569dcae5b59138033d8cd74afd7966286e10fa

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index a148a908720d190bf88c46bb274d183c02acb1e2..13af2cabb5a77241a774379fff458664136df5f4 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -516,14 +516,6 @@ e_surface_role_unset(E_Surface *surface)
    surface->role_name = NULL;
 }
 
-EINTERN void
-e_surface_name_set(E_Surface *surface, const char *name)
-{
-   EINA_SAFETY_ON_NULL_RETURN(surface);
-
-   e_client_netwm_name_set(surface->ec, name);
-}
-
 EINTERN E_Client *
 e_surface_ec_get(E_Surface *surface)
 {

diff --git a/src/bin/server/e_compositor_intern.h b/src/bin/server/e_compositor_intern.h
index c7f98d3c46085a38e19f3593b4c8a8bf14baa083..df3824a2ebab7cab240375d61c353ccca092dbde 100644 (file)
--- a/src/bin/server/e_compositor_intern.h
+++ b/src/bin/server/e_compositor_intern.h
@@ -41,7 +41,6 @@ enum wl_output_transform e_surface_buffer_transform_get(E_Surface *surface);
 E_Comp_Wl_Buffer *e_surface_buffer_try_get(E_Surface *surface);
 int32_t e_surface_buffer_scale_get(E_Surface *surface);
 Eina_Bool e_surface_viewport_changed_get(E_Surface *surface);
-void e_surface_name_set(E_Surface *surface, const char *name);
 E_Client *e_surface_ec_get(E_Surface *surface);
 Eina_Bool e_surface_has_buffer(E_Surface *surface);
 void e_surface_map(E_Surface *surface);

diff --git a/src/bin/server/e_video_shell.c b/src/bin/server/e_video_shell.c
index a93bcb0713fa7874e67a168bb8f33138d396c2f8..11078d9682c5a13429ff6dc91e6ac30f9e71e80d 100644 (file)
--- a/src/bin/server/e_video_shell.c
+++ b/src/bin/server/e_video_shell.c
@@ -636,7 +636,7 @@ _viewport_name_init(E_Video_Viewport *viewport)
    char name[256];
 
    snprintf(name, sizeof(name), "VS::Viewport(Parent 0x%08zx)", e_log_client_util_win_get(parent_ec));
-   e_surface_name_set(e_subsurface_surface_get(viewport->subsurface), name);
+   e_client_netwm_name_set(e_surface_ec_get(e_subsurface_surface_get(viewport->subsurface)), name);
 }
 
 static void
@@ -1743,14 +1743,11 @@ _video_surface_role_name_update(E_Video_Surface *surface)
      debug_str = surface->role->debug_str_get(surface->role);
 
    if (surface->name)
-     {
-        snprintf(name, sizeof(name), "%s [%s]", surface->name, debug_str ?: "VS::Surface");
-        e_surface_name_set(surface->surface, name);
-     }
+     snprintf(name, sizeof(name), "%s [%s]", surface->name, debug_str ?: "VS::Surface");
    else
-     {
-        e_surface_name_set(surface->surface, debug_str ?: "VS::Surface");
-     }
+     snprintf(name, sizeof(name), "%s", debug_str ?: "VS::Surface");
+
+   e_client_netwm_name_set(e_surface_ec_get(surface->surface), name);
 }
 
 static void