From 3d6f787e3315990129196146c5d1b4783b365af2 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 3 Jun 2006 10:06:28 +0000 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/spamassassin/spamassassin_gtk.c | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e9d941e68..53ca6d486 100644 --- 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 b0830d6f3..c8d753f8e 100644 --- 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 4eef17f16..71c18f7da 100644 --- 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 dc8fe0882..84ef81d23 100644 --- 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); -- 2.25.1