summaryrefslogtreecommitdiff
path: root/src/lib/eio/eio_model.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/eio/eio_model.c')
-rw-r--r--src/lib/eio/eio_model.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 5ff288e..1d96750 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -51,7 +51,7 @@ _load_set(Eio_Model_Data *priv, Efl_Model_Load_Status status)
51 if (priv->load.status != load.status) 51 if (priv->load.status != load.status)
52 { 52 {
53 priv->load.status = load.status; 53 priv->load.status = load.status;
54 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load)); 54 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load);
55 } 55 }
56} 56}
57 57
@@ -75,7 +75,7 @@ _eio_stat_done_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina_Stat *st
75 eina_value_set(priv->properties_value[EIO_MODEL_PROP_SIZE], eio_file_size(stat)); 75 eina_value_set(priv->properties_value[EIO_MODEL_PROP_SIZE], eio_file_size(stat));
76 76
77 evt.changed_properties = priv->properties_name; 77 evt.changed_properties = priv->properties_name;
78 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); 78 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
79 79
80 _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); 80 _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES);
81 81
@@ -112,7 +112,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
112 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); 112 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
113 evt.changed_properties = properties; 113 evt.changed_properties = properties;
114 114
115 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); 115 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt);
116 eina_array_free(properties); 116 eina_array_free(properties);
117} 117}
118 118
@@ -147,16 +147,16 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
147 Efl_Model_Children_Event cevt; 147 Efl_Model_Children_Event cevt;
148 Eina_Value path; 148 Eina_Value path;
149 149
150 cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(evt->filename)); 150 cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(eoid, evt->filename));
151 priv->children_list = eina_list_append(priv->children_list, cevt.child); 151 priv->children_list = eina_list_append(priv->children_list, cevt.child);
152 cevt.index = eina_list_count(priv->children_list); 152 cevt.index = eina_list_count(priv->children_list);
153 153
154 eina_value_setup(&path, EINA_VALUE_TYPE_STRING); 154 eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
155 eina_value_set(&path, evt->filename); 155 eina_value_set(&path, evt->filename);
156 eo_do(cevt.child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata)); 156 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
157 eina_value_flush(&path); 157 eina_value_flush(&path);
158 158
159 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt)); 159 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt);
160 160
161 return EINA_TRUE; 161 return EINA_TRUE;
162} 162}
@@ -185,7 +185,7 @@ _efl_model_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, vo
185 cevt.index = i; 185 cevt.index = i;
186 cevt.child = cur->data; 186 cevt.child = cur->data;
187 187
188 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt)); 188 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt);
189 189
190 priv->children_list = eina_list_remove_list(priv->children_list, cur); 190 priv->children_list = eina_list_remove_list(priv->children_list, cur);
191 eo_unref(cevt.child); 191 eo_unref(cevt.child);
@@ -407,10 +407,10 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina
407 Eio_Model_Data *priv = data; 407 Eio_Model_Data *priv = data;
408 EINA_SAFETY_ON_NULL_RETURN(priv); 408 EINA_SAFETY_ON_NULL_RETURN(priv);
409 409
410 child = eo_add(MY_CLASS, NULL, eio_model_path_set(info->path)); 410 child = eo_add(MY_CLASS, NULL, eio_model_path_set(eoid, info->path));
411 eina_spinlock_take(&priv->filter_lock); 411 eina_spinlock_take(&priv->filter_lock);
412 if (priv->filter_cb) 412 if (priv->filter_cb)
413 eo_do(child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata)); 413 eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata);
414 eina_spinlock_release(&priv->filter_lock); 414 eina_spinlock_release(&priv->filter_lock);
415 415
416 priv->children_list = eina_list_append(priv->children_list, child); 416 priv->children_list = eina_list_append(priv->children_list, child);
@@ -426,7 +426,7 @@ _eio_done_children_load_cb(void *data, Eio_File *handler EINA_UNUSED)
426 count = eina_list_count(priv->children_list); 426 count = eina_list_count(priv->children_list);
427 _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); 427 _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN);
428 428
429 eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); 429 eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count);
430} 430}
431 431
432static void 432static void
@@ -626,7 +626,7 @@ _eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data
626static Eo * 626static Eo *
627_eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv) 627_eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv)
628{ 628{
629 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 629 obj = eo_constructor(eo_super(obj, MY_CLASS));
630 unsigned int i; 630 unsigned int i;
631 priv->obj = obj; 631 priv->obj = obj;
632 632
@@ -684,7 +684,7 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
684 eo_unref(child); 684 eo_unref(child);
685 685
686 free(priv->path); 686 free(priv->path);
687 eo_do_super(obj, MY_CLASS, eo_destructor()); 687 eo_destructor(eo_super(obj, MY_CLASS));
688} 688}
689 689
690#include "eio_model.eo.c" 690#include "eio_model.eo.c"