diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp index f8ca8aa8c79..6e07cb0bfb3 100644 --- a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp +++ b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp @@ -115,6 +115,7 @@ NS_IMETHODIMP nsAbSyncDriver::OnStartOperation(PRInt32 aTransactionID, PRUint32 msgValue = nsTextFormatter::smprintf(outValue, aMsgSize); mStatus->ShowStatusString(msgValue); + PR_FREEIF(outValue); PR_FREEIF(msgValue); } @@ -144,7 +145,7 @@ NS_IMETHODIMP nsAbSyncDriver::OnProgress(PRInt32 aTransactionID, PRUint32 aProgr /* void OnStatus (in PRInt32 aTransactionID, in wstring aMsg); */ NS_IMETHODIMP nsAbSyncDriver::OnStatus(PRInt32 aTransactionID, const PRUnichar *aMsg) { - return NS_ERROR_NOT_IMPLEMENTED; + return mStatus->ShowStatusString(aMsg); } /* void OnStopOperation (in PRInt32 aTransactionID, in nsresult aStatus, in wstring aMsg); */ diff --git a/mozilla/mailnews/absync/src/nsAbSync.cpp b/mozilla/mailnews/absync/src/nsAbSync.cpp index 35ec3c3c9ad..3a2bedf9036 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.cpp +++ b/mozilla/mailnews/absync/src/nsAbSync.cpp @@ -2346,6 +2346,9 @@ nsAbSync::AddValueToNewCard(nsIAbCard *aCard, nsString *aTagName, nsString *aTag aCard->SetLastName(aTagValue->GetUnicode()); if (!aTagName->CompareWithConversion(kServerDisplayNameColumn)) + aCard->SetDisplayName(aTagValue->GetUnicode()); + + if (!aTagName->CompareWithConversion(kServerNicknameColumn)) aCard->SetNickName(aTagValue->GetUnicode()); if (!aTagName->CompareWithConversion(kServerPriEmailColumn)) diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp index ecf6f02b407..76c6ab48b18 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -499,6 +499,15 @@ nsAbSyncPostEngine::OnStopRequest(nsIChannel *aChannel, nsISupports * /* ctxt */ KickTheSyncOperation(); } } + + // RICHIE - Special here to show the server we are hitting! + // RICHIE - REMOVE THIS BEFORE SHIPPING!!!! + PRUnichar *msgValue = nsnull; + msgValue = nsTextFormatter::smprintf(nsString(NS_ConvertASCIItoUCS2("Server: %s - port %d")).GetUnicode(), + mMojoSyncSpec, mMojoSyncPort); + NotifyListenersOnStatus(mTransactionID, msgValue); + PR_FREEIF(msgValue); + // RICHIE } else { diff --git a/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp b/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp index 49f7d0e18a5..8d712551795 100644 --- a/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp +++ b/mozilla/mailnews/absync/src/nsSyncDecoderRing.cpp @@ -70,8 +70,8 @@ char *kLastModifiedDateColumn = "LastModifiedDate"; // Server record fields! char *kServerFirstNameColumn = "fname"; char *kServerLastNameColumn = "lname"; -char *kServerDisplayNameColumn = "screen_name"; -char *kServerNicknameColumn = "OMIT:NickName"; +char *kServerDisplayNameColumn = "Display_name"; +char *kServerNicknameColumn = "nick_name"; char *kServerPriEmailColumn = "email1"; char *kServer2ndEmailColumn = "email2"; char *kServerPlainTextColumn = "OMIT:SendPlainText";