Diff between c38a2231dcd4b15fbaa5ce880f5d4ad80f05b5b3 and 7576ca81dea4ed7cdd7564fd068901649a906200

Changed Files

File Additions Deletions Status
obexd/plugins/phonebook-tracker.c +3 -3 modified
obexd/plugins/vcard.c +1 -1 modified

Full Patch

diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index 3ac1c44..8bc070f 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 4d12687..5a5bcf4 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);