[Xfce4-commits] [apps/xfce4-terminal] 01/01: Another attempt to fix wayland compatibility

[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 0cd51a5290b917c5662abe4313b213a7e826fffe
Author: Igor <f2404 at yandex.ru>
Date:   Fri Aug 26 16:38:14 2016 +0300

    Another attempt to fix wayland compatibility
---
 terminal/terminal-screen.c | 3 ++-
 terminal/terminal-util.c   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 81ac92a..23f4d92 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -729,7 +729,8 @@ terminal_screen_get_child_environment (TerminalScreen *screen)
   if (toplevel != NULL && gtk_widget_get_realized (toplevel))
     {
 #ifdef GDK_WINDOWING_X11
-      result[n++] = g_strdup_printf ("WINDOWID=%ld", (glong) gdk_x11_window_get_xid (gtk_widget_get_window (toplevel)));
+      if (GDK_IS_X11_WINDOW (gtk_widget_get_window (toplevel)))
+        result[n++] = g_strdup_printf ("WINDOWID=%ld", (glong) gdk_x11_window_get_xid (gtk_widget_get_window (toplevel)));
 #endif
 
       /* determine the DISPLAY value for the command */
diff --git a/terminal/terminal-util.c b/terminal/terminal-util.c
index 5912a5f..b0392b0 100644
--- a/terminal/terminal-util.c
+++ b/terminal/terminal-util.c
@@ -103,6 +103,9 @@ terminal_util_activate_window (GtkWindow *window)
   terminal_return_if_fail (GTK_IS_WINDOW (window));
   terminal_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
 
+  if (!GDK_IS_X11_WINDOW (window))
+    return;
+
   /* leave if the window is already active */
   if (gtk_window_is_active (window))
     return;

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