Fix pull phonebook with non-zero offset parameter
PATCH v2 1/1 Fix pull phonebook with non-zero offset parameter
For non-zero liststartoffset parameter, contacts which index was before offset were indexed more than once (e.g. when contact had more than one phone number or address etc.), so pulling was started earlier - before offset index was reached. This patch fix this problem and each contact is indexed only once.
--- plugins/phonebook-tracker.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
plugins/phonebook-tracker.c +8 -1
@@ -1361,6 +1361,7 @@ static void pull_contacts(char **reply, int num_fields, void *user_data)int last_index, i;gboolean cdata_present = FALSE;char *home_addr, *work_addr, *other_addr; +static char *temp_id =NULL ;if (num_fields <0 ) { data->cb (NULL ,0 , num_fields,0 , data->user_data);
@@ -1396,7 +1397,11 @@ static void pull_contacts(char **reply, int num_fields, void *user_data) TRACKER_DEFAULT_CONTACT_ME))return ; - data->index++; +if (g_strcmp0 (temp_id, reply[CONTACTS_ID_COL ])) { + data->index++; +g_free (temp_id); + temp_id =g_strdup (reply[CONTACTS_ID_COL ]); + } last_index = params->liststartoffset + params->maxlistcount;
@@ -1495,6 +1500,8 @@ done: fail:g_slist_free (data->contacts);g_free (data); +g_free (temp_id); + temp_id =NULL ; }static void add_to_cache (char **reply,int num_fields,void *user_data)
Signature · 1 line
1.6.3.3
Hi Rafal,
Quoted 8 lines · Rafal Michalski
For non-zero liststartoffset parameter, contacts which index was before offset were indexed more than once (e.g. when contact had more than one phone number or address etc.), so pulling was started earlier - before offset index was reached. This patch fix this problem and each contact is indexed only once.
--- plugins/phonebook-tracker.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
Pushed upstream. Thanks.
Johan