--- barry/opensync-plugin/src/vcard.cc 2008-11-06 15:15:57.000000000 -0800 +++ barry/opensync-plugin/src/vcard.cc.new 2008-11-06 15:18:15.000000000 -0800 @@ -195,14 +195,14 @@ // add all applicable phone numbers... there can be multiple // TEL fields, even with the same TYPE value... therefore, the // second TEL field with a TYPE=work, will be stored in WorkPhone2 - AddPhoneCond("pref", con.Phone); - AddPhoneCond("fax", con.Fax); - AddPhoneCond("work", con.WorkPhone); - AddPhoneCond("work", con.WorkPhone2); - AddPhoneCond("home", con.HomePhone); - AddPhoneCond("home", con.HomePhone2); - AddPhoneCond("cell", con.MobilePhone); - AddPhoneCond("pager", con.Pager); + AddPhoneCond("PREF", con.Phone); + AddPhoneCond("FAX", con.Fax); + AddPhoneCond("WORK", con.WorkPhone); + AddPhoneCond("WORK", con.WorkPhone2); + AddPhoneCond("HOME", con.HomePhone); + AddPhoneCond("HOME", con.HomePhone2); + AddPhoneCond("CELL", con.MobilePhone); + AddPhoneCond("PAGER", con.Pager); AddPhoneCond(con.OtherPhone); // add all email addresses, marking first one as "pref"