[Commits] [SCM] claws branch, master, updated. 3.16.0-124-g7e2fc1a

[wwp at claws-mail.org]

The branch, master has been updated
       via  7e2fc1aef94c69134c0e920682ff6b1bf5d83b23 (commit)
      from  a7f84c556ea8ac3a99addcfbe14b42297b281655 (commit)

Summary of changes:
 src/plugins/spamassassin/spamassassin.c     |    5 +++++
 src/plugins/spamassassin/spamassassin_gtk.c |    5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 7e2fc1aef94c69134c0e920682ff6b1bf5d83b23
Author: wwp <wwp at free.fr>
Date:   Wed Apr 11 19:19:50 2018 +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.

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 5df6de1..f01bd92 100644
--- 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
index d0439a6..fe0ba12 100644
--- 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++) {
 		

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail