summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-10-07 10:04:12 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-10-07 10:04:12 -0400
commitd28870daa7506bb73af4e92ee8b48c952f3d6aa6 (patch)
tree4403385cd8657bdf8b8bd5be8d83eb92b1f76130
parent7f91f6280d103c2c5148276b438adf5bbdcf373d (diff)
eldbus: connection are destroyed on invalidate, there is no point for any object to not cleanup on invalidate.
Summary: This solve a bug when there is a change in order of destruction and you would expect the model to still work. Depends on D10287 Reviewers: zmike, bu5hm4n, segfaultxavi, stefan_schmidt, jsuya Reviewed By: bu5hm4n Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10288
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c4
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo2
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c4
-rw-r--r--src/lib/eldbus/eldbus_model_signal.eo2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index ca0b6d6..817d896 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -76,7 +76,7 @@ _eldbus_model_arguments_custom_constructor(Eo *obj EINA_UNUSED,
76} 76}
77 77
78static void 78static void
79_eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Data *pd) 79_eldbus_model_arguments_efl_object_invalidate(Eo *obj, Eldbus_Model_Arguments_Data *pd)
80{ 80{
81 _eldbus_model_arguments_unload(pd); 81 _eldbus_model_arguments_unload(pd);
82 82
@@ -90,7 +90,7 @@ _eldbus_model_arguments_efl_object_destructor(Eo *obj, Eldbus_Model_Arguments_Da
90 pd->proxy = NULL; 90 pd->proxy = NULL;
91 } 91 }
92 92
93 efl_destructor(efl_super(obj, MY_CLASS)); 93 efl_invalidate(efl_super(obj, MY_CLASS));
94} 94}
95 95
96static Eina_Iterator * 96static Eina_Iterator *
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 627ab68..1512904 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -25,7 +25,7 @@ class @beta Eldbus.Model.Arguments extends Eldbus.Model {
25 implements { 25 implements {
26 Efl.Object.constructor; 26 Efl.Object.constructor;
27 Efl.Object.finalize; 27 Efl.Object.finalize;
28 Efl.Object.destructor; 28 Efl.Object.invalidate;
29 Efl.Model.properties { get; } 29 Efl.Model.properties { get; }
30 Efl.Model.property { set; get; } 30 Efl.Model.property { set; get; }
31 } 31 }
diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c
index d1bb490..5d05742 100644
--- a/src/lib/eldbus/eldbus_model_signal.c
+++ b/src/lib/eldbus/eldbus_model_signal.c
@@ -43,11 +43,11 @@ _eldbus_model_signal_signal_constructor(Eo *obj EINA_UNUSED,
43} 43}
44 44
45static void 45static void
46_eldbus_model_signal_efl_object_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd) 46_eldbus_model_signal_efl_object_invalidate(Eo *obj, Eldbus_Model_Signal_Data *pd)
47{ 47{
48 _eldbus_model_signal_callback_del(pd); 48 _eldbus_model_signal_callback_del(pd);
49 49
50 efl_destructor(efl_super(obj, MY_CLASS)); 50 efl_invalidate(efl_super(obj, MY_CLASS));
51} 51}
52 52
53 53
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 7227840..c5b6f22 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -14,7 +14,7 @@ class @beta Eldbus.Model.Signal extends Eldbus.Model.Arguments {
14 } 14 }
15 implements { 15 implements {
16 Efl.Object.constructor; 16 Efl.Object.constructor;
17 Efl.Object.destructor; 17 Efl.Object.invalidate;
18 } 18 }
19 constructors { 19 constructors {
20 .signal_constructor; 20 .signal_constructor;