From 22edcd6531b04bb9a815d01092f3a83e0549de9b Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 17 Aug 2010 16:58:30 +0300 Subject: [PATCH] obexd: fix misuse of OBEX_SetCustomData/OBEX_GetCustomData Those function should only be used in case of custom transport which is not the case since we are using fd transport here. To fix that it now uses OBEX_SetUserData/OBEX_GetUserData which are not associate with any transport in particular. --- obexd/gwobex/gw-obex.c | 2 +- obexd/gwobex/obex-priv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obexd/gwobex/gw-obex.c b/obexd/gwobex/gw-obex.c index e65669296..448121275 100644 --- a/obexd/gwobex/gw-obex.c +++ b/obexd/gwobex/gw-obex.c @@ -343,7 +343,7 @@ GwObex *gw_obex_setup_fd(int fd, const gchar *uuid, gint uuid_len, ctx->mutex = g_mutex_new(); #endif - OBEX_SetCustomData(handle, ctx); + OBEX_SetUserData(handle, ctx); debug("Connecting to OBEX service\n"); if (!gw_obex_connect(ctx, uuid, uuid_len)) { diff --git a/obexd/gwobex/obex-priv.c b/obexd/gwobex/obex-priv.c index 76a95996b..aba7dd7a8 100644 --- a/obexd/gwobex/obex-priv.c +++ b/obexd/gwobex/obex-priv.c @@ -514,7 +514,7 @@ static void obex_writestream(GwObex *ctx, obex_object_t *object) { static void obex_event_handler(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp) { - GwObex *ctx = OBEX_GetCustomData(handle); + GwObex *ctx = OBEX_GetUserData(handle); switch (event) { case OBEX_EV_ABORT: debug("OBEX_EV_ABORT\n"); -- 2.47.3