If we are trying to reply to a list, first check that we can by getting

2002-10-12  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-callbacks.c (mail_generate_reply): If we are trying to
	reply to a list, first check that we can by getting the mlist
	token (makes it easier to fix the mem leak). If not, then change
	the mode to REPLY_ALL. If we can reply to list, the make sure we
	free the CamelMessageInfo when we're done so we don't leak.

svn path=/trunk/; revision=18376

2 files changed, 8 insertions, 25 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 50b742ba05..e00aa9f2f2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -2,11 +2,9 @@
 
 	* mail-callbacks.c (mail_generate_reply): If we are trying to
 	reply to a list, first check that we can by getting the mlist
-	token. If not, then change the mode to REPLY_ALL. If we can reply
-	to list, the make sure we free the CamelMessageInfo when we're
-	done so we don't leak. Also added a check to see if the mlist
-	token could be found in the Reply-To ehader (since some mailing
-	lists override the Reply-To with their address).
+	token (makes it easier to fix the mem leak). If not, then change
+	the mode to REPLY_ALL. If we can reply to list, the make sure we
+	free the CamelMessageInfo when we're done so we don't leak.
 
 2002-10-15  Jeffrey Stedfast  <fejj@ximian.com>
 
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index a126697b6d..8c92f0479f 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1095,26 +1095,11 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
 		
 		d(printf ("we are looking for the mailing list called: %s\n", mlist));
 		
-		i = max = 0;
-		
-		/* some mailing-lists set the Reply-To to the list address */
-		reply_to = camel_mime_message_get_reply_to (message);
-		if (reply_to) {
-			max = camel_address_length (CAMEL_ADDRESS (reply_to));
-			for (i = 0; i < max; i++) {
-				camel_internet_address_get (reply_to, i, &name, &address);
-				if (!g_strncasecmp (address, mlist, len))
-					break;
-			}
-		}
-		
-		if (i == max) {
-			max = camel_address_length (CAMEL_ADDRESS (to_addrs));
-			for (i = 0; i < max; i++) {
-				camel_internet_address_get (to_addrs, i, &name, &address);
-				if (!g_strncasecmp (address, mlist, len))
-					break;
-			}
+		max = camel_address_length (CAMEL_ADDRESS (to_addrs));
+		for (i = 0; i < max; i++) {
+			camel_internet_address_get (to_addrs, i, &name, &address);
+			if (!g_strncasecmp (address, mlist, len))
+				break;
 		}
 		
 		if (i == max) {