[Xfce4-commits] [apps/xfce4-terminal] 01/01: Attempt to fix crash under wayland

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit f1179b70268c7bd5412401e111a2d799f86a2cb6
Author: Igor <f2404 at yandex.ru>
Date:   Mon Aug 29 16:12:48 2016 +0300

    Attempt to fix crash under wayland
    
    It turned out that wayland uses $WAYLAND_DISPLAY instead of $DISPLAY.
    The solution here is to read the first variable and use it if available.
    https://bugzilla.xfce.org/show_bug.cgi?id=12785
---
 terminal/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/terminal/main.c b/terminal/main.c
index 6168221..5f980a2 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -232,7 +232,9 @@ main (int argc, char **argv)
     }
 
   /* append default display if given */
-  display = g_getenv ("DISPLAY");
+  display = g_getenv ("WAYLAND_DISPLAY");
+  if (display == NULL)
+    display = g_getenv ("DISPLAY");
   if (G_LIKELY (display != NULL))
     nargv[nargc++] = g_strdup_printf ("--default-display=%s", display);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.