summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-05-18 21:38:46 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-05-18 21:38:46 +0200
commiteca2dfaa0bca3c169e54f4f7956b06c4a7ee3ee1 (patch)
tree5ef289876bb89c69431367f8837ed7f488499cc1
parentaba525063456cc11aff46c9c8968749ae2bf8fa8 (diff)
Follow Eo changes
eo_del -> eo_unref eo_key_del -> eo_key_set(NULL) EO_BASE_EVENT_DEL -> EO_EVENT_DEL
Diffstat (limited to '')
-rw-r--r--efl/eo/efl.eo.pyx14
-rw-r--r--include/efl.c_eo.pxd4
2 files changed, 8 insertions, 10 deletions
diff --git a/efl/eo/efl.eo.pyx b/efl/eo/efl.eo.pyx
index 7c7b9f0..8a6ade9 100644
--- a/efl/eo/efl.eo.pyx
+++ b/efl/eo/efl.eo.pyx
@@ -36,10 +36,10 @@ from efl.eina cimport Eina_Bool, \
36 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \ 36 Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \
37 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \ 37 eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \
38 Eina_Iterator, eina_iterator_next, eina_iterator_free 38 Eina_Iterator, eina_iterator_next, eina_iterator_free
39from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_del, \ 39from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_unref, \
40 eo_class_name_get, eo_class_get, eo_base_class_get,\ 40 eo_class_name_get, eo_class_get, eo_base_class_get,\
41 eo_key_data_set, eo_key_data_get, eo_key_del, \ 41 eo_key_data_set, eo_key_data_get, \
42 eo_event_callback_add, eo_event_callback_del, EO_BASE_EVENT_DEL, \ 42 eo_event_callback_add, eo_event_callback_del, EO_EVENT_DEL, \
43 eo_parent_get, eo_parent_set, Eo_Event_Description, \ 43 eo_parent_get, eo_parent_set, Eo_Event_Description, \
44 eo_event_freeze, eo_event_thaw, eo_event_freeze_count_get, \ 44 eo_event_freeze, eo_event_thaw, eo_event_freeze_count_get, \
45 eo_event_global_freeze, eo_event_global_thaw, \ 45 eo_event_global_freeze, eo_event_global_thaw, \
@@ -189,8 +189,8 @@ cdef Eina_Bool _eo_event_del_cb(void *data, const Eo_Event *event) with gil:
189 189
190 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, "Deleting Eo: %s", cls_name) 190 EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, "Deleting Eo: %s", cls_name)
191 191
192 eo_event_callback_del(self.obj, EO_BASE_EVENT_DEL, _eo_event_del_cb, <const void *>self) 192 eo_event_callback_del(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self)
193 eo_key_del(self.obj, "python-eo") 193 eo_key_data_set(self.obj, "python-eo", NULL)
194 self.obj = NULL 194 self.obj = NULL
195 Py_DECREF(self) 195 Py_DECREF(self)
196 196
@@ -253,7 +253,7 @@ cdef class Eo(object):
253 253
254 self.obj = obj 254 self.obj = obj
255 eo_key_data_set(self.obj, "python-eo", <void *>self) 255 eo_key_data_set(self.obj, "python-eo", <void *>self)
256 eo_event_callback_add(self.obj, EO_BASE_EVENT_DEL, _eo_event_del_cb, <const void *>self) 256 eo_event_callback_add(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self)
257 Py_INCREF(self) 257 Py_INCREF(self)
258 258
259 return 1 259 return 1
@@ -275,7 +275,7 @@ cdef class Eo(object):
275 garbage collector when there are no more reference to it. 275 garbage collector when there are no more reference to it.
276 276
277 """ 277 """
278 eo_del(self.obj) 278 eo_unref(self.obj)
279 279
280 def is_deleted(self): 280 def is_deleted(self):
281 """Check if the object has been deleted thus leaving the object shallow. 281 """Check if the object has been deleted thus leaving the object shallow.
diff --git a/include/efl.c_eo.pxd b/include/efl.c_eo.pxd
index 492bd4e..c35b103 100644
--- a/include/efl.c_eo.pxd
+++ b/include/efl.c_eo.pxd
@@ -83,7 +83,7 @@ cdef extern from "Eo.h":
83 # Eo Events 83 # Eo Events
84 # 84 #
85 85
86 cdef const Eo_Event_Description *EO_BASE_EVENT_DEL 86 cdef const Eo_Event_Description *EO_EVENT_DEL
87 87
88 88
89 #################################################################### 89 ####################################################################
@@ -104,7 +104,6 @@ cdef extern from "Eo.h":
104 Eo *eo_ref(const Eo *obj) 104 Eo *eo_ref(const Eo *obj)
105 void eo_unref(const Eo *obj) 105 void eo_unref(const Eo *obj)
106 int eo_ref_get(const Eo *obj) 106 int eo_ref_get(const Eo *obj)
107 void eo_del(const Eo *obj)
108 107
109 void eo_wref_add(Eo **wref) 108 void eo_wref_add(Eo **wref)
110 109
@@ -112,7 +111,6 @@ cdef extern from "Eo.h":
112 111
113 void eo_key_data_set(Eo *obj, const char *key, const void *data) 112 void eo_key_data_set(Eo *obj, const char *key, const void *data)
114 void *eo_key_data_get(Eo *obj, const char *key) 113 void *eo_key_data_get(Eo *obj, const char *key)
115 void eo_key_del(Eo *obj, const char *key)
116 114
117 const Eo_Class *eo_class_get(const Eo *obj) 115 const Eo_Class *eo_class_get(const Eo *obj)
118 const char *eo_class_name_get(const Eo_Class *klass) 116 const char *eo_class_name_get(const Eo_Class *klass)