4 files changed, 61 insertions, 79 deletions

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index a08a151..8dd9d82 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -109,7 +109,7 @@ static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
 
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
      Eina_Bool finalized; \
-     if (eo_do_ret(obj, finalized, eo_finalized_get())) \
+     if (eo_finalized_get(obj)) \
        { \
           ERR("This function is only allowed during construction."); \
           return; \
@@ -306,10 +306,7 @@ _efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const ch
    if (!name || !done_cb)
      return EINA_FALSE;
 
-   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
-         efl_network_server_connection_type_set(ECORE_CON_REMOTE_TCP),
-         efl_network_server_name_set(name),
-         efl_network_base_port_set(1025));
+   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, 1025));
 
    lk = malloc(sizeof (Ecore_Con_Lookup));
    if (!lk)
@@ -363,10 +360,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
 
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
    /* remote system socket: TCP/IP: [name]:[port] */
-   obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL,
-         efl_network_server_connection_type_set(compl_type),
-         efl_network_server_name_set(name),
-         efl_network_base_port_set(port));
+   obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port));
 
    ecore_con_server_data_set(obj, (void *) data);
 
@@ -376,7 +370,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
 EOLIAN static Eo *
 _efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
 {
-   obj = eo_do_super_ret(obj, EFL_NETWORK_SERVER_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->fd = -1;
    svr->reject_excess_clients = EINA_FALSE;
@@ -392,7 +386,7 @@ _efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_D
    Ecore_Con_Type compl_type = svr->type;
    Ecore_Con_Type type;
 
-   eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize());
+   eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->created = EINA_TRUE;
    svr->ppid = getpid();
@@ -462,10 +456,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    /* local  user   socket: FILE:   ~/.ecore/[name]/[port] */
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
    /* remote system socket: TCP/IP: [name]:[port] */
-   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
-         efl_network_server_connection_type_set(compl_type),
-         efl_network_server_name_set(name),
-         efl_network_base_port_set(port));
+   obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port));
 
    ecore_con_server_data_set(obj, (void *) data);
 
@@ -481,7 +472,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU
 
    /* XXX: We intentionally put SERVER class here and not connector, as we'd
     * like to skip that one. */
-   eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize());
+   eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 
    svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
    svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -548,7 +539,7 @@ error:
 EAPI void
 ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
 {
-   eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout));
+   efl_network_base_timeout_set((Ecore_Con *)obj, timeout);
 }
 
 EOLIAN static void
@@ -566,7 +557,7 @@ EAPI double
 ecore_con_server_timeout_get(const Ecore_Con *obj)
 {
    double ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get());
+   return efl_network_base_timeout_get((Ecore_Con *)obj);
 }
 
 EOLIAN static double
@@ -620,7 +611,7 @@ EAPI Eina_Bool
 ecore_con_server_connected_get(const Ecore_Con *obj)
 {
    Eina_Bool ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get());
+   return efl_network_base_connected_get((Ecore_Con *)obj);
 }
 
 EOLIAN static Eina_Bool
@@ -670,7 +661,7 @@ EAPI int
 ecore_con_server_port_get(const Ecore_Con *obj)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get());
+   return efl_network_base_port_get((Ecore_Con *)obj);
 }
 
 EOLIAN static void
@@ -691,7 +682,7 @@ EAPI int
 ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size));
+   return efl_network_base_send((Ecore_Con *)obj, data, size);
 }
 
 EOLIAN static int
@@ -748,7 +739,7 @@ EAPI const char *
 ecore_con_server_ip_get(const Ecore_Con *obj)
 {
    const char *ret;
-   return eo_do_ret(obj, ret, efl_network_base_ip_get());
+   return efl_network_base_ip_get(obj);
 }
 
 EOLIAN static const char *
@@ -761,7 +752,7 @@ EAPI double
 ecore_con_server_uptime_get(const Ecore_Con *obj)
 {
    double ret;
-   return eo_do_ret(obj, ret, efl_network_base_uptime_get());
+   return efl_network_base_uptime_get(obj);
 }
 
 EOLIAN static double
@@ -773,7 +764,7 @@ _efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
 EAPI void
 ecore_con_server_flush(Ecore_Con *obj)
 {
-   eo_do((Ecore_Con *)obj, efl_network_base_flush());
+   efl_network_base_flush((Ecore_Con *)obj);
 }
 
 EOLIAN static void
@@ -803,7 +794,7 @@ EAPI int
 ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size));
+   return efl_network_base_send((Ecore_Con *)obj, data, size);
 }
 
 EOLIAN static int
