diff options
| -rw-r--r-- | gdk/gdkdevice.c | 7 | ||||
| -rw-r--r-- | gdk/gdkrgba.c | 6 | ||||
| -rw-r--r-- | gtk/gtkapplication.c | 2 | ||||
| -rw-r--r-- | gtk/gtkradiobutton.c | 11 | ||||
| -rw-r--r-- | gtk/gtkradiomenuitem.c | 3 | ||||
| -rw-r--r-- | gtk/gtkselection.c | 8 | ||||
| -rw-r--r-- | gtk/gtkstatusicon.c | 11 |
7 files changed, 26 insertions, 22 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 1b772bae3b..e6ee01d5dd 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -912,9 +912,10 @@ _gdk_device_set_associated_device (GdkDevice *device, * the list of slave devices attached to it, otherwise it will return * %NULL * - * Returns: (transfer container): the list of slave devices, or %NULL. The - * list must be freed with g_list_free(), the contents of the list - * are owned by GTK+ and should not be freed. + * Returns: (transfer container) (element-type GdkDevice): the list of + * slave devices, or %NULL. The list must be freed with + * g_list_free(), the contents of the list are owned by GTK+ + * and should not be freed. **/ GList * gdk_device_list_slave_devices (GdkDevice *device) diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c index 97c4071119..de06cb27c7 100644 --- a/gdk/gdkrgba.c +++ b/gdk/gdkrgba.c @@ -272,7 +272,7 @@ gdk_rgba_parse (GdkRGBA *rgba, /** * gdk_rgba_hash: - * @p: a #GdkRGBA pointer. + * @p: (type GdkRGBA): a #GdkRGBA pointer. * * A hash function suitable for using for a hash * table that stores #GdkRGBA<!-- -->s. @@ -294,8 +294,8 @@ gdk_rgba_hash (gconstpointer p) /** * gdk_rgba_equal: - * @p1: a #GdkRGBA pointer. - * @p2: another #GdkRGBA pointer. + * @p1: (type GdkRGBA): a #GdkRGBA pointer. + * @p2: (type GdkRGBA): another #GdkRGBA pointer. * * Compares two RGBA colors. * diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index 2d68b0994f..701a0e8119 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -253,7 +253,7 @@ gtk_application_remove_window (GtkApplication *application, * * The list that is returned should not be modified in any way. * - * Returns: a #GList of #GtkWindow + * Returns: (element-type GtkWindow) (transfer none): a #GList of #GtkWindow * * Since: 3.0 **/ diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 0eff06f197..b6546ffaa0 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -403,8 +403,8 @@ gtk_radio_button_join_group (GtkRadioButton *radio_button, /** * gtk_radio_button_new: - * @group: (allow-none): an existing radio button group, or %NULL if you are - * creating a new group. + * @group: (element-type GtkRadioButton) (allow-none): an existing + * radio button group, or %NULL if you are creating a new group. * * Creates a new #GtkRadioButton. To be of any practical value, a widget should * then be packed into the radio button. @@ -426,8 +426,8 @@ gtk_radio_button_new (GSList *group) /** * gtk_radio_button_new_with_label: - * @group: (allow-none): an existing radio button group, or %NULL if you are - * creating a new group. + * @group: (element-type GtkRadioButton) (allow-none): an existing + * radio button group, or %NULL if you are creating a new group. * @label: the text label to display next to the radio button. * * Creates a new #GtkRadioButton with a text label. @@ -451,7 +451,8 @@ gtk_radio_button_new_with_label (GSList *group, /** * gtk_radio_button_new_with_mnemonic: - * @group: (allow-none): the radio button group + * @group: (element-type GtkRadioButton) (allow-none): the radio button + * group * @label: the text of the button, with an underscore in front of the * mnemonic character * diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index e8750266fa..78cfea7398 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -331,7 +331,8 @@ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group, * Returns the group to which the radio menu item belongs, as a #GList of * #GtkRadioMenuItem. The list belongs to GTK+ and should not be freed. * - * Returns: (transfer none): the group of @radio_menu_item + * Returns: (element-type GtkRadioMenuItem) (transfer none): the group + * of @radio_menu_item */ GSList* gtk_radio_menu_item_get_group (GtkRadioMenuItem *radio_menu_item) diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 4063bb2d05..2385c969a3 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1213,7 +1213,7 @@ gtk_selection_data_get_format (const GtkSelectionData *selection_data) } /** - * gtk_selection_data_get_data: + * gtk_selection_data_get_data: (skip) * @selection_data: a pointer to a #GtkSelectionData structure. * * Retrieves the raw data of the selection. @@ -1596,9 +1596,9 @@ gtk_selection_data_set_text (GtkSelectionData *selection_data, * * Gets the contents of the selection data as a UTF-8 string. * - * Return value: if the selection data contained a recognized - * text type and it could be converted to UTF-8, a newly allocated - * string containing the converted text, otherwise %NULL. + * Return value: (type utf8): if the selection data contained a + * recognized text type and it could be converted to UTF-8, a newly + * allocated string containing the converted text, otherwise %NULL. * If the result is non-%NULL it must be freed with g_free(). **/ guchar * diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index c22b0a87b4..ad7d7d409f 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -2337,11 +2337,12 @@ gtk_status_icon_is_embedded (GtkStatusIcon *status_icon) /** * gtk_status_icon_position_menu: * @menu: the #GtkMenu - * @x: return location for the x position - * @y: return location for the y position - * @push_in: whether the first menu item should be offset (pushed in) to be - * aligned with the menu popup position (only useful for GtkOptionMenu). - * @user_data: the status icon to position the menu on + * @x: (out): return location for the x position + * @y: (out): return location for the y position + * @push_in: (out): whether the first menu item should be offset + * (pushed in) to be aligned with the menu popup position + * (only useful for GtkOptionMenu). + * @user_data: (type GtkStatusIcon): the status icon to position the menu on * * Menu positioning function to use with gtk_menu_popup() * to position @menu aligned to the status icon @user_data. |