diff --git a/obexd/client/session.c b/obexd/client/session.c
index b9c37a1..e277fa0 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
NULL);
}
-static gboolean session_request(struct obc_session *session,
+static guint session_request(struct obc_session *session,
struct obc_transfer *transfer,
session_callback_t func,
void *data, GError **err)
func, data);
if (session->p) {
g_queue_push_tail(session->queue, p);
- return TRUE;
+ return p->id;
}
perr = pending_request_auth(p);
if (perr < 0) {
g_set_error(err, OBEX_IO_ERROR, perr, "Authorization failed");
pending_request_free(p);
- return FALSE;
+ return 0;
}
session->p = p;
- return TRUE;
+ return p->id;
}
static void session_process_queue(struct obc_session *session)
DBG("Transfer(%p) started", transfer);
}
-gboolean obc_session_get(struct obc_session *session, const char *type,
+guint obc_session_get(struct obc_session *session, const char *type,
const char *name, const char *targetfile,
const guint8 *apparam, gint apparam_size,
session_callback_t func, void *user_data,
if (session->obex == NULL) {
g_set_error(err, OBEX_IO_ERROR, -ENOTCONN,
"Session not connected");
- return FALSE;
+ return 0;
}
if (apparam != NULL) {
g_free(params->data);
g_free(params);
}
- return FALSE;
+ return 0;
}
return session_request(session, transfer, func, user_data, err);
}
-gboolean obc_session_send(struct obc_session *session, const char *filename,
+guint obc_session_send(struct obc_session *session, const char *filename,
const char *name, GError **err)
{
struct obc_transfer *transfer;
if (session->obex == NULL) {
g_set_error(err, OBEX_IO_ERROR, -ENOTCONN,
"Session not connected");
- return FALSE;
+ return 0;
}
agent = obc_agent_get_name(session->agent);
transfer = obc_transfer_put(session->conn, agent, filename, name,
NULL, NULL, 0, NULL, err);
if (transfer == NULL)
- return FALSE;
+ return 0;
return session_request(session, transfer, NULL, NULL, err);
}
-gboolean obc_session_pull(struct obc_session *session,
+guint obc_session_pull(struct obc_session *session,
const char *type, const char *targetfile,
session_callback_t function, void *user_data,
GError **err)
return NULL;
}
-gboolean obc_session_put(struct obc_session *session, const char *contents,
+guint obc_session_put(struct obc_session *session, const char *contents,
size_t size, const char *name, GError **err)
{
struct obc_transfer *transfer;
if (session->obex == NULL) {
g_set_error(err, OBEX_IO_ERROR, -ENOTCONN,
"Session not connected");
- return FALSE;
+ return 0;
}
agent = obc_agent_get_name(session->agent);
transfer = obc_transfer_put(session->conn, agent, NULL, name, NULL,
contents, size, NULL, err);
if (transfer == NULL)
- return FALSE;
+ return 0;
return session_request(session, transfer, NULL, NULL, err);
}
diff --git a/obexd/client/session.h b/obexd/client/session.h
index a0ee321..c443392 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
size_t *size);
void *obc_session_get_params(struct obc_session *session, size_t *size);
-gboolean obc_session_send(struct obc_session *session, const char *filename,
+guint obc_session_send(struct obc_session *session, const char *filename,
const char *name, GError **err);
-gboolean obc_session_get(struct obc_session *session, const char *type,
+guint obc_session_get(struct obc_session *session, const char *type,
const char *name, const char *targetfile,
const guint8 *apparam, gint apparam_size,
session_callback_t func, void *user_data,
GError **err);
-gboolean obc_session_pull(struct obc_session *session,
+guint obc_session_pull(struct obc_session *session,
const char *type, const char *targetfile,
session_callback_t function, void *user_data,
GError **err);
const char *obc_session_register(struct obc_session *session,
GDBusDestroyFunction destroy);
-gboolean obc_session_put(struct obc_session *session, const char *contents,
+guint obc_session_put(struct obc_session *session, const char *contents,
size_t size, const char *name, GError **err);
guint obc_session_setpath(struct obc_session *session, const char *path,