From: Jonas Ådahl <jadahl@gmail.com>
Date: Fri, 13 Mar 2015 07:46:55 +0000 (+0800)
Subject: wayland: Don't set the wl_surface user_data twice
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~10176
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=225c10bc5a1dafeccd1e86cd072fb85c172105a2;p=gtk4.git

wayland: Don't set the wl_surface user_data twice

wl_surface_add_listener already sets the user data pointer, so no need
to do it separately before.

https://bugzilla.gnome.org/show_bug.cgi?id=746141
---

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index b5f51e816b..66d371f6d5 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -870,7 +870,6 @@ gdk_wayland_window_create_surface (GdkWindow *window)
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
 
   impl->surface = wl_compositor_create_surface (display_wayland->compositor);
-  wl_surface_set_user_data (impl->surface, window);
   wl_surface_add_listener (impl->surface, &surface_listener, window);
 
   gdk_wayland_window_sync_opaque_region (window);