From 53d8602690748218c1e1ca407dd9e8c92f6b8061 Mon Sep 17 00:00:00 2001
From: "rhp%netscape.com" <rhp%netscape.com>
Date: Mon, 15 May 2000 05:32:20 +0000
Subject: [PATCH] NOT PART OF THE BUILD

---
 mailnews/absync/src/nsABSyncDriver.cpp     |  2 +-
 mailnews/absync/src/nsAbSync.cpp           | 12 ++++++------
 mailnews/absync/src/nsAbSyncPostEngine.cpp |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mailnews/absync/src/nsABSyncDriver.cpp b/mailnews/absync/src/nsABSyncDriver.cpp
index 4285a975da6c..6f5782132cbd 100644
--- a/mailnews/absync/src/nsABSyncDriver.cpp
+++ b/mailnews/absync/src/nsABSyncDriver.cpp
@@ -59,7 +59,7 @@ nsAbSyncDriver::OnStartAuthOperation(void)
     PRUnichar   *outValue = nsnull;
 
     // Tweak the button...
-    mStatus->StopMeteors();
+    mStatus->StartMeteors();
 
     outValue = GetString(NS_ConvertASCIItoUCS2("syncStartingAuth").GetUnicode());
     
diff --git a/mailnews/absync/src/nsAbSync.cpp b/mailnews/absync/src/nsAbSync.cpp
index be6cc992d980..47020975b4b0 100644
--- a/mailnews/absync/src/nsAbSync.cpp
+++ b/mailnews/absync/src/nsAbSync.cpp
@@ -469,12 +469,12 @@ NS_IMETHODIMP nsAbSync::OnStatus(PRInt32 aTransactionID, const PRUnichar *aMsg)
 /* void OnStopOperation (in PRInt32 aTransactionID, in nsresult aStatus, in wstring aMsg, out string aProtocolResponse); */
 NS_IMETHODIMP nsAbSync::OnStopOperation(PRInt32 aTransactionID, nsresult aStatus, const PRUnichar *aMsg, const char *aProtocolResponse)
 {
-  nsresult    rv;
+  nsresult    rv = aStatus;
 
   //
   // Now, figure out what the server told us to do with the sync operation.
   //
-  if (aProtocolResponse)
+  if ( (aProtocolResponse) && (NS_SUCCEEDED(aStatus)) )
     rv = ProcessServerResponse(aProtocolResponse);
 
   NotifyListenersOnStopSync(aTransactionID, rv, aMsg);
@@ -591,11 +591,11 @@ NS_IMETHODIMP nsAbSync::PerformAbSync(PRInt32 *aTransactionID)
 
   // Ok, add the header to this protocol string information...
   if (mPostString.IsEmpty())
-    prefixStr = PR_smprintf("last=%u&protocol=%d&client=2&ver=%s&user=%s", 
-                            mLastChangeNum, ABSYNC_PROTOCOL, ABSYNC_VERSION, "RHPizzarro");
+    prefixStr = PR_smprintf("last=%u&protocol=%d&client=2&ver=%s", 
+                            mLastChangeNum, ABSYNC_PROTOCOL, ABSYNC_VERSION);
   else
-    prefixStr = PR_smprintf("last=%u&protocol=%d&client=2&ver=%s&user=%s&", 
-                            mLastChangeNum, ABSYNC_PROTOCOL, ABSYNC_VERSION, "RHPizzarro");
+    prefixStr = PR_smprintf("last=%u&protocol=%d&client=2&ver=%s&", 
+                            mLastChangeNum, ABSYNC_PROTOCOL, ABSYNC_VERSION);
   if (!prefixStr)
   {
     rv = NS_ERROR_OUT_OF_MEMORY;
diff --git a/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mailnews/absync/src/nsAbSyncPostEngine.cpp
index f198cdfd5edc..b49bd305dd82 100644
--- a/mailnews/absync/src/nsAbSyncPostEngine.cpp
+++ b/mailnews/absync/src/nsAbSyncPostEngine.cpp
@@ -101,6 +101,7 @@ nsAbSyncPostEngine::nsAbSyncPostEngine()
   mAuthenticationRunning = PR_TRUE;
   mCookie = nsnull;
   mSyncSpec = nsnull;
+  mSyncProtocolRequest = nsnull;
 }
 
 nsAbSyncPostEngine::~nsAbSyncPostEngine()