@@ -871,7 +862,7 @@ EAPI Eina_Bool
 ecore_con_client_connected_get(const Ecore_Con *obj)
 {
    Eina_Bool ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get());
+   return efl_network_base_connected_get((Ecore_Con *)obj);
 }
 
 EOLIAN static void
@@ -885,7 +876,7 @@ _efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Dat
 EAPI void
 ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
 {
-   eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout));
+   efl_network_base_timeout_set((Ecore_Con *)obj, timeout);
 }
 
 EOLIAN static double
@@ -898,7 +889,7 @@ EAPI double
 ecore_con_client_timeout_get(const Ecore_Con *obj)
 {
    double ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get());
+   return efl_network_base_timeout_get((Ecore_Con *)obj);
 }
 
 EAPI void *
@@ -950,7 +941,7 @@ EAPI const char *
 ecore_con_client_ip_get(const Ecore_Con *obj)
 {
    const char *ret;
-   return eo_do_ret(obj, ret, efl_network_base_ip_get());
+   return efl_network_base_ip_get(obj);
 }
 
 EOLIAN static int
@@ -978,7 +969,7 @@ EAPI int
 ecore_con_client_port_get(const Ecore_Con *obj)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get());
+   return efl_network_base_port_get((Ecore_Con *)obj);
 }
 
 EOLIAN static double
@@ -991,7 +982,7 @@ EAPI double
 ecore_con_client_uptime_get(const Ecore_Con *obj)
 {
    double ret;
-   return eo_do_ret(obj, ret, efl_network_base_uptime_get());
+   return efl_network_base_uptime_get(obj);
 }
 
 EOLIAN static void
@@ -1003,14 +994,14 @@ _efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl
 EAPI void
 ecore_con_client_flush(Ecore_Con *obj)
 {
-   eo_do((Ecore_Con *)obj, efl_network_base_flush());
+   efl_network_base_flush((Ecore_Con *)obj);
 }
 
 EAPI int
 ecore_con_server_fd_get(const Ecore_Con *obj)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get());
+   return efl_network_base_fd_get((Ecore_Con *)obj);
 }
 
 EOLIAN static int
