2006-12-07 [wwp] 2.6.1cvs11

	* src/compose.c
		fix email address comparison when replying to all
		(avoid replying to ourselves), thanks to Colin.

diff --git a/ChangeLog b/ChangeLog
index 65c06b9eddc58961f5a0557284d15fa3903d6414..91d7226f607b6d263b89168aa127756849b1fb41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-07 [wwp]       2.6.1cvs11
+
+       * src/compose.c
+               fix email address comparison when replying to all
+               (avoid replying to ourselves), thanks to Colin.
+
 2006-12-06 [paul]      2.6.1cvs10
 
        * src/addrharvest.c

diff --git a/PATCHSETS b/PATCHSETS
index bdf3ee363f8d9ffe18efb78ac0875ff7ea3e4840..ff9a3d0a159bde3df279bd14983a4400beb636ac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2118,3 +2118,4 @@
 ( cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/ssl_manager.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/ssl_certificate.h;  ) > 2.6.1cvs8.patchset
 ( cvs diff -u -r 1.382.2.339 -r 1.382.2.340 src/compose.c;  cvs diff -u -r 1.94.2.110 -r 1.94.2.111 src/messageview.c;  cvs diff -u -r 1.47.2.36 -r 1.47.2.37 src/procheader.c;  cvs diff -u -r 1.49.2.83 -r 1.49.2.84 src/procmime.c;  cvs diff -u -r 1.150.2.84 -r 1.150.2.85 src/procmsg.c;  cvs diff -u -r 1.96.2.160 -r 1.96.2.161 src/textview.c;  ) > 2.6.1cvs9.patchset
 ( cvs diff -u -r 1.6.10.12 -r 1.6.10.13 src/addrharvest.c;  cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/editldap.c;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/expldifdlg.c;  cvs diff -u -r 1.101.2.33 -r 1.101.2.34 src/news.c;  cvs diff -u -r 1.43.2.55 -r 1.43.2.56 src/toolbar.c;  cvs diff -u -r 1.36.2.92 -r 1.36.2.93 src/common/utils.c;  ) > 2.6.1cvs10.patchset
+( cvs diff -u -r 1.382.2.340 -r 1.382.2.341 src/compose.c;  ) > 2.6.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 695e0622206125e3ddb1c947d98a2407b0d2d873..7074deb41c451ecf9e71d0c6604788b90658c529 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index db53d1b14faa968c84a6749915486aaf4dbca49f..bf167cdf34eb54ccd3da99bc4f1ed53090afa7ce 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2818,17 +2818,17 @@ 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, g_strdup(replyto), GINT_TO_POINTER(1));
-       if (compose->account)
-               g_hash_table_insert(to_table, g_strdup(compose->account->address),
+               g_hash_table_insert(to_table, g_utf8_strdown(replyto, -1), GINT_TO_POINTER(1));
+       if (compose->account) {
+               g_hash_table_insert(to_table, g_utf8_strdown(compose->account->address, -1),
                                    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;
 
-               addr = g_strdup(cur->data);
+               addr = g_utf8_strdown(cur->data, -1);
                extract_address(addr);
 
                if (GPOINTER_TO_INT(g_hash_table_lookup(to_table, addr)) == 1)