antognolli pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=277a5915c1f5451f0e5ad740df9159f334af441d
commit 277a5915c1f5451f0e5ad740df9159f334af441d
Author: Rafael Antognolli <rafael.antogno...@intel.com>
Date: Fri Nov 1 10:28:14 2013 -0200
ecore/wayland: Remove attributes that are not used anymore.
Some attributes might have been useful in the past, but not anymore.
Just remove since they are not been used anywhere.
---
src/lib/ecore_wayland/Ecore_Wayland.h | 2 +-
src/lib/ecore_wayland/ecore_wl_window.c | 5 -----
.../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 7 -------
.../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 10 +---------
.../ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 10 +---------
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 f9b70c7..424e3db 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 661e825..4c40a62 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 2bb1aab..de87aff 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 1709c50..e0bb743 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 05060a7..5542173 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);
}
--
