[PATCH obexd 1/2] PBAP/Tracker: Fix wrong results field reference

[PATCH obexd 1/2] PBAP/Tracker: Fix wrong results field reference

[Slawomir Bochenski]

The field passed for a phone number was actually a nickname field.
---
 plugins/phonebook-tracker.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index da82ff5..d358c9f 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -1409,10 +1409,10 @@ static int add_to_cache(const char **reply, int num_fields, void *user_data)
 	/* The owner vCard must have the 0 handle */
 	if (strcmp(reply[0], TRACKER_DEFAULT_CONTACT_ME) == 0)
 		data->entry_cb(reply[0], 0, formatted, "",
-						reply[6], data->user_data);
+						reply[7], data->user_data);
 	else
 		data->entry_cb(reply[0], PHONEBOOK_INVALID_HANDLE, formatted,
-					"", reply[6], data->user_data);
+					"", reply[7], data->user_data);
 
 	g_free(formatted);
 
-- 
1.7.4.1

[PATCH obexd 2/2] PBAP/Tracker: Fix searching vCards by phone number

[Slawomir Bochenski]

Originally only one of contact's phone numbers was stored in cache,
rendering searching by phone numbers not fully functional.
---
 plugins/phonebook-tracker.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index d358c9f..7ac02f6 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -167,7 +167,7 @@
 			"} "						\
 		"} "							\
 	") "								\
-	"nco:phoneNumber(?h) "						\
+	"GROUP_CONCAT(nco:phoneNumber(?h), \"" MAIN_DELIM "\") "	\
 	"WHERE { "							\
 		"?c a nco:PersonContact . "				\
 	"OPTIONAL { ?c nco:hasPhoneNumber ?h . } "			\
-- 
1.7.4.1