[Xfce4-commits] [xfce/thunar] 01/01: Segfault in XInternAtom when clicking or typing when using wayland (Bug #14461)

[noreply at xfce.org]

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

a   l   e   x       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/thunar.

commit 4fa24d42f83180fd5012527eb4ed77b04e8d88a6
Author: Alexander Schwinn <acs82 at gmx.de>
Date:   Tue Jun 19 22:39:50 2018 +0200

    Segfault in XInternAtom when clicking or typing when using wayland (Bug
    #14461)
---
 plugins/thunar-wallpaper/twp-provider.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/thunar-wallpaper/twp-provider.c b/plugins/thunar-wallpaper/twp-provider.c
index 0a91c1d..66c761e 100644
--- a/plugins/thunar-wallpaper/twp-provider.c
+++ b/plugins/thunar-wallpaper/twp-provider.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <gio/gio.h>
 
 #include <gdk/gdkx.h>
@@ -180,6 +182,12 @@ twp_provider_get_file_menu_items (ThunarxMenuProvider *menu_provider,
     }
 
   g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
+
+  if(g_strcmp0 (getenv("XDG_SESSION_TYPE"),"wayland") == 0)
+    {
+      return items; // wayland crashes on "gdk_x11_get_default_xdisplay"
+    }
+
   xfce_selection_atom = XInternAtom (gdk_x11_get_default_xdisplay(), selection_name, False);
 
   if ((XGetSelectionOwner(gdk_x11_get_default_xdisplay(), xfce_selection_atom)))

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