From cc596a358851e06f162dd3e8f75938c4b6395584 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 18 Jul 2013 11:07:05 +0100 Subject: [PATCH] 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 --- .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 2 +- .../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 e8a457027e..1d5ac496c8 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 fae0b4fbd8..048d2c7019 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();