From bb4fca24863864dc2d7c4030ee8ae2c324a0b79e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 13 Apr 2013 17:20:05 -0400
Subject: [PATCH] wayland: Don't get the shell surface twice

Noticed by Pu Xingyu,
https://bugzilla.gnome.org/show_bug.cgi?id=697947
---
 gdk/wayland/gdkwindow-wayland.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 4b651d792d..a04915e161 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -714,7 +714,9 @@ gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped)
       wl_surface_set_user_data(impl->surface, window);
     }
 
-  if (!impl->use_custom_surface && display_wayland->shell)
+  if (!impl->shell_surface &&
+      !impl->use_custom_surface &&
+      display_wayland->shell)
     {
       impl->shell_surface = wl_shell_get_shell_surface (display_wayland->shell,
                                                         impl->surface);