From e655806752d5df7ed05392442516285ee3c5a964 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Tue, 25 Nov 2014 14:24:54 -0600 Subject: [PATCH] Revert "Replaced deprecated "Rename to" GTK-Doc tag" Forgot to tag the release; going to revert, tag, then re-apply. This reverts commit b7bd063e3cd805bc50bf03c5e12087b1553436a2. --- atspi/atspi-accessible.c | 33 ++++++++++++++++++++++----------- atspi/atspi-action.c | 6 ++++-- atspi/atspi-document.c | 6 ++++-- atspi/atspi-text.c | 6 ++++-- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c index 2d77357..3a1c93c 100644 --- a/atspi/atspi-accessible.c +++ b/atspi/atspi-accessible.c @@ -1103,7 +1103,7 @@ atspi_accessible_is_value (AtspiAccessible *obj) } /** - * atspi_accessible_get_action: (rename-to atspi_accessible_get_action_iface) + * atspi_accessible_get_action: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiAction interface for an #AtspiAccessible. @@ -1112,6 +1112,7 @@ atspi_accessible_is_value (AtspiAccessible *obj) * instance, or NULL if @obj does not implement #AtspiAction. * * Deprecated: 2.10: Use atspi_accessible_get_action_iface instead. + * Rename to: atspi_accessible_get_action_iface **/ AtspiAction * atspi_accessible_get_action (AtspiAccessible *accessible) @@ -1137,7 +1138,7 @@ atspi_accessible_get_action_iface (AtspiAccessible *accessible) } /** - * atspi_accessible_get_collection: (rename-to atspi_accessible_get_collection_iface) + * atspi_accessible_get_collection: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiCollection interface for an #AtspiAccessible. @@ -1146,6 +1147,7 @@ atspi_accessible_get_action_iface (AtspiAccessible *accessible) * instance, or NULL if @obj does not implement #AtspiCollection. * * Deprecated: 2.10: Use atspi_accessible_get_collection_iface instead. + * Rename to: atspi_accessible_get_collection_iface **/ AtspiCollection * atspi_accessible_get_collection (AtspiAccessible *accessible) @@ -1171,7 +1173,7 @@ atspi_accessible_get_collection_iface (AtspiAccessible *accessible) } /** - * atspi_accessible_get_component: (rename-to atspi_accessible_get_component_iface) + * atspi_accessible_get_component: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiComponent interface for an #AtspiAccessible. @@ -1180,6 +1182,7 @@ atspi_accessible_get_collection_iface (AtspiAccessible *accessible) * instance, or NULL if @obj does not implement #AtspiComponent. * * Deprecated: 2.10: Use atspi_accessible_get_component_iface instead. + * Rename to: atspi_accessible_get_component_iface **/ AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj) @@ -1205,7 +1208,7 @@ atspi_accessible_get_component_iface (AtspiAccessible *obj) } /** - * atspi_accessible_get_document: (rename-to atspi_accessible_get_document_iface) + * atspi_accessible_get_document: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiDocument interface for an #AtspiAccessible. @@ -1214,6 +1217,7 @@ atspi_accessible_get_component_iface (AtspiAccessible *obj) * instance, or NULL if @obj does not implement #AtspiDocument. * * Deprecated: 2.10: Use atspi_accessible_get_document_iface instead. + * Rename to: atspi_accessible_get_document_iface **/ AtspiDocument * atspi_accessible_get_document (AtspiAccessible *accessible) @@ -1239,7 +1243,7 @@ atspi_accessible_get_document_iface (AtspiAccessible *accessible) } /** - * atspi_accessible_get_editable_text: (rename-to atspi_accessible_get_editable_text_iface) + * atspi_accessible_get_editable_text: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiEditableText interface for an #AtspiAccessible. @@ -1248,6 +1252,7 @@ atspi_accessible_get_document_iface (AtspiAccessible *accessible) * instance, or NULL if @obj does not implement #AtspiEditableText. * * Deprecated: 2.10: Use atspi_accessible_get_editable_text_iface instead. + * Rename to: atspi_accessible_get_editable_text_iface **/ AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *accessible) @@ -1289,7 +1294,7 @@ atspi_accessible_get_hyperlink (AtspiAccessible *accessible) } /** - * atspi_accessible_get_hypertext: (rename-to atspi_accessible_get_hypertext_iface) + * atspi_accessible_get_hypertext: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiHypertext interface for an #AtspiAccessible. @@ -1298,6 +1303,7 @@ atspi_accessible_get_hyperlink (AtspiAccessible *accessible) * instance, or NULL if @obj does not implement #AtspiHypertext. * * Deprecated: 2.10: Use atspi_accessible_get_hypertext_iface instead. + * Rename to: atspi_accessible_get_hypertext_iface **/ AtspiHypertext * atspi_accessible_get_hypertext (AtspiAccessible *accessible) @@ -1323,7 +1329,7 @@ atspi_accessible_get_hypertext_iface (AtspiAccessible *accessible) } /** - * atspi_accessible_get_image: (rename-to atspi_accessible_get_image_iface) + * atspi_accessible_get_image: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiImage interface for an #AtspiAccessible. @@ -1332,6 +1338,7 @@ atspi_accessible_get_hypertext_iface (AtspiAccessible *accessible) * NULL if @obj does not implement #AtspiImage. * * Deprecated: 2.10: Use atspi_accessible_get_image_iface instead. + * Rename to: atspi_accessible_get_image_iface **/ AtspiImage * atspi_accessible_get_image (AtspiAccessible *accessible) @@ -1357,7 +1364,7 @@ atspi_accessible_get_image_iface (AtspiAccessible *accessible) } /** - * atspi_accessible_get_selection: (rename-to atspi_accessible_get_selection_iface) + * atspi_accessible_get_selection: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiSelection interface for an #AtspiAccessible. @@ -1366,6 +1373,7 @@ atspi_accessible_get_image_iface (AtspiAccessible *accessible) * instance, or NULL if @obj does not implement #AtspiSelection. * * Deprecated: 2.10: Use atspi_accessible_get_selection_iface instead. + * Rename to: atspi_accessible_get_selection_iface **/ AtspiSelection * atspi_accessible_get_selection (AtspiAccessible *accessible) @@ -1409,7 +1417,7 @@ atspi_accessible_get_streamable_content (AtspiAccessible *accessible) #endif /** - * atspi_accessible_get_table: (rename-to atspi_accessible_get_table_iface) + * atspi_accessible_get_table: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiTable interface for an #AtspiAccessible. @@ -1418,6 +1426,7 @@ atspi_accessible_get_streamable_content (AtspiAccessible *accessible) * NULL if @obj does not implement #AtspiTable. * * Deprecated: 2.10: Use atspi_accessible_get_table_iface instead. + * Rename to: atspi_accessible_get_table_iface **/ AtspiTable * atspi_accessible_get_table (AtspiAccessible *obj) @@ -1459,7 +1468,7 @@ atspi_accessible_get_table_cell (AtspiAccessible *obj) } /** - * atspi_accessible_get_text: (rename-to atspi_accessible_get_text_iface) + * atspi_accessible_get_text: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiTable interface for an #AtspiAccessible. @@ -1468,6 +1477,7 @@ atspi_accessible_get_table_cell (AtspiAccessible *obj) * NULL if @obj does not implement #AtspiText. * * Deprecated: 2.10: Use atspi_accessible_get_text_iface instead. + * Rename to: atspi_accessible_get_text_iface **/ AtspiText * atspi_accessible_get_text (AtspiAccessible *obj) @@ -1493,7 +1503,7 @@ atspi_accessible_get_text_iface (AtspiAccessible *obj) } /** - * atspi_accessible_get_value: (rename-to atspi_accessible_get_value_iface) + * atspi_accessible_get_value: * @obj: a pointer to the #AtspiAccessible instance to query. * * Gets the #AtspiTable interface for an #AtspiAccessible. @@ -1502,6 +1512,7 @@ atspi_accessible_get_text_iface (AtspiAccessible *obj) * NULL if @obj does not implement #AtspiValue. * * Deprecated: 2.10: Use atspi_accessible_get_value_iface instead. + * Rename to: atspi_accessible_get_value_iface **/ AtspiValue * atspi_accessible_get_value (AtspiAccessible *accessible) diff --git a/atspi/atspi-action.c b/atspi/atspi-action.c index 731773a..17b6302 100644 --- a/atspi/atspi-action.c +++ b/atspi/atspi-action.c @@ -44,7 +44,7 @@ atspi_action_get_n_actions (AtspiAction *obj, GError **error) } /** - * atspi_action_get_description: (rename-to atspi_action_get_action_description) + * atspi_action_get_description: * @obj: a pointer to the #AtspiAction implementor to query. * @i: an integer indicating which action to query. * @@ -54,6 +54,7 @@ atspi_action_get_n_actions (AtspiAction *obj, GError **error) * Returns: a UTF-8 string describing the '@i-th' invocable action. * * Deprecated: 2.10: Use atspi_action_get_action_description instead. + * Rename to: atspi_action_get_action_description **/ gchar * atspi_action_get_description (AtspiAction *obj, int i, GError **error) @@ -128,7 +129,7 @@ atspi_action_get_key_binding (AtspiAction *obj, gint i, GError **error) } /** - * atspi_action_get_name: (rename-to atspi_action_get_action_name) + * atspi_action_get_name: * @obj: a pointer to the #AtspiAction implementor to query. * @i: an integer indicating which action to query. * @@ -138,6 +139,7 @@ atspi_action_get_key_binding (AtspiAction *obj, gint i, GError **error) * Returns: the non-localized name of the action, as a UTF-8 string. * * Deprecated: 2.10: Use atspi_action_get_action_name instead. + * Rename to: atspi_action_get_action_name **/ gchar * atspi_action_get_name (AtspiAction *obj, gint i, GError **error) diff --git a/atspi/atspi-document.c b/atspi/atspi-document.c index 98dfc4f..bd3ac4c 100644 --- a/atspi/atspi-document.c +++ b/atspi/atspi-document.c @@ -45,7 +45,7 @@ atspi_document_get_locale (AtspiDocument *obj, GError **error) } /** - * atspi_document_get_attribute_value: (rename-to atspi_document_get_document_attribute_value) + * atspi_document_get_attribute_value: * @obj: a pointer to the #AtspiDocument object on which to operate. * @attribute: a string indicating the name of a specific attribute. * @@ -55,6 +55,7 @@ atspi_document_get_locale (AtspiDocument *obj, GError **error) * an empty string if the attribute is unspecified for the object. * * Deprecated: 2.10: Use atspi_document_get_document_attribute_value instead. + * Rename to: atspi_document_get_document_attribute_value **/ gchar * atspi_document_get_attribute_value (AtspiDocument *obj, @@ -93,7 +94,7 @@ atspi_document_get_document_attribute_value (AtspiDocument *obj, /** - * atspi_document_get_attributes: (rename-to atspi_document_get_document_attributes) + * atspi_document_get_attributes: * @obj: a pointer to the #AtspiDocument object on which to operate. * * Gets all constant attributes for the document as a whole. For attributes @@ -103,6 +104,7 @@ atspi_document_get_document_attribute_value (AtspiDocument *obj, * containing the constant attributes of the document, as name-value pairs. * * Deprecated: 2.10: Use atspi_document_get_document_attributes instead. + * Rename to: atspi_document_get_document_attributes **/ GHashTable * atspi_document_get_attributes (AtspiDocument *obj, GError **error) diff --git a/atspi/atspi-text.c b/atspi/atspi-text.c index 6639fd4..98a454b 100644 --- a/atspi/atspi-text.c +++ b/atspi/atspi-text.c @@ -138,7 +138,7 @@ atspi_text_get_caret_offset (AtspiText *obj, GError **error) } /** - * atspi_text_get_attributes: (rename-to atspi_text_get_text_attributes) + * atspi_text_get_attributes: * @obj: a pointer to the #AtspiText object to query. * @offset: a #gint indicating the offset from which the attribute * search is based. @@ -156,6 +156,7 @@ atspi_text_get_caret_offset (AtspiText *obj, GError **error) * describing the attributes at the given character offset. * * Deprecated: 2.10: Use atspi_text_get_text_attributes instead. + * Rename to: atspi_text_get_text_attributes **/ GHashTable * atspi_text_get_attributes (AtspiText *obj, @@ -279,7 +280,7 @@ atspi_text_get_attribute_run (AtspiText *obj, } /** - * atspi_text_get_attribute_value: (rename-to atspi_text_get_text_attribute_value) + * atspi_text_get_attribute_value: * @obj: a pointer to the #AtspiText object to query. * @offset: The character offset at which to query the attribute. * @attribute_name: The attribute to query. @@ -290,6 +291,7 @@ atspi_text_get_attribute_run (AtspiText *obj, * offset, or %NULL if not present. * * Deprecated: 2.10: Use atspi_text_get_text_attribute_value instead. + * Rename to: atspi_text_get_text_attribute_value **/ gchar * atspi_text_get_attribute_value (AtspiText *obj, -- 2.7.4