talons

commit bf01fb086584be7a2a700b0922cc6dff6dbee536
parent b60df1ce713f7bea19165353ffc29473856c1c71
Author: wwp <wwp@free.fr>
Date:   Wed, 11 Apr 2018 19:19:50 +0200

SA plugin: better way to make sure Unix sockets are not used in Windows,
from a config coming from Unix: do it when loading the configs, not
when handling the plug-in preferences in GUI.

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

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
@@ -547,6 +547,11 @@ gint plugin_init(gchar **error)
 		*error = g_strdup(_("Failed to get username"));
 		return -1;
 	}
+#ifdef G_OS_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
 	spamassassin_gtk_init();
 		
 	debug_print("SpamAssassin plugin loaded\n");
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -524,11 +524,6 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 	page->whitelist_ab = whitelist_ab_checkbtn;
 	page->whitelist_ab_folder_combo = whitelist_ab_folder_combo;
 
-#ifdef G_OS_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++) {