summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-10-25 21:24:37 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-10-25 21:24:37 -0400
commitcbe1337aa16842e76c43749be9affc596a1fc62b (patch)
treec009d3ee409ee7cacf8170be3f899d3050a8c342 /gdk/x11
parentf350e346e45a7d74330a0436039f260617f39420 (diff)
downloadgtk+-cbe1337aa16842e76c43749be9affc596a1fc62b.tar.gz
Revert "Remove gdk_device_grab/ungrab from the API"
This reverts commit efc37d08556ed8516442a18a67e3035f13cf05a7. Turns out we need to clean up the dnd code some more, first.
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkdnd-x11.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 633fcc6ae0..89460744d1 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -29,7 +29,6 @@
#include "gdkmain.h"
#include "gdkinternals.h"
-#include "gdkdeviceprivate.h"
#include "gdkasync.h"
#include "gdkproperty.h"
#include "gdkprivate-x11.h"
@@ -2817,11 +2816,15 @@ gdk_x11_drag_context_set_cursor (GdkDragContext *context,
return;
if (x11_context->grab_seat)
- gdk_device_grab (gdk_seat_get_pointer (x11_context->grab_seat),
- x11_context->ipc_window,
- GDK_OWNERSHIP_APPLICATION, FALSE,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- cursor, GDK_CURRENT_TIME);
+ {
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ gdk_device_grab (gdk_seat_get_pointer (x11_context->grab_seat),
+ x11_context->ipc_window,
+ GDK_OWNERSHIP_APPLICATION, FALSE,
+ GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+ cursor, GDK_CURRENT_TIME);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+ }
}
static void