Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 27 Feb 2017 17:09:59 UTC Commit: b7900b3f05d37818a1cd38f2c83e2c17e22c47ee https://github.com/geany/geany/commit/b7900b3f05d37818a1cd38f2c83e2c17e22c47...

Log Message: ----------- Merge pull request #1399 from techee/osx_start

Avoid gdk_display_get_name() on OS X

Modified Paths: -------------- src/socket.c

Modified: src/socket.c 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -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");

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).