diff --git a/mozilla/mailnews/absync/src/nsAbSync.cpp b/mozilla/mailnews/absync/src/nsAbSync.cpp index 2dc0e3bac1c..56dc049f4bc 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.cpp +++ b/mozilla/mailnews/absync/src/nsAbSync.cpp @@ -2416,6 +2416,14 @@ nsAbSync::AddValueToNewCard(nsIAbCard *aCard, nsString *aTagName, nsString *aTag aCard->SetCompany(aTagValue->GetUnicode()); else if (!aTagName->CompareWithConversion(kServerWebPage2Column)) aCard->SetWebPage2(aTagValue->GetUnicode()); + else if (!aTagName->CompareWithConversion(kServerCustom1Column)) + aCard->SetCustom1(aTagValue->GetUnicode()); + else if (!aTagName->CompareWithConversion(kServerCustom2Column)) + aCard->SetCustom2(aTagValue->GetUnicode()); + else if (!aTagName->CompareWithConversion(kServerCustom3Column)) + aCard->SetCustom3(aTagValue->GetUnicode()); + else if (!aTagName->CompareWithConversion(kServerCustom4Column)) + aCard->SetCustom4(aTagValue->GetUnicode()); return rv; } @@ -2454,10 +2462,6 @@ aCard->SetDisplayName(aTagValue->GetUnicode()); aCard->SetBirthYear(aTagValue->GetUnicode()); aCard->SetBirthMonth(aTagValue->GetUnicode()); aCard->SetBirthDay(aTagValue->GetUnicode()); -aCard->SetCustom1(aTagValue->GetUnicode()); -aCard->SetCustom2(aTagValue->GetUnicode()); -aCard->SetCustom3(aTagValue->GetUnicode()); -aCard->SetCustom4(aTagValue->GetUnicode()); aCard->SetLastModifiedDate(aTagValue->GetUnicode()); aCard->SetName(aTagValue->GetUnicode()); aCard->SetSendPlainText(aTagValue->GetUnicode()); @@ -2477,10 +2481,6 @@ char *kServerPlainTextColumn = "OMIT:SendPlainText"; char *kServerBirthYearColumn = "OMIT:BirthYear"; char *kServerBirthMonthColumn = "OMIT:BirthMonth"; char *kServerBirthDayColumn = "OMIT:BirthDay"; -char *kServerCustom1Column = "OMIT:Custom1"; -char *kServerCustom2Column = "OMIT:Custom2"; -char *kServerCustom3Column = "OMIT:Custom3"; -char *kServerCustom4Column = "OMIT:Custom4"; char *kServerLastModifiedDateColumn = "OMIT:LastModifiedDate"; **************/ /* So far, we aren't really doing anything with these! diff --git a/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp b/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp index cbec3a2ac3f..dd4488b3a8c 100644 --- a/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp +++ b/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp @@ -100,10 +100,10 @@ char *kServerWebPage2Column = "web_page"; char *kServerBirthYearColumn = "OMIT:BirthYear"; char *kServerBirthMonthColumn = "OMIT:BirthMonth"; char *kServerBirthDayColumn = "OMIT:BirthDay"; -char *kServerCustom1Column = "OMIT:Custom1"; -char *kServerCustom2Column = "OMIT:Custom2"; -char *kServerCustom3Column = "OMIT:Custom3"; -char *kServerCustom4Column = "OMIT:Custom4"; +char *kServerCustom1Column = "Custom_1"; +char *kServerCustom2Column = "Custom_2"; +char *kServerCustom3Column = "Custom_3"; +char *kServerCustom4Column = "Custom_4"; char *kServerNotesColumn = "addl_info"; char *kServerLastModifiedDateColumn = "OMIT:LastModifiedDate";