2011-08-29 [colin] 3.7.10cvs7

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

diff --git a/ChangeLog b/ChangeLog
index 4c9adf36d3bfd933a9afa277524829e12942239e..c16f8abfdd7d9b85ff909c374e57178315541518 100644 (file)
--- 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
 2011-08-29 [colin]     3.7.10cvs6
 
        * src/plugins/pgpcore/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 8befb751e3e894ecbe8313b9faf1d1acd8786649..8e6e0c9de8d36c73f25452b24955f2e399cf3285 100644 (file)
--- 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.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
index 104c9846b0cc37f7f0f8f5c9ce82b96e0d729a05..050084b045978a5b81ee485088596d271ad71ed6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 2b5557ec0e191e51a38fa57ca66e737d2ca06530..7f53ecb02ba144b1f0ddeeca68491391dd302b92 100644 (file)
--- 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_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.msgid_checkbtn);

-                       gtk_widget_show(send_page.xmailer_checkbtn);
-               }
+
+               gtk_widget_show(send_page.xmailer_checkbtn);

        }
 }
 
        }
 }