forked from enlightenment/efl
efl_net: resolve cases where we passed something as event_info
Summary: but the event was annotated to *not* contain any event_info. Reviewers: cedric, segfaultxavi, zmike Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8411
This commit is contained in:
parent
bb0290edbe
commit
06863ac18e
|
@ -29,33 +29,6 @@ typedef struct
|
|||
|
||||
#define MY_CLASS EFL_NET_DIALER_SIMPLE_CLASS
|
||||
|
||||
static void
|
||||
_efl_net_dialer_simple_inner_io_resolved(void *data, const Efl_Event *event)
|
||||
{
|
||||
Eo *o = data;
|
||||
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, event->info);
|
||||
}
|
||||
|
||||
static void
|
||||
_efl_net_dialer_simple_inner_io_error(void *data, const Efl_Event *event)
|
||||
{
|
||||
Eo *o = data;
|
||||
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, event->info);
|
||||
}
|
||||
|
||||
static void
|
||||
_efl_net_dialer_simple_inner_io_connected(void *data, const Efl_Event *event)
|
||||
{
|
||||
Eo *o = data;
|
||||
|
||||
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, event->info);
|
||||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_simple_inner_io_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _efl_net_dialer_simple_inner_io_resolved },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_ERROR, _efl_net_dialer_simple_inner_io_error },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _efl_net_dialer_simple_inner_io_connected });
|
||||
|
||||
EOLIAN static Efl_Object *
|
||||
_efl_net_dialer_simple_efl_object_finalize(Eo *o, Efl_Net_Dialer_Simple_Data *pd)
|
||||
{
|
||||
|
@ -94,7 +67,9 @@ _efl_net_dialer_simple_efl_object_invalidate(Eo *o, Efl_Net_Dialer_Simple_Data *
|
|||
inner_io = efl_io_buffered_stream_inner_io_get(o);
|
||||
if (inner_io)
|
||||
{
|
||||
efl_event_callback_array_del(inner_io, _efl_net_dialer_simple_inner_io_cbs(), o);
|
||||
efl_event_callback_forwarder_del(inner_io, EFL_NET_DIALER_EVENT_DIALER_ERROR, o);
|
||||
efl_event_callback_forwarder_del(inner_io, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, o);
|
||||
efl_event_callback_forwarder_del(inner_io, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, o);
|
||||
if (efl_parent_get(inner_io) == o)
|
||||
efl_parent_set(inner_io, NULL);
|
||||
}
|
||||
|
@ -122,8 +97,9 @@ _efl_net_dialer_simple_efl_io_buffered_stream_inner_io_set(Eo *o, Efl_Net_Dialer
|
|||
{
|
||||
EINA_SAFETY_ON_FALSE_RETURN(efl_isa(io, EFL_NET_DIALER_INTERFACE));
|
||||
efl_io_buffered_stream_inner_io_set(efl_super(o, MY_CLASS), io);
|
||||
efl_event_callback_array_add(io, _efl_net_dialer_simple_inner_io_cbs(), o);
|
||||
|
||||
efl_event_callback_forwarder_add(io, EFL_NET_DIALER_EVENT_DIALER_ERROR, o);
|
||||
efl_event_callback_forwarder_add(io, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, o);
|
||||
efl_event_callback_forwarder_add(io, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, o);
|
||||
/* apply pending dialer values */
|
||||
if (pd->pending.proxy_url)
|
||||
{
|
||||
|
|
|
@ -113,10 +113,10 @@ _efl_net_server_simple_inner_server_error(void *data, const Efl_Event *event)
|
|||
}
|
||||
|
||||
static void
|
||||
_efl_net_server_simple_inner_server_serving(void *data, const Efl_Event *event)
|
||||
_efl_net_server_simple_inner_server_serving(void *data, const Efl_Event *event EINA_UNUSED)
|
||||
{
|
||||
Eo *o = data;
|
||||
efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVING, event->info);
|
||||
efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL);
|
||||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_server_simple_inner_server_cbs,
|
||||
|
|
Loading…
Reference in New Issue