[gtk+] Fix some parameter name mismatches to make g-ir-scanner happier
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix some parameter name mismatches to make g-ir-scanner happier
- Date: Tue, 28 Nov 2017 14:32:17 +0000 (UTC)
commit 2d797dd816ee0c8f182e7bd9a7d36782ffbd159f
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Tue Nov 28 15:20:14 2017 +0100
Fix some parameter name mismatches to make g-ir-scanner happier
gdk/gdkcontentformats.c | 2 +-
gtk/gtkclipboard.c | 3 +--
gtk/gtkclipboard.h | 6 +++---
gtk/gtkdnd.h | 2 +-
gtk/gtkdragdest.h | 2 +-
gtk/gtkdragsource.h | 2 +-
gtk/gtkimage.c | 2 +-
gtk/gtkselection.c | 1 -
gtk/gtksettings.c | 2 +-
9 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c
index d9ca134..2663a3b 100644
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -102,7 +102,7 @@ gdk_content_formats_new_take (GType * gtypes,
* gdk_content_formats_new:
* @mime_types: (array length=n_mime_types) (allow-none): Pointer to an
* array of mime types
- * @nmime_types: number of entries in @mime_types.
+ * @n_mime_types: number of entries in @mime_types.
*
* Creates a new #GdkContentFormats from an array of mime types.
*
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index c328bad..2022225 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1854,7 +1854,7 @@ gtk_clipboard_wait_is_uris_available (GtkClipboard *clipboard)
}
/**
- * gtk_clipboard_wait_for_formats:
+ * gtk_clipboard_wait_for_targets:
* @clipboard: a #GtkClipboard
* @formats: (out) (array length=n_formats) (transfer container): location
* to store an array of formats. The result stored here must
@@ -2065,7 +2065,6 @@ gtk_clipboard_store_timeout (GtkClipboard *clipboard)
* @formats: (allow-none): The targets (data formats) in which the
* functions can provide the data or %NULL
* to indicate that all forms should be stored.
- * @n_formats: number of elements in @formats
*
* Hints that the clipboard data should be stored somewhere when the
* application exits or when gtk_clipboard_store () is called.
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index ecc49be..0d353a4 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -262,8 +262,8 @@ GDK_AVAILABLE_IN_ALL
gchar ** gtk_clipboard_wait_for_uris (GtkClipboard *clipboard);
GDK_AVAILABLE_IN_ALL
gboolean gtk_clipboard_wait_for_targets (GtkClipboard *clipboard,
- GdkAtom **targets,
- gint *n_targets);
+ GdkAtom **formats,
+ gint *n_formats);
GDK_AVAILABLE_IN_3_94
cairo_surface_t * gtk_clipboard_wait_for_surface (GtkClipboard *clipboard);
@@ -283,7 +283,7 @@ gboolean gtk_clipboard_wait_is_target_available (GtkClipboard *clipboard,
GDK_AVAILABLE_IN_ALL
void gtk_clipboard_set_can_store (GtkClipboard *clipboard,
- GdkContentFormats *targets);
+ GdkContentFormats *formats);
GDK_AVAILABLE_IN_ALL
void gtk_clipboard_store (GtkClipboard *clipboard);
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index b08a8a8..4038ac3 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -62,7 +62,7 @@ void gtk_drag_unhighlight (GtkWidget *widget);
GDK_AVAILABLE_IN_3_10
GdkDragContext *gtk_drag_begin_with_coordinates (GtkWidget *widget,
- GdkContentFormats *formats,
+ GdkContentFormats *targets,
GdkDragAction actions,
gint button,
GdkEvent *event,
diff --git a/gtk/gtkdragdest.h b/gtk/gtkdragdest.h
index 84a65a5..d69bd06 100644
--- a/gtk/gtkdragdest.h
+++ b/gtk/gtkdragdest.h
@@ -69,7 +69,7 @@ typedef enum {
GDK_AVAILABLE_IN_ALL
void gtk_drag_dest_set (GtkWidget *widget,
GtkDestDefaults flags,
- GdkContentFormats *formats,
+ GdkContentFormats *targets,
GdkDragAction actions);
GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkdragsource.h b/gtk/gtkdragsource.h
index 513d794..4fda28f 100644
--- a/gtk/gtkdragsource.h
+++ b/gtk/gtkdragsource.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
GDK_AVAILABLE_IN_ALL
void gtk_drag_source_set (GtkWidget *widget,
GdkModifierType start_button_mask,
- GdkContentFormats *formats,
+ GdkContentFormats *targets,
GdkDragAction actions);
GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 1ff842c..7789391 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -943,7 +943,7 @@ gtk_image_set_from_surface (GtkImage *image,
/**
* gtk_image_set_from_texture:
* @image: a #GtkImage
- * @surface: (nullable): a #GdkTexture or %NULL
+ * @texture: (nullable): a #GdkTexture or %NULL
*
* See gtk_image_new_from_texture() for details.
*
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index cd4b213..da5ed48 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -400,7 +400,6 @@ gtk_content_formats_add_image_targets (GdkContentFormats *list,
/**
* gtk_content_formats_add_uri_targets:
* @list: a #GdkContentFormats
- * @info: an ID that will be passed back to the application
*
* Appends the URI targets supported by #GtkSelectionData to
* the target list. All targets are added with the same @info.
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 5ee12bf..deaa220 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1238,7 +1238,7 @@ gtk_settings_create_for_display (GdkDisplay *display)
/**
* gtk_settings_get_for_display:
- * @screen: a #GdkDisplay.
+ * @display: a #GdkDisplay.
*
* Gets the #GtkSettings object for @display, creating it if necessary.
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]