commit 085e40429e9b13ed556ff9868f289247b3c05250
parent e99c6ed2e73ec5facfdf493702dd1254d9168d15
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Fri, 19 Oct 2012 16:29:32 -0600
main: use properly typed callbacks for ecore_con handlers
Diffstat:
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -279,8 +279,9 @@ setup_main_callbacks(App_Data *ad, const char *cookie_path)
static Eina_Bool
-_client_add(void *data, int type, Ecore_Con_Event_Server_Add *ev)
+_client_add(void *data, int type, void *event_info)
{
+ Ecore_Con_Event_Server_Add *ev = event_info;
char *url = data;
ecore_con_server_send(ev->server, url, strlen(url));
@@ -291,8 +292,9 @@ _client_add(void *data, int type, Ecore_Con_Event_Server_Add *ev)
}
static Eina_Bool
-_client_del(void *data, int type, Ecore_Con_Event_Server_Del *ev)
+_client_del(void *data, int type, void *event_info)
{
+ Ecore_Con_Event_Server_Del *ev = event_info;
if (!ev->server)
{
printf("Failed to establish connection to the server.\nExiting.\n");
@@ -307,8 +309,9 @@ _client_del(void *data, int type, Ecore_Con_Event_Server_Del *ev)
}
static Eina_Bool
-_server_data(void *data, int type, Ecore_Con_Event_Client_Data *ev)
+_server_data(void *data, int type, void *event_info)
{
+ Ecore_Con_Event_Client_Data *ev = event_info;
char *uri = ev->data;
App_Data *ad = data;
@@ -319,8 +322,10 @@ _server_data(void *data, int type, Ecore_Con_Event_Client_Data *ev)
}
static Eina_Bool
-_server_del(void *data, int type, Ecore_Con_Event_Client_Del *ev)
+_server_del(void *data, int type, void *event_info)
{
+ Ecore_Con_Event_Client_Del *ev = event_info;
+
if (!ev->client)
return ECORE_CALLBACK_RENEW;
@@ -365,10 +370,8 @@ elm_main(int argc, char *argv[])
if (!uri)
uri = DEFAULT_URL;
- ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
- (Ecore_Event_Handler_Cb)_client_add, uri);
- ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
- (Ecore_Event_Handler_Cb)_client_del, uri);
+ ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _client_add, uri);
+ ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _client_del, uri);
ecore_main_loop_begin();
ecore_con_shutdown();
@@ -449,10 +452,8 @@ elm_main(int argc, char *argv[])
exit(1);
}
- ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL,
- (Ecore_Event_Handler_Cb)_server_del, ad);
- ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
- (Ecore_Event_Handler_Cb)_server_data, ad);
+ ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL, _server_del, ad);
+ ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA, _server_data, ad);
ecore_con_server_timeout_set(svr, 10);
// ecore_con_server_client_limit_set(svr, 3, 0);