dnd: Rename gdk_drop_finish() => gdk_drag_finish()

This is a simple rename, so that we can reintroduce gdk_drop_finish()
with the GdkDrop object.

diff --git a/docs/dnd_internals.txt b/docs/dnd_internals.txt
index 02fba41f9316b591e2a05e109d0d1e287b407504..eb4cde2a84c33e13b60868141c7104cb0bd5be75 100644 (file)
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -71,7 +71,7 @@ straightforward manner.
 void             gdk_drag_status        (GdkDragContext   *context,
                                         GdkDragAction     action,
                                         guint32           time);
-void             gdk_drop_finish        (GdkDragContext   *context,
+void             gdk_drag_finish        (GdkDragContext   *context,
                                         gboolean          success,
                                         guint32           time);
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index d03ddf3cd33e7e67eaede3063f38215a3561fff1..ffe1fc0b5bb3eaf3c089f550bd22f6ac6a9085bd 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -783,7 +783,7 @@ GdkDragContext
 GdkDragCancelReason
 gdk_drag_drop_done
 gdk_drag_begin
-gdk_drop_finish
+gdk_drag_finish
 GdkDragAction
 GDK_ACTION_ALL
 gdk_drag_status

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index ddc155f553f30580473bd8cf6ea9de2500807cdd..126d8ea356c4586034cb9ffec01cbf0fea241649 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -573,7 +573,7 @@ gdk_drag_drop (GdkDragContext *context,
 }
 
 /**
- * gdk_drop_finish:
+ * gdk_drag_finish:
  * @context: a #GdkDragContext
  * @success: %TRUE if the data was successfully received
  * @time_: the timestamp for this operation
@@ -583,7 +583,7 @@ gdk_drag_drop (GdkDragContext *context,
  * This function is called by the drag destination.
  */
 void
-gdk_drop_finish (GdkDragContext *context,
+gdk_drag_finish (GdkDragContext *context,
                  gboolean        success,
                  guint32         time_)
 {

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index d7a20d286627465eff8e6813e2f8f64c29ca363f..365e9cf4cb77b7211d445876ceaedaf4fc6554fc 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -115,7 +115,7 @@ void             gdk_drag_status        (GdkDragContext   *context,
                                          GdkDragAction     action,
                                          guint32           time_);
 GDK_AVAILABLE_IN_ALL
-void             gdk_drop_finish        (GdkDragContext   *context,
+void             gdk_drag_finish        (GdkDragContext   *context,
                                          gboolean          success,
                                          guint32           time_);
 

diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index 925357e2a7759d48cc3238f2970ec8ef7b8bb7bc..7fa7d029c7b9db7cd38096a6657a5cdb3fcbbb20 100644 (file)
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -314,12 +314,12 @@ gdk_drop_get_formats (GdkDrop *self)
  *
  * Returns the possible actions for this #GdkDrop. If this value
  * contains multiple actions - ie gdk_drag_action_is_unique()
- * returns %FALSE for the result - gdk_drop_finish() must choose
+ * returns %FALSE for the result - gdk_drag_finish() must choose
  * the action to use when accepting the drop.
  *
  * This value may change over the lifetime of the #GdkDrop both
  * as a response to source side actions as well as to calls to
- * gdk_drop_status() or gdk_drop_finish(). The source side will
+ * gdk_drop_status() or gdk_drag_finish(). The source side will
  * not change this value anymore once a drop has started.
  *
  * Returns: The possible #GdkDragActions

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index b1f5c29649aa894903bf11430999a5489a1c72b1..9d662eba38f05d8aa0921001f7dbda28e2d6734b 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -2370,7 +2370,7 @@ gdk_win32_drag_context_drop_done (GdkDragContext *context,
                           success ? "dropped successfully" : "dropped unsuccessfully"));
 
   /* FIXME: This is temporary, until the code is fixed to ensure that
-   * gdk_drop_finish () is called by GTK.
+   * gdk_drag_finish () is called by GTK.
    */
   if (use_ole2_dnd)
     {

diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index bbf8a9b4af5ba20b4fb8409620eac367710c8731..d0b088b000281f7fdf39909d71b5a29c6eefe38a 100644 (file)
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -904,7 +904,7 @@ gdk_win32_drop_context_drop_finish (GdkDragContext *context,
 
   g_return_if_fail (context != NULL);
 
-  GDK_NOTE (DND, g_print ("gdk_drop_finish\n"));
+  GDK_NOTE (DND, g_print ("gdk_drag_finish\n"));
 
   if (!use_ole2_dnd)
     {

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index f84659306b20fc2789977ee04f057c303a0c60b5..748c191d29af4b061df16bc0bf6c962650eb2090 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -352,7 +352,7 @@ gtk_drag_finish (GdkDragContext *context,
 {
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 
-  gdk_drop_finish (context, success, time);
+  gdk_drag_finish (context, success, time);
 }
 
 /**