@@ -1031,7 +1022,7 @@ EAPI int
 ecore_con_client_fd_get(const Ecore_Con *obj)
 {
    int ret;
-   return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get());
+   return efl_network_base_fd_get((Ecore_Con *)obj);
 }
 
 /**
@@ -1077,7 +1068,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
    if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
    ecore_event_add(ev, e,
                    _ecore_con_event_server_add_free, NULL);
-   eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+   eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1156,7 +1147,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info));
+        eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1181,7 +1172,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
    if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
    ecore_event_add(ev, e,
                    (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
-   eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+   eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1263,7 +1254,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info));
+        eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1289,7 +1280,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
    DBG("%s", error);
    svr->event_count = eina_list_append(svr->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
-   eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error));
+   eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
@@ -1310,7 +1301,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
-   eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error));
+   eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
@@ -1397,7 +1388,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
    servers = eina_list_remove(servers, obj);
    svr->data = NULL;
 
-   eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
 end:
    return;
 }
@@ -1460,7 +1451,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
    eina_stringshare_del(cl->ip);
    cl->data = NULL;
 
-   eo_do_super(obj, EFL_NETWORK_CLIENT_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
 }
 
 static Eina_Bool
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 9720b57..800770c 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
 EOLIAN static Eo_Base *
 _ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   eo_do_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
 }
 
 EOLIAN static Eo_Base *
 _ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 
    if (!obj) return NULL;
 
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
    ecore_event_handler_del(pd->handler_del);
    ecore_event_handler_del(pd->handler_data);
 
-   eo_do_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
 }
 
 EOLIAN static Eo_Base *
 _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   obj = eo_do_super_ret(obj, ECORE_CON_EET_BASE_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    if (!obj) return NULL;
 
@@ -675,7 +675,7 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 EOLIAN static void
 _ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
 {
-   eo_do_super(obj, ECORE_CON_EET_BASE_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
 
    eet_data_descriptor_free(pd->edd);
    eet_data_descriptor_free(pd->matching);
@@ -722,8 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
 
    if (!server) return NULL;
 
-   ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL,
-                    ecore_con_eet_base_server_set(server));
+   ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server));
 
    return ece_obj;
 }
@@ -735,8 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
 
    if (!server) return NULL;
 
-   ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL,
-                    ecore_con_eet_base_server_set(server));
+   ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server));
 
    return ece_obj;
 }
@@ -750,31 +748,31 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
 EAPI void
 ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
 {
-   eo_do(ece, ecore_con_eet_base_register(name, edd));
+   ecore_con_eet_base_register(ece, name, edd);
 }
 
 EAPI void
 ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data)
 {
-   eo_do(ece, ecore_con_eet_base_data_callback_set(name, func, data));
+   ecore_con_eet_base_data_callback_set(ece, name, func, data);
 }
 
 EAPI void
 ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
 {
-   eo_do(ece, ecore_con_eet_base_data_callback_del(name));
+   ecore_con_eet_base_data_callback_del(ece, name);
 }
 
 EAPI void
 ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data)
 {
-   eo_do(ece, ecore_con_eet_base_raw_data_callback_set(name, func, data));
+   ecore_con_eet_base_raw_data_callback_set(ece, name, func, data);
 }
 
 EAPI void
 ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
 {
-   eo_do(ece, ecore_con_eet_base_raw_data_callback_del(name));
+   ecore_con_eet_base_raw_data_callback_del(ece, name);
 }
 
 EAPI void
@@ -920,7 +918,7 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
 EAPI void
 ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
 {
-   eo_do(ece,eo_key_data_set(ECORE_CON_EET_DATA_KEY, data));
+   eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
 }
 
 EAPI const void *
@@ -928,7 +926,7 @@ ecore_con_eet_data_get(Ecore_Con_Eet *ece)
 {
    const void *temp;
 
-   return eo_do_ret(ece, temp, eo_key_data_get(ECORE_CON_EET_DATA_KEY));
+   return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
 }
 
 EAPI Ecore_Con_Eet *
@@ -941,15 +939,13 @@ ecore_con_eet_reply(Ecore_Con_Reply *reply)
 EAPI void
 ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
 {
-   eo_do(reply->ece, ecore_con_eet_base_send(reply, name, value));
+   ecore_con_eet_base_send(reply->ece, reply, name, value);
 }
 
 EAPI void
 ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length)
 {
-   eo_do(reply->ece,
-         ecore_con_eet_base_raw_send(reply, protocol_name, section, value,
-                                     length));
+   ecore_con_eet_base_raw_send(reply->ece, reply, protocol_name, section, value, length);
 }
 
 #include "ecore_con_eet_base.eo.c"
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 0b84b90..fd05522 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -5,7 +5,7 @@ EAPI Eina_Bool
 ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
 {
    Eina_Bool ret;
-   eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(url));
+   ret = efl_network_url_set((Ecore_Con_Url *)obj, url);
    return ret;
 }
 
@@ -13,7 +13,7 @@ EAPI const char *
 ecore_con_url_url_get(const Ecore_Con_Url *obj)
 {
    const char * ret;
-   eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get());
+   ret = efl_network_url_get((Ecore_Con_Url *)obj);
    return ret;
 }
 
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 049d4f2..000bf4d 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -225,12 +225,9 @@ EAPI Ecore_Con_Url *
 ecore_con_url_new(const char *url)
 {
    Ecore_Con_Url *url_obj;
-   url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL,
-         efl_network_url_set(url));
+   url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eoid, url));
 
-   eo_do(url_obj,
-         eo_event_callback_array_add(efl_network_url_event_table_callbacks(),
-                                     NULL));
+   eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
 
    return url_obj;
 }
@@ -238,7 +235,7 @@ ecore_con_url_new(const char *url)
 EOLIAN static Eo *
 _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
 {
-   url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor());
+   url_obj = eo_constructor(eo_super(url_obj, MY_CLASS));
 
    if (!_init_count || !_c_init())
      {
@@ -338,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
     */
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
    _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
-   return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize());
+   return eo_finalize(eo_super(url_obj, MY_CLASS));
 }
 
 EAPI Ecore_Con_Url *
@@ -375,9 +372,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
    if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
       return;
 
-   eo_do(url_obj,
-         eo_event_callback_array_del(efl_network_url_event_table_callbacks(),
-                                     NULL));
+   eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
 
    eo_del(url_obj);
 }
@@ -400,7 +395,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
 EOLIAN static void
 _efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
 {
-   eo_do_super(url_obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(url_obj, MY_CLASS));
 
    if (!_c) return;
    if (url_con->curl_easy)
@@ -1145,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
    e.status = status;
    e.url_con = url_obj;
    url_con->event_count++;
-   eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_COMPLETE, &e));
+   eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
 }
 
 static void
@@ -1206,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
         e.size = real_size;
         e.data = buffer;
         url_con->event_count++;
-        eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_DATA, &e));
+        eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
      }
    else
      {
@@ -1265,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
    e.up.total = ultotal;
    e.up.now = ulnow;
    url_con->event_count++;
-   eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_PROGRESS, &e));
+   eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
 
    return 0;
 }