talons

Fork of Claws Mail https://www.claws-mail
Log | Files | Refs | README | LICENSE

commit bdc4080ad4250eab3c2184806c9fe29aaef27e39
parent 8eee8f13df0325b9c75bb062246d619da9066276
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Sun, 20 Jan 2019 19:41:00 +0100

Disable operations around the x_display variable on non-Unix

Diffstat:
Msrc/main.c | 6+++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 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, @@ -2441,7 +2443,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)); @@ -2533,8 +2535,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);