[gtk+/gi-annotations-2: 11/12] [GI] Remove annotations which have no effect
- From: Pavel Holejsovsky <pholejs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gi-annotations-2: 11/12] [GI] Remove annotations which have no effect
- Date: Tue, 18 Jan 2011 09:33:11 +0000 (UTC)
commit 475734e8df552a7472cc12dad66b17faaef3286a
Author: Pavel Holejsovsky <pholejs src gnome org>
Date: Tue Jan 18 10:13:46 2011 +0100
[GI] Remove annotations which have no effect
gdk/gdkrectangle.c | 4 ++--
gdk/gdkwindow.c | 12 ++++++------
gtk/gtkclipboard.c | 2 +-
gtk/gtkcombobox.c | 4 ++--
gtk/gtkcssprovider.c | 2 +-
gtk/gtkimage.c | 3 +--
gtk/gtkmenu.c | 4 ++--
gtk/gtkradiobutton.c | 4 ++--
gtk/gtkradiomenuitem.c | 4 ++--
gtk/gtkselection.c | 10 +++++-----
gtk/gtkstylecontext.c | 2 +-
gtk/gtkstyleproperties.c | 2 +-
gtk/gtkthemingengine.c | 6 +++---
gtk/gtktreemodel.c | 4 ++--
gtk/gtktreemodelfilter.c | 8 ++++----
gtk/gtktreesortable.c | 8 ++++----
gtk/gtktreeview.c | 12 ++++++------
gtk/gtkwindow.c | 2 +-
18 files changed, 46 insertions(+), 47 deletions(-)
---
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/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/gtkcombobox.c b/gtk/gtkcombobox.c
index 67002e0..eab3bc4 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4965,8 +4965,8 @@ gtk_combo_box_get_row_separator_func (GtkComboBox *combo_box)
* gtk_combo_box_set_row_separator_func:
* @combo_box: a #GtkComboBox
* @func: 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/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 7461fbf..43383d0 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -3446,7 +3446,7 @@ gtk_css_provider_load_from_data (GtkCssProvider *css_provider,
* gtk_css_provider_load_from_file:
* @css_provider: a #GtkCssProvider
* @file: #GFile pointing to a file to load
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Loads the data contained in @file into @css_provider, making it
* clear any previously loaded information.
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 278a127..ca0b7f5 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1209,8 +1209,7 @@ 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
+ * @icon_name: (out) (allow-none): place to store an icon name, or %NULL
* @size: (out) (allow-none) (type int): place to store an icon size,
* or %NULL
*
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b81767c..d789207 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -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/gtkradiobutton.c b/gtk/gtkradiobutton.c
index c2380d7..bcb7e77 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -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/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/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 965545e..9cb4d75 100644
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -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/gtkthemingengine.c b/gtk/gtkthemingengine.c
index a0d5255..e216721 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -392,9 +392,9 @@ gtk_theming_engine_register_property (const gchar *name_space,
* @engine: a #GtkThemingEngine
* @property: the property name
* @state: state to retrieve the value for
- * @value: (out) (transfer full): return location for the property value,
- * you must free this memory using g_value_unset() once you are
- * done with it.
+ * @value: (out): return location for the property value, you must
+ * free this memory using g_value_unset() once you are done
+ * with it.
*
* Gets a property value as retrieved from the style settings that apply
* to the currently rendered element.
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/gtkwindow.c b/gtk/gtkwindow.c
index 1f3b2f7..914b32f 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3719,7 +3719,7 @@ gtk_window_set_icon_from_file (GtkWindow *window,
/**
* gtk_window_set_default_icon_list:
- * @list: (element-type GdkPixbuf) (transfer container): a list of #GdkPixbuf
+ * @list: (element-type GdkPixbuf): a list of #GdkPixbuf
*
* Sets an icon list to be used as fallback for windows that haven't
* had gtk_window_set_icon_list() called on them to set up a
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]