devilhorns pushed a commit to branch master.
commit cc596a358851e06f162dd3e8f75938c4b6395584
Author: Chris Michael <[email protected]>
Date: Thu Jul 18 11:07:05 2013 +0100
If the init count is >= 1, then we want to iterate (ecore_imf wayland
module adds an extra init).
Fix some formatting
Signed-off-by: Chris Michael <[email protected]>
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 2 +-
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 5 +++--
2 files changed, 4 insertions(+), 3 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 e8a4570..1d5ac49 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
@@ -112,7 +112,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name,
unsigned int parent,
ERR("Failed to initialize Ecore_Wayland");
return NULL;
}
- else if (count == 1)
+ else if (count >= 1)
ecore_wl_display_iterate();
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
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 fae0b4f..048d2c7 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
@@ -111,7 +111,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name,
unsigned int parent,
ERR("Failed to initialize Ecore_Wayland");
return NULL;
}
- else if (count == 1)
+ else if (count >= 1)
ecore_wl_display_iterate();
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
@@ -179,7 +179,8 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name,
unsigned int parent,
wdata->parent = p;
wdata->win =
- ecore_wl_window_new(p, x, y, w + fw, h + fh,
ECORE_WL_WINDOW_BUFFER_TYPE_SHM);
+ ecore_wl_window_new(p, x, y, w + fw, h + fh,
+ ECORE_WL_WINDOW_BUFFER_TYPE_SHM);
ee->prop.window = wdata->win->id;
ee->evas = evas_new();
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
