2011-12-28 [paul] 3.8.0cvs7

	* src/prefs_account.c
		show 'Generate X-Mailer header' option on new IMAP account creation dialogue

diff --git a/ChangeLog b/ChangeLog
index 0b2128a5e163113e37124e4c6f41eb19a40bd6bc..6e68f048085a435ad0866dcf23bde5e902312a8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-28 [paul]      3.8.0cvs7
+
+       * src/prefs_account.c
+               show 'Generate X-Mailer header' option on new IMAP account creation dialogue
+
 2011-12-28 [colin]     3.8.0cvs6
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index e5ebf83265b1bd4c95258b64d8efcdde75d323f7..a4dc1d4d01d8370364c0730b69c1c529c47bc3aa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4323,3 +4323,4 @@
 ( cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/ldapctrl.c;  ) > 3.8.0cvs4.patchset
 ( cvs diff -u -r 1.83.2.184 -r 1.83.2.185 src/mimeview.c;  ) > 3.8.0cvs5.patchset
 ( cvs diff -u -r 1.83.2.185 -r 1.83.2.186 src/mimeview.c;  ) > 3.8.0cvs6.patchset
+( cvs diff -u -r 1.105.2.171 -r 1.105.2.172 src/prefs_account.c;  ) > 3.8.0cvs7.patchset

diff --git a/configure.ac b/configure.ac
index ebd3bd8fcb7051f6e11b35bccc65ec9c41a18a26..c892fae2f307afae83e1b879e59c283cdb116307 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index cb8004f832e4d69d16e7654f7c5f59736c4ecca7..2521b04a0c770396bb5374f1035dd7864b6c508c 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -4297,11 +4297,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn), 
                                TRUE);
                gtk_widget_hide(send_page.msgid_checkbtn);
-               if (new_account)
-                       gtk_toggle_button_set_active(
-                               GTK_TOGGLE_BUTTON(send_page.xmailer_checkbtn),
-                               TRUE);
-               gtk_widget_hide(send_page.xmailer_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_hide(basic_page.nntpserv_label);
                gtk_widget_hide(basic_page.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),