From: Benjamin Otte <otte@redhat.com>
Date: Fri, 15 Jun 2018 06:00:41 +0000 (+0200)
Subject: x11: xdnd_send_event() always returns TRUE
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~77
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b2dccd14386c4504daf92ea9540e5f5f78bec35;p=gtk4.git

x11: xdnd_send_event() always returns TRUE

Make it return nothing instead and delete the code that handled the
FALSE case.
---

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index c99ce3d9af..c7bd72d5b2 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -1040,7 +1040,7 @@ send_client_message_async (GdkDragContext      *context,
                                       send_client_message_async_cb, context);
 }
 
-static gboolean
+static void
 xdnd_send_xevent (GdkX11DragContext *context_x11,
                   GdkSurface        *surface,
                   XEvent            *event_send)
@@ -1056,7 +1056,7 @@ xdnd_send_xevent (GdkX11DragContext *context_x11,
   if (gdk_surface_get_surface_type (surface) != GDK_SURFACE_FOREIGN)
     {
       if (gdk_x11_drop_filter (surface, event_send))
-        return TRUE;
+        return;
     }
 
   xwindow = GDK_SURFACE_XID (surface);
@@ -1068,8 +1068,6 @@ xdnd_send_xevent (GdkX11DragContext *context_x11,
 
   send_client_message_async (context, xwindow, event_mask,
                              &event_send->xclient);
-
-  return TRUE;
 }
 
 static void
@@ -1112,14 +1110,7 @@ xdnd_send_enter (GdkX11DragContext *context_x11)
         }
     }
 
-  if (!xdnd_send_xevent (context_x11, context->dest_surface, &xev))
-    {
-      GDK_DISPLAY_NOTE (display, DND,
-                g_message ("Send event to %lx failed",
-                           GDK_SURFACE_XID (context->dest_surface)));
-      g_object_unref (context->dest_surface);
-      context->dest_surface = NULL;
-    }
+  xdnd_send_xevent (context_x11, context->dest_surface, &xev);
 }
 
 static void
@@ -1141,14 +1132,7 @@ xdnd_send_leave (GdkX11DragContext *context_x11)
   xev.xclient.data.l[3] = 0;
   xev.xclient.data.l[4] = 0;
 
-  if (!xdnd_send_xevent (context_x11, context->dest_surface, &xev))
-    {
-      GDK_DISPLAY_NOTE (display, DND,
-                g_message ("Send event to %lx failed",
-                           GDK_SURFACE_XID (context->dest_surface)));
-      g_object_unref (context->dest_surface);
-      context->dest_surface = NULL;
-    }
+  xdnd_send_xevent (context_x11, context->dest_surface, &xev);
 }
 
 static void
@@ -1171,14 +1155,7 @@ xdnd_send_drop (GdkX11DragContext *context_x11,
   xev.xclient.data.l[3] = 0;
   xev.xclient.data.l[4] = 0;
 
-  if (!xdnd_send_xevent (context_x11, context->dest_surface, &xev))
-    {
-      GDK_DISPLAY_NOTE (display, DND,
-                g_message ("Send event to %lx failed",
-                           GDK_SURFACE_XID (context->dest_surface)));
-      g_object_unref (context->dest_surface);
-      context->dest_surface = NULL;
-    }
+  xdnd_send_xevent (context_x11, context->dest_surface, &xev);
 }
 
 static void
@@ -1204,14 +1181,7 @@ xdnd_send_motion (GdkX11DragContext *context_x11,
   xev.xclient.data.l[3] = time;
   xev.xclient.data.l[4] = xdnd_action_to_atom (display, action);
 
-  if (!xdnd_send_xevent (context_x11, context->dest_surface, &xev))
-    {
-      GDK_DISPLAY_NOTE (display, DND,
-                g_message ("Send event to %lx failed",
-                           GDK_SURFACE_XID (context->dest_surface)));
-      g_object_unref (context->dest_surface);
-      context->dest_surface = NULL;
-    }
+  xdnd_send_xevent (context_x11, context->dest_surface, &xev);
   context_x11->drag_status = GDK_DRAG_STATUS_MOTION_WAIT;
 }