e_client: Extract function for repeated pattern

It adds _desktop_surface_try_from_ec() to get E_Desktop_Surface instance
from E_Client instance.

Change-Id: I06e1bde3e9d733e097df7eba8994f7592a219116

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index bb3374129f7a4ec7f37cf633fa84618a6ab94097..924b989edf7ce8c050b5a43ed39be04ff80b482e 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -6452,18 +6452,26 @@ e_client_unmap_listener_add(E_Client *ec, struct wl_listener *listener)
    wl_signal_add(&priv->events.unmap, listener);
 }
 
+static E_Desktop_Surface *
+_desktop_surface_try_from_ec(E_Client *ec)
+{
+   E_Surface *surface;
+
+   surface = e_surface_try_from_ec(ec);
+   if (!surface)
+     return NULL;
+
+   return e_desktop_surface_try_from_surface(surface);
+}
+
 EINTERN Eina_Bool
 e_client_shell_configure_send(E_Client *ec, uint32_t edges, int32_t width, int32_t height)
 {
-   E_Surface *surface;
-   E_Desktop_Surface *desktop_surface = NULL;
+   E_Desktop_Surface *desktop_surface;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
 
-   surface = e_surface_try_from_ec(ec);
-   if (surface)
-     desktop_surface = e_desktop_surface_try_from_surface(surface);
-
+   desktop_surface = _desktop_surface_try_from_ec(ec);
    if (desktop_surface)
      {
         e_desktop_surface_configure_send(desktop_surface, edges, width, height);
@@ -6485,15 +6493,11 @@ e_client_shell_configure_send(E_Client *ec, uint32_t edges, int32_t width, int32
 EINTERN void
 e_client_shell_configure(E_Client *ec, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
 {
-   E_Surface *surface;
-   E_Desktop_Surface *desktop_surface = NULL;
+   E_Desktop_Surface *desktop_surface;
 
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   surface = e_surface_try_from_ec(ec);
-   if (surface)
-     desktop_surface = e_desktop_surface_try_from_surface(surface);
-
+   desktop_surface = _desktop_surface_try_from_ec(ec);
    if (desktop_surface)
      {
         e_desktop_surface_configure(desktop_surface, x, y, width, height);
@@ -6513,15 +6517,11 @@ e_client_shell_configure(E_Client *ec, Evas_Coord x, Evas_Coord y, Evas_Coord wi
 EINTERN void
 e_client_shell_ping(E_Client *ec)
 {
-   E_Surface *surface;
-   E_Desktop_Surface *desktop_surface = NULL;
+   E_Desktop_Surface *desktop_surface;
 
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   surface = e_surface_try_from_ec(ec);
-   if (surface)
-     desktop_surface = e_desktop_surface_try_from_surface(surface);
-
+   desktop_surface = _desktop_surface_try_from_ec(ec);
    if (desktop_surface)
      {
         e_desktop_surface_ping(desktop_surface);
@@ -6680,15 +6680,11 @@ e_client_icccm_title_get(E_Client *ec)
 static void
 _e_client_shell_map(E_Client *ec)
 {
-   E_Surface *surface;
-   E_Desktop_Surface *desktop_surface = NULL;
+   E_Desktop_Surface *desktop_surface;
 
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   surface = e_surface_try_from_ec(ec);
-   if (surface)
-     desktop_surface = e_desktop_surface_try_from_surface(surface);
-
+   desktop_surface = _desktop_surface_try_from_ec(ec);
    if (desktop_surface)
      {
         e_desktop_surface_map(desktop_surface);
@@ -6708,15 +6704,11 @@ _e_client_shell_map(E_Client *ec)
 EINTERN void
 e_client_shell_unmap(E_Client *ec)
 {
-   E_Surface *surface;
-   E_Desktop_Surface *desktop_surface = NULL;
+   E_Desktop_Surface *desktop_surface;
 
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   surface = e_surface_try_from_ec(ec);
-   if (surface)
-     desktop_surface = e_desktop_surface_try_from_surface(surface);
-
+   desktop_surface = _desktop_surface_try_from_ec(ec);
    if (desktop_surface)
      {
         e_desktop_surface_unmap(desktop_surface);