Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.

1 files changed, 34 insertions, 19 deletions

diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 85b5a3dfce..bad39d1042 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -51,7 +51,8 @@ _eldbus_model_proxy_eo_base_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd)
    pd->object = NULL;
    pd->proxy = NULL;
    pd->properties_array = NULL;
-   pd->properties = eina_hash_string_superfast_new(_eldbus_model_proxy_properties_data_free_cb);
+   pd->properties_desc = NULL;
+   pd->properties = NULL;
    pd->children_list = NULL;
    pd->name = NULL;
    pd->pending_list = NULL;
@@ -106,24 +107,7 @@ _eldbus_model_proxy_efl_model_base_properties_get(Eo *obj EINA_UNUSED,
         return EMODEL_LOAD_STATUS_ERROR;
      }
 
-   if (NULL == pd->properties_array)
-     {
-        pd->properties_array = eina_array_new(eina_list_count(pd->interface->properties));
-        EINA_SAFETY_ON_NULL_RETURN_VAL(pd->properties_array, EMODEL_LOAD_STATUS_ERROR);
-
-        Eina_List *it;
-        Eldbus_Introspection_Property *property;
-        EINA_LIST_FOREACH(pd->interface->properties, it, property)
-          {
-             Eina_Stringshare *property = eina_stringshare_add(property->name);
-             EINA_SAFETY_ON_NULL_RETURN_VAL(property, EMODEL_LOAD_STATUS_ERROR);
-
-             Eina_Bool ret = eina_array_push(pd->properties_array, property);
-             EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EMODEL_LOAD_STATUS_ERROR);
-          }
-     }
-
-   *(Eina_List**)properties_array = pd->properties_array;
+   *(Eina_Array**)properties_array = pd->properties_array;
    return pd->load.status;
 }
 
@@ -535,7 +519,11 @@ _eldbus_model_proxy_property_invalidated_cb(void *data,
 
    // TODO: eldbus_proxy_property_get(event->name) ?
 
+<<<<<<< HEAD
    Efl_Model_Property_Event evt = {0};
+=======
+   Emodel_Property_Event evt = {0};
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
    evt.invalidated_properties = eina_array_new(1);
    EINA_SAFETY_ON_NULL_RETURN(evt.invalidated_properties);
 
@@ -573,12 +561,19 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
 
    if (!pd->properties_desc)
      {
+<<<<<<< HEAD
         pd->properties_desc = efl_model_value_struct_desc_new(
+=======
+        pd->properties_desc = emodel_value_struct_desc_new(
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
           eina_list_count(pd->interface->properties),
           _eldbus_model_proxy_member_setup_cb,
           pd);
      }
+<<<<<<< HEAD
    EINA_SAFETY_ON_TRUE_RETURN(pd->properties);
+=======
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
    pd->properties = eina_value_struct_new(pd->properties_desc);
 
    bool changed = false;
@@ -600,8 +595,11 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
         eina_value_free(struct_value);
         EINA_SAFETY_ON_FALSE_RETURN(ret);
 
+<<<<<<< HEAD
         fprintf(stderr, "arg0: %s\n", eina_value_to_string(&arg0));
         
+=======
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
         ret = eina_value_struct_value_set(pd->properties, property, &arg0);
         eina_value_flush(&arg0);
         EINA_SAFETY_ON_FALSE_RETURN(ret);
@@ -613,11 +611,19 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
 
    if (changed)
      {
+<<<<<<< HEAD
         Efl_Model_Property_Event evt = {.changed_properties = pd->properties_array};
         eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
      }
 
    efl_model_load_set(pd->obj, &pd->load, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES);
+=======
+        Emodel_Property_Event evt = {.changed_properties = pd->properties};
+        eo_do(pd->obj, eo_event_callback_call(EMODEL_EVENT_PROPERTIES_CHANGED, &evt));
+     }
+
+   emodel_load_set(pd->obj, &pd->load, EMODEL_LOAD_STATUS_LOADED_PROPERTIES);
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
 }
 
 
@@ -636,7 +642,11 @@ _eldbus_model_proxy_property_set_cb(void *data,
    if (eldbus_message_error_get(msg, &error_name, &error_text))
      {
         ERR("%s: %s", error_name, error_text);
+<<<<<<< HEAD
         efl_model_error_notify(pd->obj);
+=======
+        emodel_error_notify(pd->obj);
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
         goto on_error;
      }
 
@@ -645,8 +655,13 @@ _eldbus_model_proxy_property_set_cb(void *data,
                                                &property_set_data->value);
    EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
 
+<<<<<<< HEAD
    Efl_Model_Property_Event evt = {.changed_properties = pd->properties_array};
    eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
+=======
+   Emodel_Property_Event evt = {.changed_properties = pd->properties};
+   eo_do(pd->obj, eo_event_callback_call(EMODEL_EVENT_PROPERTIES_CHANGED, &evt));
+>>>>>>> 0bf80ad... Emodel API changes: Emodel_Property_Event::changed_properties as Eina_Value now.
 
 on_error:
    _eldbus_model_proxy_property_set_data_free(property_set_data);