From: Christoph Hohmann <reboot@gmx.ch>
Date: Thu, 6 Mar 2003 10:36:37 +0000 (+0000)
Subject: 0.8.10claws91
X-Git-Tag: rel_0_8_11~29
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=daa42231d37a431ff5d71b0ec8513cc42a62b235

0.8.10claws91

* src/compose.c
        ignore address comment in dupe check for Cc-list

(closes reopened bug 47 Replying to message strips name part of
 e-mail addresses of Cc: lines)
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 140439cc9..920130492 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-03-06 [christoph]	0.8.10claws91
+
+	* src/compose.c
+		ignore address comment in dupe check for Cc-list
+
+	(closes reopened bug 47 Replying to message strips name part of
+	 e-mail addresses of Cc: lines)
+
 2003-03-06 [paul]	0.8.10claws90
 
 	* src/Makefile.am
diff --git a/configure.ac b/configure.ac
index c37250462..de3f38103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws90
+EXTRA_VERSION=claws91
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 7cbafa54a..de724c8d2 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1812,22 +1812,27 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 
 	to_table = g_hash_table_new(g_str_hash, g_str_equal);
 	if (replyto)
-		g_hash_table_insert(to_table, replyto, GINT_TO_POINTER(1));
+		g_hash_table_insert(to_table, g_strdup(replyto), GINT_TO_POINTER(1));
 	if (compose->account)
-		g_hash_table_insert(to_table, compose->account->address,
+		g_hash_table_insert(to_table, g_strdup(compose->account->address),
 				    GINT_TO_POINTER(1));
 
 	/* remove address on To: and that of current account */
 	for (cur = cc_list; cur != NULL; ) {
 		GSList *next = cur->next;
+		gchar *addr;
 
-		if (g_hash_table_lookup(to_table, cur->data) != NULL)
+		addr = g_strdup(cur->data);
+		extract_address(addr);
+
+		if (GPOINTER_TO_INT(g_hash_table_lookup(to_table, addr)) == 1)
 			cc_list = g_slist_remove(cc_list, cur->data);
 		else
-			g_hash_table_insert(to_table, cur->data, cur);
+			g_hash_table_insert(to_table, addr, GINT_TO_POINTER(1));
 
 		cur = next;
 	}
+	hash_free_strings(to_table);
 	g_hash_table_destroy(to_table);
 
 	if (cc_list) {