5 files changed, 3 insertions, 31 deletions

diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index f9b70c7958..424e3db4ec 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -132,7 +132,7 @@ struct _Ecore_Wl_Window
    struct 
      {
         int w, h;
-     } saved, server;
+     } saved;
 
    struct 
      {
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 661e825df0..4c40a62cd9 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -212,8 +212,6 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
    switch (win->buffer_type)
      {
       case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW:
-        win->server.w = win->allocation.w;
-        win->server.h = win->allocation.h;
         break;
       case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_IMAGE:
       case ECORE_WL_WINDOW_BUFFER_TYPE_SHM:
@@ -226,9 +224,6 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
              wl_surface_damage(win->surface, 0, 0, 
                                win->allocation.w, win->allocation.h);
              wl_surface_commit(win->surface);
-
-             win->server.w = win->allocation.w;
-             win->server.h = win->allocation.h;
           }
         break;
       default:
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 2bb1aab75d..de87aff1c9 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -277,14 +277,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
 
         if (wdata->win)
           {
-             Ecore_Wl_Window *win;
-
-             win = wdata->win;
-
              _ecore_evas_wayland_resize_edge_set(ee, ev->edges);
-
-             win->server.w = win->allocation.w;
-             win->server.h = win->allocation.h;
              ecore_wl_window_update_size(wdata->win, ev->w, ev->h);
           }
      }
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 1709c50acf..e0bb74319d 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -325,15 +325,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
           evas_object_resize(wdata->frame, w, h);
 
         if (wdata->win)
-          {
-             Ecore_Wl_Window *win;
-
-             win = wdata->win;
-
-             win->server.w = win->allocation.w;
-             win->server.h = win->allocation.h;
-             ecore_wl_window_update_size(wdata->win, w, h);
-          }
+          ecore_wl_window_update_size(wdata->win, w, h);
 
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
      }
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 05060a7e3f..55421736d4 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -319,15 +319,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
           evas_object_resize(wdata->frame, w, h);
 
         if (wdata->win)
-          {
-             Ecore_Wl_Window *win;
-
-             win = wdata->win;
-
-             win->server.w = win->allocation.w;
-             win->server.h = win->allocation.h;
-             ecore_wl_window_update_size(wdata->win, w, h);
-          }
+          ecore_wl_window_update_size(wdata->win, w, h);
 
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
      }