Don't return a positive status unless there is a text target in the drag.

Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.)

diff --git a/ChangeLog b/ChangeLog
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edae386b8b0de0a7f73df2c99417dd57ed4dc2a3..1e6313b5350b87f1554b94c3183f94fee2142b52 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jun 13 12:01:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a39a02cfff6bfa70cb068edbcced5fb940d908ff..1dac477985e81417e13662abee9a28fd15ec7b96 100644 (file)
--- 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;
     }