[gtk+/gi-annotations-2: 8/8] TODO: sort out other annotations.
- From: Pavel Holejsovsky <pholejs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gi-annotations-2: 8/8] TODO: sort out other annotations.
- Date: Tue, 18 Jan 2011 05:49:35 +0000 (UTC)
commit a6e041ffa948fbe8b79ec46b5af22833920e67e0
Author: Pavel Holejsovsky <pholejs src gnome org>
Date: Tue Jan 18 06:19:02 2011 +0100
TODO: sort out other annotations.
gdk/gdk.c | 2 +-
gdk/gdkcursor.c | 2 +-
gdk/gdkkeys.c | 2 +-
gdk/gdkrectangle.c | 4 ++--
gdk/gdkwindow.c | 12 ++++++------
gdk/x11/gdkselection-x11.c | 6 +++---
gtk/gtkaction.c | 7 ++++---
gtk/gtkbutton.c | 2 +-
gtk/gtkclipboard.c | 2 +-
gtk/gtkdialog.c | 3 ++-
gtk/gtkfilechooser.c | 6 +++---
gtk/gtkicontheme.c | 16 ++++++++--------
gtk/gtkiconview.c | 2 +-
gtk/gtkimage.c | 11 +++++------
gtk/gtkimcontextsimple.c | 2 +-
gtk/gtkmenu.c | 10 +++++-----
gtk/gtkradioaction.c | 7 ++++---
gtk/gtkradiobutton.c | 6 +++---
gtk/gtkradiomenuitem.c | 4 ++--
gtk/gtkrc.c | 6 +++---
gtk/gtkrecentaction.c | 14 ++++++++------
gtk/gtkscale.c | 4 ++--
gtk/gtkselection.c | 10 +++++-----
gtk/gtkstatusicon.c | 16 ++++++++--------
gtk/gtkstylecontext.c | 2 +-
gtk/gtkstyleproperties.c | 4 ++--
gtk/gtktestutils.c | 2 +-
gtk/gtktoggleaction.c | 7 ++++---
gtk/gtktoolbar.c | 3 +--
gtk/gtktreemodel.c | 4 ++--
gtk/gtktreemodelfilter.c | 8 ++++----
gtk/gtktreesortable.c | 8 ++++----
gtk/gtktreeview.c | 12 ++++++------
gtk/gtktreeviewcolumn.c | 2 +-
gtk/gtkwindow.c | 8 ++++----
35 files changed, 110 insertions(+), 106 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index fbb6581..47e4742 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -777,7 +777,7 @@ gdk_threads_dispatch_free (gpointer data)
/**
* gdk_threads_add_idle_full:
* @priority: the priority of the idle source. Typically this will be in the
- * range btweeen #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE
+ * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE
* @function: function to call
* @data: data to pass to @function
* @notify: (allow-none): function to call when the idle is removed, or %NULL
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index b28064f..f9a5a6e 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -355,7 +355,7 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_pixbuf (display, pixbuf, x, y);
}
-/**
+/**
* gdk_cursor_get_display:
* @cursor: a #GdkCursor.
*
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 4b89188..74d8329 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -284,7 +284,7 @@ gdk_keyval_is_lower (guint keyval)
return FALSE;
}
-/**
+/**
* gdk_keymap_get_default:
*
* Returns the #GdkKeymap attached to the default display.
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 2e104c3..0676841 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -83,8 +83,8 @@ gdk_rectangle_union (const GdkRectangle *src1,
* gdk_rectangle_intersect:
* @src1: a #GdkRectangle
* @src2: a #GdkRectangle
- * @dest: (out caller-allocates) (allow-none): return location for the
- * intersection of @src1 and @src2, or %NULL
+ * @dest: (out) (allow-none): return location for the intersection of
+ * @src1 and @src2, or %NULL
*
* Calculates the intersection of two rectangles. It is allowed for
* @dest to be the same as either @src1 or @src2. If the rectangles
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4feec5a..ed96e26 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -10168,8 +10168,8 @@ gdk_window_set_focus_on_map (GdkWindow *window,
/**
* gdk_window_set_icon_list:
* @window: The #GdkWindow toplevel window to set the icon of.
- * @pixbufs: (transfer none) (element-type GdkPixbuf):
- * A list of pixbufs, of different sizes.
+ * @pixbufs: (element-type GdkPixbuf): A list of pixbufs, of different
+ * sizes.
*
* Sets a list of icons for the window. One of these will be used
* to represent the window when it has been iconified. The icon is
@@ -10677,8 +10677,8 @@ gdk_window_register_dnd (GdkWindow *window)
/**
* gdk_drag_begin:
* @window: the source window for this drag.
- * @targets: (transfer none) (element-type GdkAtom): the offered targets,
- * as list of #GdkAtoms
+ * @targets: (element-type GdkAtom): the offered targets, as list of
+ * #GdkAtoms
*
* Starts a drag and creates a new drag context for it.
* This function assumes that the drag is controlled by the
@@ -10706,8 +10706,8 @@ gdk_drag_begin (GdkWindow *window,
* gdk_drag_begin_for_device:
* @window: the source window for this drag
* @device: the device that controls this drag
- * @targets: (transfer none) (element-type GdkAtom): the offered targets,
- * as list of #GdkAtoms
+ * @targets: (element-type GdkAtom): the offered targets, as list of
+ * #GdkAtoms
*
* Starts a drag and creates a new drag context for it.
*
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 66ddd21..30d2684 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -340,7 +340,7 @@ _gdk_x11_display_send_selection_notify (GdkDisplay *display,
* @format: the format of the property
* @text: The text data
* @length: The number of items to transform
- * @list: location to store an array of strings in
+ * @list: (out) (array): location to store an array of strings in
* the encoding of the current locale. This array should be
* freed using gdk_free_text_list().
*
@@ -395,7 +395,7 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay *display,
/**
* gdk_x11_free_text_list:
- * @list: the value stored in the @list parameter by
+ * @list: (array): the value stored in the @list parameter by
* a call to gdk_x11_display_text_property_to_text_list().
*
* Frees the array of strings created by
@@ -775,7 +775,7 @@ gdk_x11_display_utf8_to_compound_text (GdkDisplay *display,
/**
* gdk_x11_free_compound_text:
- * @ctext: The pointer stored in @ctext from a call to
+ * @ctext: (array): The pointer stored in @ctext from a call to
* gdk_x11_display_string_to_compound_text().
*
* Frees the data returned from gdk_x11_display_string_to_compound_text().
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 52935a3..45a93a0 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -506,10 +506,11 @@ gtk_action_buildable_get_name (GtkBuildable *buildable)
/**
* gtk_action_new:
* @name: A unique name for the action
- * @label: (allow-none): the label displayed in menu items and on buttons, or %NULL
+ * @label: (allow-none): the label displayed in menu items and on buttons,
+ * or %NULL
* @tooltip: (allow-none): a tooltip for the action, or %NULL
- * @stock_id: the stock icon to display in widgets representing the
- * action, or %NULL
+ * @stock_id: (allow-none): the stock icon to display in widgets representing
+ * the action, or %NULL
*
* Creates a new #GtkAction object. To add the action to a
* #GtkActionGroup and set the accelerator for the action,
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 8e01c22..3d3bd86 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -301,7 +301,7 @@ gtk_button_class_init (GtkButtonClass *klass)
GTK_PARAM_READWRITE));
/**
- * GtkButton::image:
+ * GtkButton:image:
*
* The child widget to appear next to the button text.
*
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 2bf5cef..a504fbf 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1533,7 +1533,7 @@ clipboard_uris_received_func (GtkClipboard *clipboard,
* for the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait.
*
- * Return value: (array zero-terminated=1) (element-type utf8) (transfer full): a newly-allocated
+ * Return value: (array zero-terminated=1) (transfer full): a newly-allocated
* %NULL-terminated array of strings which must
* be freed with g_strfreev(), or %NULL if
* retrieving the selection data failed. (This
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 975a202..99d00b3 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1131,7 +1131,8 @@ gtk_dialog_run (GtkDialog *dialog)
* Gets the widget button that uses the given response ID in the action area
* of a dialog.
*
- * Returns: (transfer none):the @widget button that uses the given @response_id, or %NULL.
+ * Returns: (transfer none): the @widget button that uses the given
+ * @response_id, or %NULL.
*
* Since: 2.20
*/
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 1b782a7..9243612 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -2448,9 +2448,9 @@ gtk_file_chooser_remove_shortcut_folder_uri (GtkFileChooser *chooser,
* Queries the list of shortcut folders in the file chooser, as set by
* gtk_file_chooser_add_shortcut_folder_uri().
*
- * Return value: (element-type utf8) (transfer full): A list of folder URIs, or %NULL if there are no shortcut
- * folders. Free the returned list with g_slist_free(), and the URIs with
- * g_free().
+ * Return value: (element-type utf8) (transfer full): A list of folder
+ * URIs, or %NULL if there are no shortcut folders. Free the returned
+ * list with g_slist_free(), and the URIs with g_free().
*
* Since: 2.4
**/
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 8103be4..f67762f 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -838,8 +838,8 @@ gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme,
/**
* gtk_icon_theme_set_custom_theme:
* @icon_theme: a #GtkIconTheme
- * @theme_name: name of icon theme to use instead of configured theme,
- * or %NULL to unset a previously set custom theme
+ * @theme_name: (allow-none): name of icon theme to use instead of
+ * configured theme, or %NULL to unset a previously set custom theme
*
* Sets the name of the icon theme that the #GtkIconTheme object uses
* overriding system configuration. This function cannot be called
@@ -1724,8 +1724,8 @@ add_key_to_list (gpointer key,
/**
* gtk_icon_theme_list_icons:
* @icon_theme: a #GtkIconTheme
- * @context: a string identifying a particular type of icon,
- * or %NULL to list all icons.
+ * @context: (allow-none): a string identifying a particular type of
+ * icon, or %NULL to list all icons.
*
* Lists the icons in the current icon theme. Only a subset
* of the icons can be listed by providing a context string.
@@ -1795,10 +1795,10 @@ gtk_icon_theme_list_icons (GtkIconTheme *icon_theme,
* Gets the list of contexts available within the current
* hierarchy of icon themes
*
- * Return value: (element-type utf8) (transfer full): a #GList list holding the names of all the
- * contexts in the theme. You must first free each element
- * in the list with g_free(), then free the list itself
- * with g_list_free().
+ * Return value: (element-type utf8) (transfer full): a #GList list
+ * holding the names of all the contexts in the theme. You must first
+ * free each element in the list with g_free(), then free the list
+ * itself with g_list_free().
*
* Since: 2.12
**/
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index cea7b10..161de84 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4563,7 +4563,7 @@ gtk_icon_view_set_tooltip_column (GtkIconView *icon_view,
g_object_notify (G_OBJECT (icon_view), "tooltip-column");
}
-/**
+/**
* gtk_icon_view_get_tooltip_column:
* @icon_view: a #GtkIconView
*
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 278a127..0055503 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1108,7 +1108,7 @@ gtk_image_get_pixbuf (GtkImage *image)
* @image: a #GtkImage
* @stock_id: (out) (transfer none) (allow-none): place to store a
* stock icon name, or %NULL
- * @size: (out) (allow-none) (type int): place to store a stock icon
+ * @size: (type int) (out) (allow-none): place to store a stock icon
* size, or %NULL
*
* Gets the stock icon name and size being displayed by the #GtkImage.
@@ -1146,7 +1146,7 @@ gtk_image_get_stock (GtkImage *image,
* @image: a #GtkImage
* @icon_set: (out) (transfer none) (allow-none): location to store a
* #GtkIconSet, or %NULL
- * @size: (out) (allow-none) (type int): location to store a stock
+ * @size: (type int) (out) (allow-none): location to store a stock
* icon size, or %NULL
*
* Gets the icon set and size being displayed by the #GtkImage.
@@ -1209,9 +1209,8 @@ gtk_image_get_animation (GtkImage *image)
/**
* gtk_image_get_icon_name:
* @image: a #GtkImage
- * @icon_name: (out) (transfer none) (allow-none): place to store an
- * icon name, or %NULL
- * @size: (out) (allow-none) (type int): place to store an icon size,
+ * @icon_name: (out) (allow-none): place to store an icon name, or %NULL
+ * @size: (type int) (out) (allow-none): place to store an icon size,
* or %NULL
*
* Gets the icon name and size being displayed by the #GtkImage.
@@ -1251,7 +1250,7 @@ gtk_image_get_icon_name (GtkImage *image,
* @image: a #GtkImage
* @gicon: (out) (transfer none) (allow-none): place to store a
* #GIcon, or %NULL
- * @size: (out) (allow-none) (type int): place to store an icon size,
+ * @size: (type int) (out) (allow-none): place to store an icon size,
* or %NULL
*
* Gets the #GIcon and size being displayed by the #GtkImage.
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index d5427af..a68886f 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -155,7 +155,7 @@ gtk_im_context_simple_finalize (GObject *obj)
G_OBJECT_CLASS (gtk_im_context_simple_parent_class)->finalize (obj);
}
-/**
+/**
* gtk_im_context_simple_new:
*
* Creates a new #GtkIMContextSimple.
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b81767c..51a220c 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1337,9 +1337,9 @@ gtk_menu_remove (GtkContainer *container,
/**
* gtk_menu_new:
*
- * Creates a new #GtkMenu.
+ * Creates a new #GtkMenu
*
- * Returns: a new #GtkMenu.
+ * Returns: a new #GtkMenu
*/
GtkWidget*
gtk_menu_new (void)
@@ -1444,7 +1444,7 @@ popup_grab_on_window (GdkWindow *window,
/**
* gtk_menu_popup_for_device:
- * @menu: a #GtkMenu.
+ * @menu: a #GtkMenu
* @device: (allow-none): a #GdkDevice
* @parent_menu_shell: (allow-none): the menu shell containing the triggering
* menu item, or %NULL
@@ -1452,8 +1452,8 @@ popup_grab_on_window (GdkWindow *window,
* the popup, or %NULL
* @func: (allow-none): a user supplied function used to position the menu,
* or %NULL
- * @data: (allow-none): user supplied data to be passed to @func
- * @destroy: (allow-none): destroy notify for @data
+ * @data: user supplied data to be passed to @func
+ * @destroy: destroy notify for @data
* @button: the mouse button which was pressed to initiate the event
* @activate_time: the time at which the activation event occurred
*
diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c
index 47cb3f4..e225825 100644
--- a/gtk/gtkradioaction.c
+++ b/gtk/gtkradioaction.c
@@ -193,10 +193,11 @@ gtk_radio_action_init (GtkRadioAction *action)
/**
* gtk_radio_action_new:
* @name: A unique name for the action
- * @label: (allow-none): The label displayed in menu items and on buttons, or %NULL
+ * @label: (allow-none): The label displayed in menu items and on buttons,
+ * or %NULL
* @tooltip: (allow-none): A tooltip for this action, or %NULL
- * @stock_id: The stock icon to display in widgets representing this
- * action, or %NULL
+ * @stock_id: (allow-none): The stock icon to display in widgets representing
+ * this action, or %NULL
* @value: The value which gtk_radio_action_get_current_value() should
* return if this action is selected.
*
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index c2380d7..2ec2098 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -175,7 +175,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
/**
* GtkRadioButton::group-changed:
- * @style: the object which received the signal
+ * @button: the object which received the signal
*
* Emitted when the group of radio buttons that a radio button belongs
* to changes. This is emitted when a radio button switches from
@@ -267,8 +267,8 @@ gtk_radio_button_get_property (GObject *object,
/**
* gtk_radio_button_set_group:
* @radio_button: a #GtkRadioButton.
- * @group: (transfer none) (element-type GtkRadioButton): an existing radio
- * button group, such as one returned from gtk_radio_button_get_group().
+ * @group: (element-type GtkRadioButton): an existing radio button
+ * group, such as one returned from gtk_radio_button_get_group().
*
* Sets a #GtkRadioButton's group. It should be noted that this does not change
* the layout of your interface in any way, so if you are changing the group,
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 8da604d..f0b58cf 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -190,12 +190,12 @@ gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
/**
* gtk_radio_menu_item_new_with_label:
- * @group: (element-type GtkRadioMenuItem) (transfer full):
+ * @group: (element-type GtkRadioMenuItem):
* @label: the text for the label
*
* Creates a new #GtkRadioMenuItem whose child is a simple #GtkLabel.
*
- * Returns: (transfer none): A new #GtkRadioMenuItem
+ * Returns: A new #GtkRadioMenuItem
*/
GtkWidget*
gtk_radio_menu_item_new_with_label (GSList *group,
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 0d239e2..fa5789b 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -753,9 +753,9 @@ gtk_rc_reparse_all (void)
* created styles, so a new style may not be
* created.)
*
- * Returns: the resulting style. No refcount is added
- * to the returned style, so if you want to save this
- * style around, you should add a reference yourself.
+ * Returns: (transfer none): the resulting style. No refcount is added
+ * to the returned style, so if you want to save this style around,
+ * you should add a reference yourself.
*
* Deprecated:3.0: Use #GtkStyleContext instead
**/
diff --git a/gtk/gtkrecentaction.c b/gtk/gtkrecentaction.c
index 5d73594..0866eed 100644
--- a/gtk/gtkrecentaction.c
+++ b/gtk/gtkrecentaction.c
@@ -670,10 +670,11 @@ gtk_recent_action_init (GtkRecentAction *action)
/**
* gtk_recent_action_new:
* @name: a unique name for the action
- * @label: (allow-none): the label displayed in menu items and on buttons, or %NULL
+ * @label: (allow-none): the label displayed in menu items and on buttons,
+ * or %NULL
* @tooltip: (allow-none): a tooltip for the action, or %NULL
- * @stock_id: the stock icon to display in widgets representing the
- * action, or %NULL
+ * @stock_id: (allow-none): the stock icon to display in widgets representing
+ the action, or %NULL
*
* Creates a new #GtkRecentAction object. To add the action to
* a #GtkActionGroup and set the accelerator for the action,
@@ -702,10 +703,11 @@ gtk_recent_action_new (const gchar *name,
/**
* gtk_recent_action_new_for_manager:
* @name: a unique name for the action
- * @label: (allow-none): the label displayed in menu items and on buttons, or %NULL
+ * @label: (allow-none): the label displayed in menu items and on buttons,
+ * or %NULL
* @tooltip: (allow-none): a tooltip for the action, or %NULL
- * @stock_id: the stock icon to display in widgets representing the
- * action, or %NULL
+ * @stock_id: (allow-none): the stock icon to display in widgets representing
+ * the action, or %NULL
* @manager: (allow-none): a #GtkRecentManager, or %NULL for using the default
* #GtkRecentManager
*
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 6b878b9..a69ae84 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -510,8 +510,8 @@ gtk_scale_get_property (GObject *object,
/**
* gtk_scale_new:
* @orientation: the scale's orientation.
- * @adjustment: the #GtkAdjustment which sets the range of the scale, or
- * %NULL to create a new adjustment.
+ * @adjustment: (allow-none): the #GtkAdjustment which sets the range
+ * of the scale, or %NULL to create a new adjustment.
*
* Creates a new #GtkScale.
*
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 2a58b7d..fd01ba3 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1813,11 +1813,11 @@ gtk_selection_data_set_uris (GtkSelectionData *selection_data,
*
* Gets the contents of the selection data as array of URIs.
*
- * Return value: (array zero-terminated=1) (element-type utf8) (transfer full): if
- * the selection data contains a list of
- * URIs, a newly allocated %NULL-terminated string array
- * containing the URIs, otherwise %NULL. If the result is
- * non-%NULL it must be freed with g_strfreev().
+ * Return value: (array zero-terminated=1) (transfer full): if the
+ * selection data contains a list of URIs, a newly allocated
+ * %NULL-terminated string array containing the URIs, otherwise
+ * %NULL. If the result is non-%NULL it must be freed with
+ * g_strfreev().
*
* Since: 2.6
**/
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index a0eec0b..ad7d7d4 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2465,14 +2465,14 @@ gtk_status_icon_position_menu (GtkMenu *menu,
/**
* gtk_status_icon_get_geometry:
* @status_icon: a #GtkStatusIcon
- * @screen: (out) (transfer none) (allow-none): return location for the screen, or %NULL if the
- * information is not needed
- * @area: (out) (allow-none): return location for the area occupied by the status
- * icon, or %NULL
- * @orientation: (out) (allow-none): return location for the orientation of the panel
- * in which the status icon is embedded, or %NULL. A panel
- * at the top or bottom of the screen is horizontal, a panel
- * at the left or right is vertical.
+ * @screen: (out) (transfer none) (allow-none): return location for
+ * the screen, or %NULL if the information is not needed
+ * @area: (out) (allow-none): return location for the area occupied by
+ * the status icon, or %NULL
+ * @orientation: (out) (allow-none): return location for the
+ * orientation of the panel in which the status icon is embedded,
+ * or %NULL. A panel at the top or bottom of the screen is
+ * horizontal, a panel at the left or right is vertical.
*
* Obtains information about the location of the status icon
* on screen. This information can be used to e.g. position
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 2d7f4ac..b0d33cc 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1441,7 +1441,7 @@ gtk_style_context_remove_provider_for_screen (GdkScreen *screen,
* @context: a #GtkStyleContext
* @property: style property name
* @state: state to retrieve the property value for
- * @value: (out) (transfer full): return location for the style property value
+ * @value: (out): return location for the style property value
*
* Gets a style property from @context for the given state.
*
diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 33be17e..9cb4d75 100644
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -574,7 +574,7 @@ gtk_style_properties_map_color (GtkStyleProperties *props,
* Returns the symbolic color that is mapped
* to @name.
*
- * Returns: The mapped color
+ * Returns: (transfer none): The mapped color
*
* Since: 3.0
**/
@@ -915,7 +915,7 @@ _gtk_style_properties_peek_property (GtkStyleProperties *props,
* @props: a #GtkStyleProperties
* @property: style property name
* @state: state to retrieve the property value for
- * @value: (out) (transfer full): return location for the style property value.
+ * @value: (out): return location for the style property value.
*
* Gets a style property from @props for the given state. When done with @value,
* g_value_unset() needs to be called to free any allocated memory.
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index bdd374b..04ab636 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -37,7 +37,7 @@
/**
* gtk_test_init:
- * @argcp: Address of the <parameter>argc</parameter> parameter of the
+ * @argcp: (inout): Address of the <parameter>argc</parameter> parameter of the
* main() function. Changed if any arguments were handled.
* @argvp: (inout) (array length=argcp): Address of the
* <parameter>argv</parameter> parameter of main().
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 525d462..c36a924 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -166,10 +166,11 @@ gtk_toggle_action_init (GtkToggleAction *action)
/**
* gtk_toggle_action_new:
* @name: A unique name for the action
- * @label: (allow-none): The label displayed in menu items and on buttons, or %NULL
+ * @label: (allow-none): The label displayed in menu items and on buttons,
+ * or %NULL
* @tooltip: (allow-none): A tooltip for the action, or %NULL
- * @stock_id: The stock icon to display in widgets representing the
- * action, or %NULL
+ * @stock_id: (allow-none): The stock icon to display in widgets representing
+ * the action, or %NULL
*
* Creates a new #GtkToggleAction object. To add the action to
* a #GtkActionGroup and set the accelerator for the action,
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e222e08..7fd72ac 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3008,8 +3008,7 @@ gtk_toolbar_get_nth_item (GtkToolbar *toolbar,
*
* Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
*
- * Return value: (type int): the current icon size for the icons on
- * the toolbar.
+ * Return value: (type int): the current icon size for the icons on the toolbar.
**/
GtkIconSize
gtk_toolbar_get_icon_size (GtkToolbar *toolbar)
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index a6c075a..50ac472 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1153,8 +1153,8 @@ gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
*
* Returns the type of the column.
*
- * Return value: (transfer none): the type of the column
- */
+ * Return value: the type of the column
+ **/
GType
gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
gint index)
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 37886ba..f8431b9 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3113,8 +3113,8 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
* gtk_tree_model_filter_set_visible_func:
* @filter: A #GtkTreeModelFilter.
* @func: A #GtkTreeModelFilterVisibleFunc, the visible function.
- * @data: (allow-none): User data to pass to the visible function, or %NULL.
- * @destroy: (allow-none): Destroy notifier of @data, or %NULL.
+ * @data: User data to pass to the visible function, or %NULL.
+ * @destroy: Destroy notifier of @data, or %NULL.
*
* Sets the visible function used when filtering the @filter to be @func. The
* function should return %TRUE if the given row should be visible and
@@ -3173,8 +3173,8 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
* @n_columns: The number of columns in the filter model.
* @types: (array length=n_columns): The #GType<!-- -->s of the columns.
* @func: A #GtkTreeModelFilterModifyFunc
- * @data: (allow-none): User data to pass to the modify function, or %NULL.
- * @destroy: (allow-none): Destroy notifier of @data, or %NULL.
+ * @data: User data to pass to the modify function, or %NULL.
+ * @destroy: Destroy notifier of @data, or %NULL.
*
* With the @n_columns and @types parameters, you give an array of column
* types for this model (which will be exposed to the parent model/view).
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 111a3e5..f8b09a0 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -182,8 +182,8 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable,
* @sortable: A #GtkTreeSortable
* @sort_column_id: the sort column id to set the function for
* @sort_func: The comparison function
- * @user_data: (allow-none): User data to pass to @sort_func, or %NULL
- * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL
+ * @user_data: User data to pass to @sort_func, or %NULL
+ * @destroy: Destroy notifier of @user_data, or %NULL
*
* Sets the comparison function used when sorting to be @sort_func. If the
* current sort column id of @sortable is the same as @sort_column_id, then
@@ -214,8 +214,8 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
* gtk_tree_sortable_set_default_sort_func:
* @sortable: A #GtkTreeSortable
* @sort_func: The comparison function
- * @user_data: (allow-none): User data to pass to @sort_func, or %NULL
- * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL
+ * @user_data: User data to pass to @sort_func, or %NULL
+ * @destroy: Destroy notifier of @user_data, or %NULL
*
* Sets the default comparison function used when sorting to be @sort_func.
* If the current sort column id of @sortable is
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 47cb64b..c7a9bda 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14799,8 +14799,8 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view)
* gtk_tree_view_set_search_equal_func:
* @tree_view: A #GtkTreeView
* @search_equal_func: the compare function to use during the search
- * @search_user_data: (allow-none): user data to pass to @search_equal_func, or %NULL
- * @search_destroy: (allow-none): Destroy notifier for @search_user_data, or %NULL
+ * @search_user_data: user data to pass to @search_equal_func, or %NULL
+ * @search_destroy: Destroy notifier for @search_user_data, or %NULL
*
* Sets the compare function for the interactive search capabilities; note
* that somewhat like strcmp() returning 0 for equality
@@ -14920,8 +14920,8 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
* @tree_view: A #GtkTreeView
* @func: (allow-none): the function to use to position the search dialog, or %NULL
* to use the default search position function
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy: (allow-none): Destroy notifier for @data, or %NULL
+ * @data: user data to pass to @func, or %NULL
+ * @destroy: Destroy notifier for @data, or %NULL
*
* Sets the function to use when positioning the search dialog.
*
@@ -15817,8 +15817,8 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
* gtk_tree_view_set_row_separator_func:
* @tree_view: a #GtkTreeView
* @func: (allow-none): a #GtkTreeViewRowSeparatorFunc
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy: (allow-none): destroy notifier for @data, or %NULL
+ * @data: user data to pass to @func, or %NULL
+ * @destroy: destroy notifier for @data, or %NULL
*
* Sets the row separator function, which is used to determine
* whether a row should be drawn as a separator. If the row separator
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 2f93f65..ad338e8 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1770,7 +1770,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_set_cell_data_func:
* @tree_column: A #GtkTreeViewColumn
* @cell_renderer: A #GtkCellRenderer
- * @func: The #GtkTreeViewColumnFunc to use.
+ * @func: (allow-none): The #GtkTreeViewColumnFunc to use.
* @func_data: The user data for @func.
* @destroy: The destroy notification for @func_data
*
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 5cd2141..ddbde6e 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2629,7 +2629,7 @@ gtk_window_release_application (GtkWindow *window)
/**
* gtk_window_set_application:
* @window: a #GtkWindow
- * @application: a #GtkApplication, or %NULL
+ * @application: (allow-none): a #GtkApplication, or %NULL
*
* Sets or unsets the #GtkApplication associated with the window.
*
@@ -8048,7 +8048,7 @@ gtk_window_begin_move_drag (GtkWindow *window,
timestamp);
}
-/**
+/**
* gtk_window_set_screen:
* @window: a #GtkWindow.
* @screen: a #GdkScreen.
@@ -8335,8 +8335,8 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group,
*
* Returns a list of the #GtkWindows that belong to @window_group.
*
- * Returns: (element-type GtkWidget) (transfer container): A newly-allocated list of
- * windows inside the group.
+ * Returns: (element-type GtkWindow) (transfer container): A
+ * newly-allocated list of windows inside the group.
*
* Since: 2.14
**/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
