talons

commit 0556e39de02c64f5b56f3842206178be294bdb9e
parent 0586c3cf2219f2bf97a1bcbbd6d466f0eaad6b1c
Author: wwp <wwp@free.fr>
Date:   Wed, 11 Apr 2018 12:16:03 +0200

Spamassassin plugin in Windows: don't allow Unix socket transport
mode (and switch to TCP if the config says Unix socket).

Diffstat:
M
src/plugins/spamassassin/spamassassin_gtk.c
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -89,7 +89,9 @@ struct Transport transports[] = {
 	/*{ N_("Disabled"),	SPAMASSASSIN_DISABLED,			PAGE_DISABLED, 0 },*/
 	{ N_("Localhost"),	SPAMASSASSIN_TRANSPORT_LOCALHOST,	PAGE_NETWORK, 0 },
 	{ N_("TCP"),		SPAMASSASSIN_TRANSPORT_TCP,		PAGE_NETWORK, NETWORK_HOSTNAME },
+#ifndef _WIN32
 	{ N_("Unix Socket"),	SPAMASSASSIN_TRANSPORT_UNIX,		PAGE_UNIX,    0 },
+#endif
 };
 
 #ifndef USE_ALT_ADDRBOOK
@@ -522,6 +524,11 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	page->whitelist_ab = whitelist_ab_checkbtn;
 	page->whitelist_ab_folder_combo = whitelist_ab_folder_combo;
 
+#ifdef _WIN32
+	/* no Unix socket in Windows, and in case our config comes from Unix, switch to TCP */
+	if (config->transport == SPAMASSASSIN_TRANSPORT_UNIX)
+		config->transport = SPAMASSASSIN_TRANSPORT_TCP;
+#endif
 	active = 0;
 	for (i = 0; i < (sizeof(transports) / sizeof(struct Transport)); i++) {
 		
@@ -529,7 +536,6 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 		gtk_list_store_set(store, &iter,
 				   0, gettext(transports[i].name),
 				   1, &transports[i], -1);
-
 		if (config->transport == transports[i].transport) {
 			show_transport(page, &transports[i]);
 			active = i;