discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c7027d4f444dcdce34baf98787c9affff2140c10

commit c7027d4f444dcdce34baf98787c9affff2140c10
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Wed Feb 17 13:34:31 2016 -0600

    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 dca2dfb..e8b307d 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;
 }
 

-- 


Reply via email to