diff --git a/obexd/client/session.c b/obexd/client/session.c
index 989439c..8e21da4 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
static void session_terminate_transfer(struct obc_session *session,
struct obc_transfer *transfer,
GError *gerr);
-static void transfer_progress(struct obc_transfer *transfer,
- gint64 transferred, GError *err,
- void *user_data);
+static void transfer_complete(struct obc_transfer *transfer,
+ GError *err, void *user_data);
static GQuark obex_io_error_quark(void)
{
return 0;
}
- obc_transfer_set_callback(transfer, transfer_progress, session);
+ obc_transfer_set_callback(transfer, transfer_complete, session);
p = pending_request_new(session, transfer, session_start_transfer,
func, user_data);
session_terminate_transfer(session, transfer, err);
}
-static void session_notify_progress(struct obc_session *session,
- struct obc_transfer *transfer,
- gint64 transferred)
-{
- DBG("Transfer(%p) progress: %ld bytes", transfer,
- (long int ) transferred);
-
- if (transferred == obc_transfer_get_size(transfer))
- session_notify_complete(session, transfer);
-}
-
-static void transfer_progress(struct obc_transfer *transfer,
- gint64 transferred, GError *err,
- void *user_data)
+static void transfer_complete(struct obc_transfer *transfer,
+ GError *err, void *user_data)
{
struct obc_session *session = user_data;
if (err != 0)
goto fail;
- session_notify_progress(session, transfer, transferred);
+ session_notify_complete(session, transfer);
return;
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 9eedd60..c0cb636 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
return;
if (err) {
- callback->func(transfer, transfer->transferred, err,
- callback->data);
+ callback->func(transfer, err, callback->data);
} else {
GError *abort_err;
abort_err = g_error_new(OBC_TRANSFER_ERROR, -ECANCELED, "%s",
"Transfer cancelled by user");
- callback->func(transfer, transfer->transferred, abort_err,
- callback->data);
+ callback->func(transfer, abort_err, callback->data);
g_error_free(abort_err);
}
}
gpointer user_data)
{
struct obc_transfer *transfer = user_data;
- struct transfer_callback *callback = transfer->callback;
if (transfer->fd > 0) {
gint w;
transfer->transferred += w;
}
- if (callback && transfer->transferred != transfer->size)
- callback->func(transfer, transfer->transferred, NULL,
- callback->data);
-
return TRUE;
}
}
if (callback)
- callback->func(transfer, transfer->size, err, callback->data);
+ callback->func(transfer, err, callback->data);
}
static void get_xfer_progress_first(GObex *obex, GError *err, GObexPacket *rsp,
static gssize put_xfer_progress(void *buf, gsize len, gpointer user_data)
{
struct obc_transfer *transfer = user_data;
- struct transfer_callback *callback = transfer->callback;
gssize size;
size = read(transfer->fd, buf, len);
if (size <= 0)
return size;
- if (callback)
- callback->func(transfer, transfer->transferred, NULL,
- callback->data);
-
transfer->transferred += size;
return size;
diff --git a/obexd/client/transfer.h b/obexd/client/transfer.h
index bfa166d..15c157a 100644
--- a/obexd/client/transfer.h
+++ b/obexd/client/transfer.h
struct obc_transfer;
typedef void (*transfer_callback_t) (struct obc_transfer *transfer,
- gint64 transferred, GError *err,
- void *user_data);
+ GError *err, void *user_data);
struct obc_transfer *obc_transfer_get(const char *type, const char *name,
const char *filename, GError **err);