Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for data loss in AB Sync operation - Bug #: 1495 - r: bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@74761 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhp%netscape.com
2000-07-25 21:19:01 +00:00
parent b633e91fc6
commit 5da15cf4e2
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/mailnews/absync/src/nsAbSync.cpp
View File

@@ -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!

8
mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp
View File

@@ -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";