Return-Path: MIME-Version: 1.0 In-Reply-To: <1413380382-3302-1-git-send-email-gowtham.ab@samsung.com> References: <1413380382-3302-1-git-send-email-gowtham.ab@samsung.com> Date: Thu, 16 Oct 2014 10:45:45 +0300 Message-ID: Subject: Re: [PBAP 1/2] obexd/client/pbap: Add support for spd,fav in PBAP From: Luiz Augusto von Dentz To: Gowtham Anandha Babu Cc: "linux-bluetooth@vger.kernel.org" , Dmitry Kasatkin , Bharat Panda , cpgs@samsung.com Content-Type: text/plain; charset=UTF-8 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi, On Wed, Oct 15, 2014 at 4:39 PM, Gowtham Anandha Babu wrote: > Add support for the speed-dial and favorite entries in PBAP. > --- > doc/obex-api.txt | 2 ++ > obexd/client/pbap.c | 10 +++++++--- > obexd/plugins/phonebook.h | 4 ++++ > 3 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/doc/obex-api.txt b/doc/obex-api.txt > index f80ef39..4439a41 100644 > --- a/doc/obex-api.txt > +++ b/doc/obex-api.txt > @@ -341,6 +341,8 @@ Methods void Select(string location, string phonebook) > "och": outgoing call history > "mch": missing call history > "cch": combination of ich och mch > + "spd": speed dials entry ( only for "internal" ) > + "fav": favorites entry ( only for "internal" ) > > Possible errors: org.bluez.obex.Error.InvalidArguments > org.bluez.obex.Error.Failed > diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c > index 2089860..614616c 100644 > --- a/obexd/client/pbap.c > +++ b/obexd/client/pbap.c > @@ -183,11 +183,13 @@ static const GMarkupParser listing_parser = { > static char *build_phonebook_path(const char *location, const char *item) > { > char *path = NULL, *tmp, *tmp1; > + int int_telecom = 0; > > if (!g_ascii_strcasecmp(location, "int") || > - !g_ascii_strcasecmp(location, "internal")) > + !g_ascii_strcasecmp(location, "internal")) { > path = g_strdup("/telecom"); > - else if (!g_ascii_strncasecmp(location, "sim", 3)) { > + int_telecom = 1; > + } else if (!g_ascii_strncasecmp(location, "sim", 3)) { > if (strlen(location) == 3) > tmp = g_strdup("sim1"); > else > @@ -202,7 +204,9 @@ static char *build_phonebook_path(const char *location, const char *item) > !g_ascii_strcasecmp(item, "ich") || > !g_ascii_strcasecmp(item, "och") || > !g_ascii_strcasecmp(item, "mch") || > - !g_ascii_strcasecmp(item, "cch")) { > + !g_ascii_strcasecmp(item, "cch") || > + (int_telecom && !g_ascii_strcasecmp(item, "spd")) || > + (int_telecom && !g_ascii_strcasecmp(item, "fav"))) { > tmp = path; > tmp1 = g_ascii_strdown(item, -1); > path = g_build_filename(tmp, tmp1, NULL); > diff --git a/obexd/plugins/phonebook.h b/obexd/plugins/phonebook.h > index fff33c1..70a9cb7 100644 > --- a/obexd/plugins/phonebook.h > +++ b/obexd/plugins/phonebook.h > @@ -37,6 +37,8 @@ > #define PB_CALLS_INCOMING_FOLDER "/telecom/ich" > #define PB_CALLS_MISSED_FOLDER "/telecom/mch" > #define PB_CALLS_OUTGOING_FOLDER "/telecom/och" > +#define PB_CALLS_SPEEDDIAL_FOLDER "/telecom/spd" > +#define PB_CALLS_FAVORITE_FOLDER "/telecom/fav" > #define PB_LUID_FOLDER "/telecom/pb/luid" > > #define PB_CONTACTS "/telecom/pb.vcf" > @@ -44,6 +46,8 @@ > #define PB_CALLS_INCOMING "/telecom/ich.vcf" > #define PB_CALLS_MISSED "/telecom/mch.vcf" > #define PB_CALLS_OUTGOING "/telecom/och.vcf" > +#define PB_CALLS_SPEEDDIAL "/telecom/spd.vcf" > +#define PB_CALLS_FAVORITE "/telecom/fav.vcf" > #define PB_DEVINFO "/telecom/devinfo.txt" > #define PB_INFO_LOG "/telecom/pb/info.log" > #define PB_CC_LOG "/telecom/pb/luid/cc.log" > -- > 1.9.1 Applied, please make sure you following the 50/72 format for commits, it is documented in the HACKING document and I would like that we stay consistent with it. -- Luiz Augusto von Dentz