From c7027d4f444dcdce34baf98787c9affff2140c10 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 17 Feb 2016 13:34:31 -0600 Subject: [PATCH] Use eina_list_merge instead of eina_list_move for wayland lists We should use eina_list_merge for concatenating lists instead of eina_list_move. --- src/bin/e_comp_wl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index dca2dfbc5..e8b307dad 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1718,8 +1718,9 @@ _e_comp_wl_subsurface_commit_to_cache(E_Client *ec) DBG("Subsurface Commit to Cache"); /* move pending damage to cached */ - EINA_LIST_FOREACH(cdata->pending.damages, l, rect) - eina_list_move(&sdata->cached.damages, &cdata->pending.damages, rect); + sdata->cached.damages = eina_list_merge(sdata->cached.damages, + cdata->pending.damages); + cdata->pending.damages = NULL; if (cdata->pending.new_attach) { @@ -1752,9 +1753,9 @@ _e_comp_wl_subsurface_commit_to_cache(E_Client *ec) eina_tiler_rect_add(sdata->cached.input, rect); eina_iterator_free(itr); - EINA_LIST_FOREACH(cdata->pending.frames, l, cb) - eina_list_move(&sdata->cached.frames, &cdata->pending.frames, cb); - + sdata->cached.frames = eina_list_merge(sdata->cached.frames, + cdata->pending.frames); + cdata->pending.frames = NULL; sdata->cached.has_data = EINA_TRUE; }