2006-06-03 [colin] 2.2.0cvs78

	* src/plugins/spamassassin/spamassassin_gtk.c
		Autoswitch to Localhost if transport was previously
		disabled. Else people had to check [] Enable, then
		*reselect* transport.

diff --git a/ChangeLog b/ChangeLog
index e9d941e68a42d23f30ff94d52b4d73d7ae9e5d84..53ca6d486d2b722bc590900cac148a0b04fe1246 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-03 [colin]     2.2.0cvs78
+
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               Autoswitch to Localhost if transport was previously
+               disabled. Else people had to check [] Enable, then
+               *reselect* transport.
+
 2006-06-03 [colin]     2.2.0cvs77
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index b0830d6f3bb459bde1f2c3af72c7ca7b59391661..c8d753f8e28af0c1ccbba716a502915187961c11 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1547,3 +1547,4 @@
 ( cvs diff -u -r 1.60.2.18 -r 1.60.2.19 src/filtering.c;  cvs diff -u -r 1.213.2.95 -r 1.213.2.96 src/folder.c;  cvs diff -u -r 1.150.2.66 -r 1.150.2.67 src/procmsg.c;  cvs diff -u -r 1.395.2.214 -r 1.395.2.215 src/summaryview.c;  ) > 2.2.0cvs75.patchset
 ( cvs diff -u -r 1.28.2.15 -r 1.28.2.16 src/mbox.c;  ) > 2.2.0cvs76.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/pgpmime/pgpmime.c;  ) > 2.2.0cvs77.patchset
+( cvs diff -u -r 1.23.2.29 -r 1.23.2.30 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.2.0cvs78.patchset

diff --git a/configure.ac b/configure.ac
index 4eef17f1625943138bd3373e5dae0b4272f9c57f..71c18f7da56cbc392e2eed7c41eb2713a1cb908d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=77
+EXTRA_VERSION=78
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index dc8fe0882fd4dda001e3ab79de59e6b33b32add9..84ef81d237dc0738c007b312a59a81ffdeb146ef 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -448,6 +448,15 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
                if (config->transport == transports[i].transport) {
                        show_transport(page, &transports[i]);
                        active = i;
+               } else if (config->transport == SPAMASSASSIN_DISABLED 
+                       && transports[i].transport == SPAMASSASSIN_TRANSPORT_LOCALHOST) {
+                       show_transport(page, &transports[i]);
+                       active = i;
+                       /* and disable via new way */
+                       config->enable = FALSE;
+                       gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(enable_sa_checkbtn), 
+                               config->enable);
                }
        }
        gtk_option_menu_set_menu(GTK_OPTION_MENU(transport_optmenu), transport_menu);