2010-09-03 10:21:51

by Lukasz Pawlik

Subject: [PATCH] Fix problem with phonebook size

This patch fix problem with phonebook size during phonebook
pull request. Now obexd "combine" the raw results from tracker DB
to match with that what phonebook pull returns.
---
plugins/phonebook-tracker.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index bdd9587..2bb5c4f 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -842,13 +842,11 @@ static void pull_contacts(char **reply, int num_fields, void *user_data)

data->index++;

- /* Just interested in knowing the phonebook size */
- if (!data->vcardentry && params->maxlistcount == 0)
- return;
-
last_index = params->liststartoffset + params->maxlistcount;

- if (data->index <= params->liststartoffset || data->index > last_index)
+ if ((data->index <= params->liststartoffset ||
+ data->index > last_index) &&
+ params->maxlistcount > 0)
return;

add_entry:
@@ -910,8 +908,9 @@ done:
vcards = gen_vcards(data->contacts, params);

if (num_fields == 0)
- data->cb(vcards->str, vcards->len, data->index, 0,
- data->user_data);
+ data->cb(vcards->str, vcards->len,
+ g_slist_length(data->contacts), 0,
+ data->user_data);

g_slist_free(data->contacts);
g_string_free(vcards, TRUE);
--
1.7.0.4

2010-09-06 07:02:01

by Johan Hedberg

Subject: Re: [PATCH] Fix problem with phonebook size

Hi Lukasz,

On Fri, Sep 03, 2010, Lukasz Pawlik wrote:
> This patch fix problem with phonebook size during phonebook
> pull request. Now obexd "combine" the raw results from tracker DB
> to match with that what phonebook pull returns.
> ---
> plugins/phonebook-tracker.c | 13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)

Thanks. The patch is now upstream.

Johan