[EGIT] [core/enlightenment] master 06/06: when rolling back an efm_op task, also remove children tasks

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit d2168532529081d77c4662a4d3f067c639860e57
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Thu Dec 19 14:56:34 2013 -0500

    when rolling back an efm_op task, also remove children tasks
    
    this simplifies/fixes the case where copying directories and canceling the 
operation would not correctly propagate the cancel to subtasks (contents of the 
directory)
    
    T680
---
 src/bin/e_fm_op.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index 88b15d7..f7fd78b 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -975,9 +975,26 @@ static void
 _e_fm_op_rollback(E_Fm_Op_Task *task)
 {
    E_Fm_Op_Copy_Data *data;
+   E_Fm_Op_Task *t;
+   Eina_List *l, *ll;
 
    if (!task) return;
 
+   EINA_LIST_FOREACH_SAFE(_e_fm_op_scan_queue, l, ll, t)
+     {
+        if (t == task) continue;
+        if (t->parent != task) continue;
+        _e_fm_op_scan_queue = eina_list_remove_list(_e_fm_op_scan_queue, l);
+        _e_fm_op_task_free(t);
+     }
+   EINA_LIST_FOREACH_SAFE(_e_fm_op_work_queue, l, ll, t)
+     {
+        if (t == task) continue;
+        if (t->parent != task) continue;
+        _e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, l);
+        _e_fm_op_task_free(t);
+     }
+
    if (task->type == E_FM_OP_COPY)
      {
         data = task->data;

--