From 1945cffc16dcc29b0661478cb9d35f1880a247a2 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 20 Dec 2012 20:16:14 +0200 Subject: [PATCH] obex-client: Rename org.bluez.obex.ObjectPush to org.bluez.obex.ObjectPush1 Rename the interface and move it to obexd-api.txt since it now belongs to the same daemon. --- doc/obex-client-api.txt | 50 ----------------------------------------- doc/obexd-api.txt | 50 +++++++++++++++++++++++++++++++++++++++++ obexd/client/opp.c | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/doc/obex-client-api.txt b/doc/obex-client-api.txt index 63aff1a4f..c292323e1 100644 --- a/doc/obex-client-api.txt +++ b/doc/obex-client-api.txt @@ -4,56 +4,6 @@ OBEX client API description Copyright (C) 2007-2010 Marcel Holtmann Copyright (C) 2011-2012 BMW Car IT GmbH. All rights reserved. -Object Push hierarchy -===================== - -Service org.bluez.obex -Interface org.bluez.obex.ObjectPush -Object path [variable prefix]/{session0,session1,...} - -Methods object, dict SendFile(string sourcefile) - - Send one local file to the remote device. - - The returned path represents the newly created transfer, - which should be used to find out if the content has been - successfully transferred or if the operation fails. - - The properties of this transfer are also returned along - with the object path, to avoid a call to GetProperties. - - object, dict PullBusinessCard(string targetfile) - - Request the business card from a remote device and - store it in the local file. - - If an empty target file is given, a name will be - automatically calculated for the temporary file. - - The returned path represents the newly created transfer, - which should be used to find out if the content has been - successfully transferred or if the operation fails. - - The properties of this transfer are also returned along - with the object path, to avoid a call to GetProperties. - - object, dict ExchangeBusinessCards(string clientfile, - string targetfile) - - Push the client's business card to the remote device - and then retrieve the remote business card and store - it in a local file. - - If an empty target file is given, a name will be - automatically calculated for the temporary file. - - The returned path represents the newly created transfer, - which should be used to find out if the content has been - successfully transferred or if the operation fails. - - The properties of this transfer are also returned along - with the object path, to avoid a call to GetProperties. - File Transfer hierarchy ======================= diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt index 502d1ce3e..3cded1ff0 100644 --- a/doc/obexd-api.txt +++ b/doc/obexd-api.txt @@ -125,3 +125,53 @@ Properties string Status [readonly] Number of bytes transferred. For queued transfers, this value will not be present. + +Object Push hierarchy +===================== + +Service org.bluez.obex +Interface org.bluez.obex.ObjectPush1 +Object path /org/bluez/obex/session{0, 1, 2, ...} + +Methods object, dict SendFile(string sourcefile) + + Send one local file to the remote device. + + The returned path represents the newly created transfer, + which should be used to find out if the content has been + successfully transferred or if the operation fails. + + The properties of this transfer are also returned along + with the object path, to avoid a call to GetProperties. + + object, dict PullBusinessCard(string targetfile) + + Request the business card from a remote device and + store it in the local file. + + If an empty target file is given, a name will be + automatically calculated for the temporary file. + + The returned path represents the newly created transfer, + which should be used to find out if the content has been + successfully transferred or if the operation fails. + + The properties of this transfer are also returned along + with the object path, to avoid a call to GetProperties. + + object, dict ExchangeBusinessCards(string clientfile, + string targetfile) + + Push the client's business card to the remote device + and then retrieve the remote business card and store + it in a local file. + + If an empty target file is given, a name will be + automatically calculated for the temporary file. + + The returned path represents the newly created transfer, + which should be used to find out if the content has been + successfully transferred or if the operation fails. + + The properties of this transfer are also returned along + with the object path, to avoid a call to GetProperties. diff --git a/obexd/client/opp.c b/obexd/client/opp.c index 773092a5a..d6fd1c617 100644 --- a/obexd/client/opp.c +++ b/obexd/client/opp.c @@ -36,7 +36,7 @@ #include "opp.h" #define OPP_UUID "00001105-0000-1000-8000-00805f9b34fb" -#define OPP_INTERFACE "org.bluez.obex.ObjectPush" +#define OPP_INTERFACE "org.bluez.obex.ObjectPush1" #define ERROR_INTERFACE "org.bluez.obex.Error" struct opp_data { -- 2.47.3