[gtk+/wip/matthiasc/no-unmanaged-dnd] cut out more leftovers
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/no-unmanaged-dnd] cut out more leftovers
- Date: Wed, 23 Aug 2017 23:15:23 +0000 (UTC)
commit 92f924b73f6b329f7ea9c53f7a657d5413e04ee3
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Aug 23 16:52:18 2017 -0400
cut out more leftovers
gtk/gtkdnd.c | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index de0a063..666d42d 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -93,7 +93,6 @@ struct _GtkDragSourceInfo
GtkWidget *icon_widget; /* Widget for drag */
GtkWidget *ipc_widget; /* GtkInvisible for grab, message passing */
- guint32 grab_time; /* timestamp for initial grab */
GList *selections; /* selections we've claimed */
guint drop_timeout; /* Timeout for aborting drop */
@@ -1156,8 +1155,6 @@ gtk_drag_begin_internal (GtkWidget *widget,
g_signal_connect (info->ipc_widget, "selection-get",
G_CALLBACK (gtk_drag_selection_get), info);
- info->grab_time = time;
-
return info->context;
}
@@ -1736,28 +1733,6 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
g_object_unref (info->context);
}
-/* Called when the user finishes to drag, either by
- * releasing the mouse, or by pressing Esc.
- */
-static void
-gtk_drag_end (GtkDragSourceInfo *info,
- guint32 time)
-{
- GdkDevice *pointer;
-
- pointer = gdk_drag_context_get_device (info->context);
-
- /* Prevent ungrab before grab (see bug 623865) */
- if (info->grab_time == GDK_CURRENT_TIME)
- time = GDK_CURRENT_TIME;
-
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
- gdk_device_ungrab (pointer, time);
- G_GNUC_END_IGNORE_DEPRECATIONS;
-
- gtk_device_grab_remove (info->ipc_widget, pointer);
-}
-
/* Called on cancellation of a drag, either by the user
* or programmatically.
*/
@@ -1766,7 +1741,6 @@ gtk_drag_cancel_internal (GtkDragSourceInfo *info,
GtkDragResult result,
guint32 time)
{
- gtk_drag_end (info, time);
gdk_drag_abort (info->context, time);
gtk_drag_drop_finished (info, result, time);
}
@@ -1776,7 +1750,6 @@ gtk_drag_context_drop_performed_cb (GdkDragContext *context,
guint32 time_,
GtkDragSourceInfo *info)
{
- gtk_drag_end (info, time_);
gtk_drag_drop (info, time_);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]