From 7cf409d8c87c44385c5d1620642fff966fd9c25a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 13 Jun 2002 16:02:51 +0000 Subject: [PATCH] Don't return a positive status unless there is a text target in the drag. Thu Jun 13 12:01:36 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return a positive status unless there is a text target in the drag. (#83386, Thomas Leonard.) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkentry.c | 5 +++-- 7 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index edae386b8b..1e6313b535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index edae386b8b..1e6313b535 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index edae386b8b..1e6313b535 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index edae386b8b..1e6313b535 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index edae386b8b..1e6313b535 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index edae386b8b..1e6313b535 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jun 13 12:01:36 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_drag_motion): Don't return + a positive status unless there is a text target in + the drag. (#83386, Thomas Leonard.) + Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index a39a02cfff..1dac477985 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4006,7 +4006,8 @@ gtk_entry_drag_motion (GtkWidget *widget, old_position = entry->dnd_position; new_position = gtk_entry_find_position (entry, x + entry->scroll_offset); - if (entry->editable) + if (entry->editable && + gtk_drag_dest_find_target (widget, context, NULL) != GDK_NONE) { source_widget = gtk_drag_get_source_widget (context); suggested_action = context->suggested_action; @@ -4035,7 +4036,7 @@ gtk_entry_drag_motion (GtkWidget *widget, } else { - /* Entry not editable */ + /* Entry not editable, or no text */ suggested_action = 0; entry->dnd_position = -1; }