talons

commit 1d4b435e302056db1a4888cc61a0c6d8a6176f0f
parent b5fbdcae92746266b7879ab8a201f96da8a7c2e8
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 29 Aug 2011 15:42:13 +0000

2011-08-29 [colin]	3.7.10cvs7

	* src/prefs_account.c
		Fix X-Mailer option not appearing on IMAP

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_account.c
 | 
7
+++----

4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-29 [colin]	3.7.10cvs7
+
+	* src/prefs_account.c
+		Fix X-Mailer option not appearing on IMAP
+
 2011-08-29 [colin]	3.7.10cvs6
 
 	* src/plugins/pgpcore/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -4210,3 +4210,4 @@
 ( cvs diff -u -r 1.382.2.578 -r 1.382.2.579 src/compose.c;  ) > 3.7.10cvs4.patchset
 ( cvs diff -u -r 1.61.2.97 -r 1.61.2.98 src/account.c;  cvs diff -u -r 1.382.2.579 -r 1.382.2.580 src/compose.c;  cvs diff -u -r 1.105.2.166 -r 1.105.2.167 src/prefs_account.c;  cvs diff -u -r 1.49.2.45 -r 1.49.2.46 src/prefs_account.h;  ) > 3.7.10cvs5.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/smime/Makefile.am;  ) > 3.7.10cvs6.patchset
+( cvs diff -u -r 1.105.2.167 -r 1.105.2.168 src/prefs_account.c;  ) > 3.7.10cvs7.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 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
@@ -3919,11 +3919,10 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
 					GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn), 
 					TRUE);
 			gtk_widget_hide(send_page.msgid_checkbtn);
-			gtk_widget_hide(send_page.xmailer_checkbtn);
-		} else {
+		} else
 			gtk_widget_show(send_page.msgid_checkbtn);
-			gtk_widget_show(send_page.xmailer_checkbtn);
-		}
+
+		gtk_widget_show(send_page.xmailer_checkbtn);
 	}
 }