[Commits] [SCM] claws branch, master, updated. 3.16.0-122-gfe2e299

[wwp at claws-mail.org]

The branch, master has been updated
       via  fe2e29969b327fc54a6469c32b117c0e09a5606f (commit)
       via  7d8f90fa094c36c8cc5d2881953d3337a3fd62a8 (commit)
       via  42cc00f623597d8a4dd4154317f1f01557216fb8 (commit)
      from  d3e5f7fc1ec941407927f0ba2202d0f569f95cca (commit)

Summary of changes:
 src/plugins/spamassassin/spamassassin_gtk.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit fe2e29969b327fc54a6469c32b117c0e09a5606f
Merge: 7d8f90f d3e5f7f
Author: wwp <wwp at free.fr>
Date:   Wed Apr 11 12:19:11 2018 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 7d8f90fa094c36c8cc5d2881953d3337a3fd62a8
Author: wwp <wwp at free.fr>
Date:   Wed Apr 11 12:18:26 2018 +0200

    Use G_OS_WIN32, the glib-proper way to check for WIN32.

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index d573f1f..d0439a6 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -89,7 +89,7 @@ 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
+#ifndef G_OS_WIN32
 	{ N_("Unix Socket"),	SPAMASSASSIN_TRANSPORT_UNIX,		PAGE_UNIX,    0 },
 #endif
 };
@@ -524,7 +524,7 @@ 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
+#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;

commit 42cc00f623597d8a4dd4154317f1f01557216fb8
Author: wwp <wwp at free.fr>
Date:   Wed Apr 11 12:16:03 2018 +0200

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

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 102aaff..d573f1f 100644
--- 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;

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


hooks/post-receive
-- 
Claws Mail