[Commits] [SCM] claws branch, master, updated. 3.17.3-47-g539c299

[ticho at claws-mail.org]

The branch, master has been updated
       via  539c299f783535b00cae257dde6ef42f8fb3df50 (commit)
      from  c3fc28501b99bddb928f1c046b6ec5c48c7622a4 (commit)

Summary of changes:
 src/main.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 539c299f783535b00cae257dde6ef42f8fb3df50
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Jan 20 19:41:00 2019 +0100

    Disable operations around the x_display variable on non-Unix

diff --git a/src/main.c b/src/main.c
index f01ea5e..60551af 100644
--- a/src/main.c
+++ b/src/main.c
@@ -171,7 +171,9 @@ static SnDisplay *sn_display = NULL;
 
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
+#ifdef G_OS_UNIX
 static gchar *x_display = NULL;
+#endif
 typedef enum 
 {
 	ONLINE_MODE_DONT_CHANGE,
@@ -2447,7 +2449,7 @@ static gint prohibit_duplicate_launch(void)
 			claws_fputs(buf, stdout);
 		}
 	} else {
-#ifndef G_OS_WIN32
+#ifdef G_OS_UNIX
 		gchar buf[BUFSIZ];
 		fd_write_all(uxsock, "get_display\n", 12);
 		memset(buf, 0, sizeof(buf));
@@ -2539,8 +2541,10 @@ static void lock_socket_input_cb(gpointer data,
 
 	if (!strncmp(buf, "popup", 5)) {
 		main_window_popup(mainwin);
+#ifdef G_OS_UNIX
 	} else if (!strncmp(buf, "get_display", 11)) {
 		fd_write_all(sock, x_display, strlen(x_display));
+#endif
 	} else if (!strncmp(buf, "receive_all", 11)) {
 		inc_all_account_mail(mainwin, FALSE, FALSE,
 				     prefs_common.newmail_notify_manu);

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


hooks/post-receive
-- 
Claws Mail