2006-09-18 [paul] 2.4.0cvs196

	* src/compose.c
		fix bug 1012 'crashed upon sending mail
		from compose window'
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index b65925290ecb7c3c4afb3eabda84db1af6a8fc59..773d5bc7b79d2929cebb5deae38d0c31063e61cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-18 [paul]      2.4.0cvs196
+
+       * src/compose.c
+               fix bug 1012 'crashed upon sending mail
+               from compose window'
+               Thanks to Colin
+
 2006-09-16 [colin]     2.4.0cvs195
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 366cefc8a9c0dda086ea15c2387c1111f0a2f440..a390507aaf39b8ffdf74aa7192022c2eb301ee89 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1887,3 +1887,4 @@
 ( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/wizard.c;  ) > 2.4.0cvs193.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/faq.xml;  ) > 2.4.0cvs194.patchset
 ( cvs diff -u -r 1.207.2.120 -r 1.207.2.121 src/folderview.c;  ) > 2.4.0cvs195.patchset
+( cvs diff -u -r 1.382.2.307 -r 1.382.2.308 src/compose.c;  ) > 2.4.0cvs196.patchset

diff --git a/configure.ac b/configure.ac
index 50b4562cf0630ba6260c1aaaec0cf8a7307fb1ad..e1acdd8bd9ca1a5f22c0eeca2b100840cc4a9739 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=195
+EXTRA_VERSION=196
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 19edd453b6093625194fcbed8d5bea1b697dac68..a76bf917d7cafbdb2143a1a1d3b6b856174d5687 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4021,7 +4021,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
                        entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
                        header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
                        g_strstrip(entry);
-                       if (strcmp(entry, compose->account->auto_cc)
+                       if (strcmp(entry, compose->account->auto_bcc)
                        ||  strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
                                found_other = TRUE;
                                g_free(entry);