[gtk: 2/2] Merge branch 'drop-target-name-collision' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 56c486abbfbc2d99df974b3be4f9cd3c570d4951
Merge: 5e99513507 b09087d634
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jun 16 00:12:53 2021 +0000

    Merge branch 'drop-target-name-collision' into 'master'
    
    droptarget: Rename :drop to :current-drop
    
    Closes #4028
    
    See merge request GNOME/gtk!3669

 gtk/gtkdroptarget.c    | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 gtk/gtkdroptarget.h    |  5 ++++-
 gtk/gtknotebook.c      |  4 ++--
 gtk/gtkplacessidebar.c |  2 +-
 4 files changed, 52 insertions(+), 6 deletions(-)
---