From 3743887e262eccbb035634b31939c3786a2d88ae Mon Sep 17 00:00:00 2001
From: "bienvenu%netscape.com"
 <bienvenu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 23 Nov 2002 18:48:10 +0000
Subject: [PATCH] fix duplicate folder name in filter log, r/sr=sspitzer

git-svn-id: svn://10.0.0.236/trunk@134368 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/search/src/nsMsgFilter.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
index d741ebe550e..3a69bdc3228 100644
--- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
@@ -359,7 +359,6 @@ NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction, nsIMsgDBH
     PRTime date;
     char dateStr[40];	/* 30 probably not enough */
     nsMsgRuleActionType actionType;
-    nsXPIDLCString actionFolderUri;
     
     nsXPIDLCString author;
     nsXPIDLCString subject;
@@ -395,6 +394,7 @@ NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction, nsIMsgDBH
     buffer +=  " ";
         
     if (actionType == nsMsgFilterAction::MoveToFolder) {
+      nsXPIDLCString actionFolderUri;
       aFilterAction->GetTargetFolderUri(getter_Copies(actionFolderUri));
       buffer += actionFolderUri.get();
     } 
@@ -403,7 +403,6 @@ NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction, nsIMsgDBH
     if (actionType == nsMsgFilterAction::MoveToFolder) {
       nsXPIDLCString msgId;
       aMsgHdr->GetMessageId(getter_Copies(msgId));
-      buffer += (const char *) actionFolderUri;
       buffer += " id = ";
       buffer += (const char*)msgId;
       buffer += "\n";
@@ -424,7 +423,7 @@ NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction, nsIMsgDBH
 
     PRUint32 escapedBufferLen = strlen(escapedBuffer);
     rv = logStream->Write(escapedBuffer, escapedBufferLen, &writeCount);
-    PR_FREEIF(escapedBuffer);
+    PR_Free(escapedBuffer);
     NS_ENSURE_SUCCESS(rv,rv);
     NS_ASSERTION(writeCount == escapedBufferLen, "failed to write out log hit");