From ed46b65c00ff3b5c33782a8761c75b47fa953b52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Techet?= Date: Thu, 16 Feb 2017 11:45:46 +0100 Subject: [PATCH] Avoid gdk_display_get_name() on OS X More in the comment. --- src/socket.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/socket.c b/src/socket.c index 5e4aa4b8c..2bd6c1d09 100644 --- a/src/socket.c +++ b/src/socket.c @@ -284,8 +284,15 @@ gint socket_init(gint argc, gchar **argv) GdkDisplay *display = gdk_display_get_default(); gchar *p; + /* On OS X with quartz backend gdk_display_get_name() returns hostname + * using [NSHost currentHost] (it could return more or less whatever string + * as display name is a X11 specific thing). This call can lead to network + * query and block for several seconds so better skip it. */ +#ifndef GDK_WINDOWING_QUARTZ if (display != NULL) display_name = g_strdup(gdk_display_get_name(display)); +#endif + if (display_name == NULL) display_name = g_strdup("NODISPLAY"); -- 2.11.4.GIT