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 | |
| 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.
| -rw-r--r-- | obexd/plugins/phonebook-tracker.c | 6 | ||||
| -rw-r--r-- | obexd/plugins/vcard.c | 2 |
2 files changed, 4 insertions, 4 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 " \ diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c index 4d126873d..5a5bcf461 100644 --- a/obexd/plugins/vcard.c +++ b/obexd/plugins/vcard.c @@ -368,7 +368,7 @@ static void vcard_printf_email(GString *vcards, uint8_t format, if (format == FORMAT_VCARD21) category_string = "INTERNET"; else if (format == FORMAT_VCARD30) - category_string = "TYPE=INTERNET"; + category_string = "TYPE=INTERNET;TYPE=OTHER"; } add_slash(field, address, LEN_MAX, len); |