From b44689fece65d88a0d0e054e384551d49bbc19b1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 May 2006 19:26:02 +0000 Subject: [PATCH] Don't produce a stuck drag if shift is held. (#341734, Sebastien Bacher) 2006-05-18 Matthias Clasen * gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce a stuck drag if shift is held. (#341734, Sebastien Bacher) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkcalendar.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c22de2cb6..f40a6d9fbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-05-18 Matthias Clasen + * gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce + a stuck drag if shift is held. (#341734, Sebastien Bacher) + * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): Always set protocol. (#342003, Tommi Komulainen) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1c22de2cb6..f40a6d9fbc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-05-18 Matthias Clasen + * gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce + a stuck drag if shift is held. (#341734, Sebastien Bacher) + * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): Always set protocol. (#342003, Tommi Komulainen) diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 724697fe24..90141d5755 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -3014,7 +3014,7 @@ gtk_calendar_drag_motion (GtkWidget *widget, } target = gtk_drag_dest_find_target (widget, context, NULL); - if (target == GDK_NONE) + if (target == GDK_NONE || context->suggested_action == 0) gdk_drag_status (context, 0, time); else {