[gtk+/gtk-3-16] wayland: Ensure we re-request the target if the fd changes

[Matthias Clasen <matthiasc src gnome org>]

commit e995c0d1bf3496b811d0f1026a55b23b1ff32714
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Mar 19 15:54:48 2015 +0100

    wayland: Ensure we re-request the target if the fd changes
    
    If we receive wl_data_source.target before .send, the target would already
    be cached, but we'd take no action on the new fd.

 gdk/wayland/gdkselection-wayland.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index 4ba016a..043ca7d 100644
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -558,12 +558,12 @@ gdk_wayland_selection_request_target (GdkWaylandSelection *wayland_selection,
   else
     return FALSE;
 
-  if (fd >= 0)
-    wayland_selection->stored_selection.fd = fd;
-
-  if (wayland_selection->source_requested_target == target)
+  if (wayland_selection->stored_selection.fd == fd &&
+      wayland_selection->source_requested_target == target)
     return FALSE;
 
+  wayland_selection->stored_selection.fd = fd;
+
   wayland_selection->source_requested_target = target;
 
   if (window && target != GDK_NONE)