Fix docstring errors with drag and drop code

diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index d82e90df2c53ba4cfc8cc67c3cbeb33e4dc18163..a0accf74649d00327b4ee97021f26fb8178333dc 100644 (file)
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -1003,7 +1003,7 @@ gdk_drop_emit_drop_event (GdkDrop  *self,
 
 /**
  * gdk_drop_has_value:
- * @drop: a #GdkDrop
+ * @self: a #GdkDrop
  * @type: the type to check
  *
  * Returns whether calling gdk_drop_read_value_async() for @type
@@ -1012,13 +1012,13 @@ gdk_drop_emit_drop_event (GdkDrop  *self,
  * Returns: %TRUE if the data can be deserialized to the given type
  */ 
 gboolean
-gdk_drop_has_value (GdkDrop *drop,
+gdk_drop_has_value (GdkDrop *self,
                     GType    type)
 {
   GdkContentFormats *formats;
   gboolean ret;
 
-  formats = gdk_content_formats_ref (gdk_drop_get_formats (drop));
+  formats = gdk_content_formats_ref (gdk_drop_get_formats (self));
   formats = gdk_content_formats_union_deserialize_gtypes (formats);
 
   ret = gdk_content_formats_contain_gtype (formats, type);

diff --git a/gtk/gtkdragdest.c b/gtk/gtkdragdest.c
index a7f32bc1c077b56d4fc4aed5baaeb69caa0c2e4a..4a30239c33d1366cea5919ca125454a582127a81 100644 (file)
--- a/gtk/gtkdragdest.c
+++ b/gtk/gtkdragdest.c
@@ -475,7 +475,7 @@ gtk_drop_target_set_actions (GtkDropTarget *dest,
 
 /**
  * gtk_drop_target_get_actions:
- * @dst: a #GtkDropTarget
+ * @dest: a #GtkDropTarget
  *
  * Gets the actions that this drop target supports.
  *

diff --git a/gtk/gtkdragdest.h b/gtk/gtkdragdest.h
index ac18face048ffb4cd26be5da1520e6dd55165e71..ceb2963c1db5572d2cbf5dc3c22c8272ecf21a43 100644 (file)
--- a/gtk/gtkdragdest.h
+++ b/gtk/gtkdragdest.h
@@ -79,7 +79,7 @@ void               gtk_drop_target_read_selection  (GtkDropTarget       *dest,
                                                     GdkAtom              target,
                                                     GCancellable        *cancellable,
                                                     GAsyncReadyCallback  callback,
-                                                    gpointer             data);
+                                                    gpointer             user_data);
 GDK_AVAILABLE_IN_ALL
 GtkSelectionData *gtk_drop_target_read_selection_finish
                                                    (GtkDropTarget       *dest,

diff --git a/gtk/gtkdragsource.h b/gtk/gtkdragsource.h
index 48090be6720ed7a18aaa8fe514996966142b0cf1..3ed028eac447f53b65ee841fab0ae5de369436d6 100644 (file)
--- a/gtk/gtkdragsource.h
+++ b/gtk/gtkdragsource.h
@@ -71,7 +71,7 @@ void               gtk_drag_source_set_icon    (GtkDragSource     *source,
                                                 int                hot_x,
                                                 int                hot_y);
 GDK_AVAILABLE_IN_ALL
-void               gtk_drag_source_drag_cancel (GtkDragSource     *sourcei);
+void               gtk_drag_source_drag_cancel (GtkDragSource     *source);
 
 GDK_AVAILABLE_IN_ALL
 GdkDrag *          gtk_drag_source_get_drag    (GtkDragSource     *source);

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b5d367a9c1dd7a08a0d60ffa0c3b4435aa7d3ba1..921a96951bebea70028801c119746ad9264abf74 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2730,7 +2730,7 @@ gtk_entry_get_icon_at_pos (GtkEntry *entry,
  * gtk_entry_set_icon_drag_source:
  * @entry: a #GtkEntry
  * @icon_pos: icon position
- * @formats: the targets (data formats) in which the data can be provided
+ * @provider: a #GdkContentProvider
  * @actions: a bitmask of the allowed drag actions
  *
  * Sets up the icon at the given position so that GTK+ will start a drag

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index e7e4853a545c1a024573960dc78f74c5d51a85af..66571c4cc1af7a1ecf156703fa750e500c908905 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -266,7 +266,7 @@ gchar *      gtk_entry_get_icon_tooltip_markup           (GtkEntry             *
 GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_drag_source              (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
-                                                         GdkContentProvider   *content,
+                                                         GdkContentProvider   *provider,
                                                          GdkDragAction         actions);
 GDK_AVAILABLE_IN_ALL
 gint         gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);