From 67ad4a69a2ff038f952d54e874aeb1968f66506c Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 5 Jul 2011 13:16:35 +0300 Subject: [PATCH] gobex: Rename GObexDisconnectFunc to simply GObexFunc --- gobex/gobex.c | 4 ++-- gobex/gobex.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gobex/gobex.c b/gobex/gobex.c index dd3f5b323..bf3ca644a 100644 --- a/gobex/gobex.c +++ b/gobex/gobex.c @@ -65,7 +65,7 @@ struct _GObex { GObexRequestFunc req_func; gpointer req_func_data; - GObexDisconnectFunc disconn_func; + GObexFunc disconn_func; gpointer disconn_func_data; struct pending_pkt *pending_req; @@ -431,7 +431,7 @@ void g_obex_set_request_function(GObex *obex, GObexRequestFunc func, obex->req_func_data = user_data; } -void g_obex_set_disconnect_function(GObex *obex, GObexDisconnectFunc func, +void g_obex_set_disconnect_function(GObex *obex, GObexFunc func, gpointer user_data) { obex->disconn_func = func; diff --git a/gobex/gobex.h b/gobex/gobex.h index 34ca4bf4b..800b30d8f 100644 --- a/gobex/gobex.h +++ b/gobex/gobex.h @@ -33,10 +33,9 @@ typedef enum { typedef struct _GObex GObex; +typedef void (*GObexFunc) (GObex *obex, GError *err, gpointer user_data); typedef void (*GObexRequestFunc) (GObex *obex, GObexPacket *req, gpointer user_data); -typedef void (*GObexDisconnectFunc) (GObex *obex, GError *err, - gpointer user_data); typedef void (*GObexResponseFunc) (GObex *obex, GError *err, GObexPacket *rsp, gpointer user_data); @@ -50,7 +49,7 @@ gboolean g_obex_cancel_req(GObex *obex, guint req_id, void g_obex_set_request_function(GObex *obex, GObexRequestFunc func, gpointer user_data); -void g_obex_set_disconnect_function(GObex *obex, GObexDisconnectFunc func, +void g_obex_set_disconnect_function(GObex *obex, GObexFunc func, gpointer user_data); GObex *g_obex_new(GIOChannel *io, GObexTransportType transport_type, -- 2.47.3