gobex: Remove disconn callback in favor of generic event callback

1 files changed, 2 insertions, 6 deletions

diff --git a/gobex/gobex.h b/gobex/gobex.h
index d074698f2..59cec801b 100644
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -33,11 +33,10 @@ typedef enum {
 
 typedef struct _GObex GObex;
 
-typedef void (*GObexRequestFunc) (GObex *obex, GObexPacket *req,
+typedef void (*GObexEventFunc) (GObex *obex, GError *err, GObexPacket *req,
 							gpointer user_data);
 typedef void (*GObexResponseFunc) (GObex *obex, GError *err, GObexPacket *rsp,
 							gpointer user_data);
-typedef void (*GObexDisconnectFunc) (GObex *obex, gpointer user_data);
 
 gboolean g_obex_send(GObex *obex, GObexPacket *pkt, GError **err);
 
@@ -46,10 +45,7 @@ guint g_obex_send_req(GObex *obex, GObexPacket *req, gint timeout,
 			GError **err);
 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_event_function(GObex *obex, GObexEventFunc func,
 							gpointer user_data);
 
 GObex *g_obex_new(GIOChannel *io, GObexTransportType transport_type);