diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-02-15 01:19:03 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-02-15 10:21:19 +0000 |
| commit | 0bf8b1ab1a48c14a2f9d0a902887afee83ae56f1 (patch) | |
| tree | 774a161fd447b20e911e6e10d69d3ccbc2edfb29 | |
| parent | eb2ead11b5b1852569b34f78ad0a91096dfc7f0a (diff) | |
| download | efl-0bf8b1ab1a48c14a2f9d0a902887afee83ae56f1.tar.gz | |
fix efl exe/thread/appthread to work again after seemingly bitrotting
| -rw-r--r-- | src/lib/ecore/efl_appthread.c | 8 | ||||
| -rw-r--r-- | src/lib/ecore/efl_exe.eo | 2 | ||||
| -rw-r--r-- | src/lib/ecore/efl_task.eo | 2 | ||||
| -rw-r--r-- | src/lib/ecore/efl_thread.c | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/ecore/efl_appthread.c b/src/lib/ecore/efl_appthread.c index 250d879118..4eb190bd63 100644 --- a/src/lib/ecore/efl_appthread.c +++ b/src/lib/ecore/efl_appthread.c @@ -37,10 +37,10 @@ _efl_appthread_efl_object_destructor(Eo *obj, Efl_Appthread_Data *pd) { if (pd->fd.in >= 0) { - efl_del(pd->fd.in_handler); - efl_del(pd->fd.out_handler); - efl_del(pd->ctrl.in_handler); - efl_del(pd->ctrl.out_handler); +// efl_del(pd->fd.in_handler); +// efl_del(pd->fd.out_handler); +// efl_del(pd->ctrl.in_handler); +// efl_del(pd->ctrl.out_handler); close(pd->fd.in); close(pd->fd.out); close(pd->ctrl.in); diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo index 0d3c29e7f2..01ba9a34bf 100644 --- a/src/lib/ecore/efl_exe.eo +++ b/src/lib/ecore/efl_exe.eo @@ -19,7 +19,7 @@ enum Efl.Exe_Flags { hide_io = 4 } -class @beta Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer,Efl.Core.Command_Line +class @beta Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line { [[ ]] methods { diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo index f3c1ac9b4f..6745411218 100644 --- a/src/lib/ecore/efl_task.eo +++ b/src/lib/ecore/efl_task.eo @@ -15,7 +15,7 @@ enum Efl.Task_Flags { no_exit_code_error = 4, } -abstract @beta Efl.Task extends Efl.Object +abstract @beta Efl.Task extends Efl.Loop_Consumer { [[ ]] methods { diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c index 7e52d7b637..ce1ab8f6d8 100644 --- a/src/lib/ecore/efl_thread.c +++ b/src/lib/ecore/efl_thread.c @@ -535,10 +535,10 @@ _efl_thread_efl_object_destructor(Eo *obj, Efl_Thread_Data *pd) if (pd->thdat) { eina_thread_join(pd->thread); - efl_del(pd->fd.in_handler); - efl_del(pd->fd.out_handler); - efl_del(pd->ctrl.in_handler); - efl_del(pd->ctrl.out_handler); +// efl_del(pd->fd.in_handler); +// efl_del(pd->fd.out_handler); +// efl_del(pd->ctrl.in_handler); +// efl_del(pd->ctrl.out_handler); close(pd->fd.in); close(pd->fd.out); close(pd->ctrl.in); |