diff options
| author | Bartosz Szatkowski <bulislaw@linux.com> | 2011-08-05 13:01:30 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-04 22:48:41 +0100 |
| commit | 7576ca81dea4ed7cdd7564fd068901649a906200 (patch) | |
| tree | 3df85e22ad2aaab4714803a20b90a0ae21c6a171 /obexd/plugins/phonebook-tracker.c | |
| parent | c38a2231dcd4b15fbaa5ce880f5d4ad80f05b5b3 (diff) | |
| download | bluez-7576ca81dea4ed7cdd7564fd068901649a906200.tar.gz | |
obexd: Fix handling vCard type "OTHER" emails in PBAP
Until now contacts with emails, without type specified, were not included
in vCards. Also default type for vCard 3.0 is set to "OTHER" - not
empty field as it is in vCard 2.1.
Diffstat (limited to 'obexd/plugins/phonebook-tracker.c')
| -rw-r--r-- | obexd/plugins/phonebook-tracker.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index 3ac1c4410..8bc070f14 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -129,7 +129,7 @@ "nco:fullname(nco:org(?_role))" \ "nco:department(?_role) " \ "(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \ - "rdfs:label(?_role))," \ + "tracker:coalesce(rdfs:label(?_role), \"\"))," \ "\"\30\") " \ "WHERE { " \ "?_role nco:hasEmailAddress " \ @@ -241,7 +241,7 @@ CALLS_CONSTRAINTS(CONSTRAINT) \ "nco:fullname(nco:org(?_role)) " \ "nco:department(?_role) " \ "(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \ - "rdfs:label(?c_role))," \ + "tracker:coalesce(rdfs:label(?c_role), \"\"))," \ "\"\30\") " \ "WHERE { " \ "?_contact nco:hasAffiliation ?c_role . " \ @@ -334,7 +334,7 @@ COMBINED_CONSTRAINT \ "nco:fullname(nco:org(?_role))" \ "nco:department(?_role) " \ "(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \ - "rdfs:label(?_role))," \ + "tracker:coalesce(rdfs:label(?_role), \"\"))," \ "\"\30\") " \ "WHERE { " \ "?_role nco:hasEmailAddress " \ |