devilhorns pushed a commit to branch master.
commit 9325929df3d57694b009772ff9a27e30ba9f1d36
Author: Chris Michael <[email protected]>
Date: Thu May 16 13:20:21 2013 +0100
Revert "ecore evas wayland: if(()) are used for assignments, add missing
NULL fields"
This reverts commit ab505d5d23299e658b39fa7d0f1aa73742e3e7fb.
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 4 ++--
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
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 820f001..3aa60bf 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
@@ -435,7 +435,7 @@ _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->alpha == alpha) return;
+ if ((ee->alpha == alpha)) return;
ee->alpha = alpha;
wdata = ee->engine.data;
@@ -463,7 +463,7 @@ _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int
transparent)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->transparent == transparent) return;
+ if ((ee->transparent == transparent)) return;
ee->transparent = transparent;
wdata = ee->engine.data;
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 93e3361..2bac6f1 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
@@ -76,9 +76,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // focus skip set
NULL, //_ecore_evas_wl_common_render,
_ecore_evas_wl_common_screen_geometry_get,
- _ecore_evas_wl_common_screen_dpi_get,
- NULL, // func msg parent send
- NULL // func msg send
+ _ecore_evas_wl_common_screen_dpi_get
};
/* external variables */
@@ -460,7 +458,7 @@ _ecore_evas_wayland_shm_alpha_do(Ecore_Evas *ee, int alpha)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->alpha == alpha) return;
+ if ((ee->alpha == alpha)) return;
ee->alpha = alpha;
wdata = ee->engine.data;
@@ -509,7 +507,7 @@ _ecore_evas_wayland_shm_transparent_do(Ecore_Evas *ee, int
transparent)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->transparent == transparent) return;
+ if ((ee->transparent == transparent)) return;
ee->transparent = transparent;
wdata = ee->engine.data;
--
------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d