summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-02-15 01:19:03 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-02-15 10:21:19 +0000
commit0bf8b1ab1a48c14a2f9d0a902887afee83ae56f1 (patch)
tree774a161fd447b20e911e6e10d69d3ccbc2edfb29
parenteb2ead11b5b1852569b34f78ad0a91096dfc7f0a (diff)
fix efl exe/thread/appthread to work again after seemingly bitrotting
-rw-r--r--src/lib/ecore/efl_appthread.c8
-rw-r--r--src/lib/ecore/efl_exe.eo2
-rw-r--r--src/lib/ecore/efl_task.eo2
-rw-r--r--src/lib/ecore/efl_thread.c8
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)
37{ 37{
38 if (pd->fd.in >= 0) 38 if (pd->fd.in >= 0)
39 { 39 {
40 efl_del(pd->fd.in_handler); 40// efl_del(pd->fd.in_handler);
41 efl_del(pd->fd.out_handler); 41// efl_del(pd->fd.out_handler);
42 efl_del(pd->ctrl.in_handler); 42// efl_del(pd->ctrl.in_handler);
43 efl_del(pd->ctrl.out_handler); 43// efl_del(pd->ctrl.out_handler);
44 close(pd->fd.in); 44 close(pd->fd.in);
45 close(pd->fd.out); 45 close(pd->fd.out);
46 close(pd->ctrl.in); 46 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 {
19 hide_io = 4 19 hide_io = 4
20} 20}
21 21
22class @beta Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer,Efl.Core.Command_Line 22class @beta Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line
23{ 23{
24 [[ ]] 24 [[ ]]
25 methods { 25 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 {
15 no_exit_code_error = 4, 15 no_exit_code_error = 4,
16} 16}
17 17
18abstract @beta Efl.Task extends Efl.Object 18abstract @beta Efl.Task extends Efl.Loop_Consumer
19{ 19{
20 [[ ]] 20 [[ ]]
21 methods { 21 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)
535 if (pd->thdat) 535 if (pd->thdat)
536 { 536 {
537 eina_thread_join(pd->thread); 537 eina_thread_join(pd->thread);
538 efl_del(pd->fd.in_handler); 538// efl_del(pd->fd.in_handler);
539 efl_del(pd->fd.out_handler); 539// efl_del(pd->fd.out_handler);
540 efl_del(pd->ctrl.in_handler); 540// efl_del(pd->ctrl.in_handler);
541 efl_del(pd->ctrl.out_handler); 541// efl_del(pd->ctrl.out_handler);
542 close(pd->fd.in); 542 close(pd->fd.in);
543 close(pd->fd.out); 543 close(pd->fd.out);
544 close(pd->ctrl.in); 544 close(pd->ctrl.in);