Patch from Yue Wang. Bug #575794.

2009-03-19  Li Yuan  <liyuan@goaltender>

        Patch from Yue Wang. Bug #575794.
        * atk/atkcomponent.c:
        * atk/atkdocument.c:
        * atk/atkhyperlink.c:
        * atk/atkhyperlinkimpl.c:
        * atk/atkmisc.c:
        * atk/atkobject.c:
        * atk/atkobject.h:
        * atk/atkrelation.c:
        * atk/atkrelationset.c:
        * atk/atkstreamablecontent.c:
        * atk/atktext.c:
        * atk/atkutil.c:
        * atk/atkvalue.c:
        Change "ATK 1.x" to "1.x". Avoid build error.

svn path=/trunk/; revision=1364

diff --git a/ChangeLog b/ChangeLog
index 851595b..81e153d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-03-19  Li Yuan  <liyuan@goaltender>
+
+       Patch from Yue Wang. Bug #575794.
+       * atk/atkcomponent.c:
+       * atk/atkdocument.c:
+       * atk/atkhyperlink.c:
+       * atk/atkhyperlinkimpl.c:
+       * atk/atkmisc.c:
+       * atk/atkobject.c:
+       * atk/atkobject.h:
+       * atk/atkrelation.c:
+       * atk/atkrelationset.c:
+       * atk/atkstreamablecontent.c:
+       * atk/atktext.c:
+       * atk/atkutil.c:
+       * atk/atkvalue.c:
+       Change "ATK 1.x" to "1.x". Avoid build error.
+
 2009-03-16  Li Yuan  <li.yuan@sun.com>
 
        * NEWS:

diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c
index 6e9bd57..60fa185 100755 (executable)
--- a/atk/atkcomponent.c
+++ b/atk/atkcomponent.c
@@ -385,7 +385,7 @@ atk_component_get_mdi_zorder (AtkComponent *component)
  * (fully opaque).
  *
  * Returns: An alpha value from 0 to 1.0, inclusive.
- * Since: ATK 1.12
+ * Since: 1.12
  **/
 gdouble
 atk_component_get_alpha (AtkComponent    *component)

diff --git a/atk/atkdocument.c b/atk/atkdocument.c
index 4364c8b..0195b26 100755 (executable)
--- a/atk/atkdocument.c
+++ b/atk/atkdocument.c
@@ -182,7 +182,7 @@ atk_document_get_locale (AtkDocument *document)
  * Gets an AtkAttributeSet which describes document-wide
  *          attributes as name-value pairs.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  *
  * Returns: An AtkAttributeSet containing the explicitly
  *          set name-value-pair attributes associated with this document
@@ -213,7 +213,7 @@ atk_document_get_attributes (AtkDocument *document)
  * @attribute_name: a character string representing the name of the attribute
  *            whose value is being queried.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  *
  * Returns: a string value associated with the named attribute for this
  *    document, or NULL if a value for #attribute_name has not been specified
@@ -246,7 +246,7 @@ atk_document_get_attribute_value (AtkDocument *document,
  *            whose value is being set.
  * @attribute_value: a string value to be associated with #attribute_name.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  *
  * Returns: TRUE if #value is successfully associated with #attribute_name
  *          for this document, FALSE otherwise (e.g. if the document does not

diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c
index 58bc849..212493f 100755 (executable)
--- a/atk/atkhyperlink.c
+++ b/atk/atkhyperlink.c
@@ -356,7 +356,7 @@ atk_hyperlink_get_n_anchors (AtkHyperlink *link)
  *
  * Determines whether this AtkHyperlink is selected
  *
- * Since: ATK 1.4
+ * Since: 1.4
  *
  * @Deprecated: This method is deprecated since ATK version 1.8.
  * Please use ATK_STATE_SELECTED to indicate when a hyperlink within a

diff --git a/atk/atkhyperlinkimpl.c b/atk/atkhyperlinkimpl.c
index ecf3124..22f47ca 100644 (file)
--- a/atk/atkhyperlinkimpl.c
+++ b/atk/atkhyperlinkimpl.c
@@ -48,7 +48,7 @@ atk_hyperlink_impl_get_type (void)
  *
  * Returns an AtkHyperlink object which points to this implementing AtkObject.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  **/
 AtkHyperlink *
 atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *obj)

diff --git a/atk/atkmisc.c b/atk/atkmisc.c
index 8a16b45..484b9fd 100755 (executable)
--- a/atk/atkmisc.c
+++ b/atk/atkmisc.c
@@ -61,7 +61,7 @@ atk_misc_class_init (AtkMiscClass *klass)
  * (This method is implemented by the toolkit ATK implementation layer;
  *  for instance, for GTK+, GAIL implements this via GDK_THREADS_ENTER).
  *
- * Since: ATK 1.13
+ * Since: 1.13
  *
  **/
 void
@@ -94,7 +94,7 @@ atk_misc_threads_enter (AtkMisc *misc)
  * (This method is implemented by the toolkit ATK implementation layer;
  *  for instance, for GTK+, GAIL implements this via GDK_THREADS_LEAVE).
  *
- * Since: ATK 1.13
+ * Since: 1.13
  *
  **/
 void
@@ -120,7 +120,7 @@ AtkMisc *atk_misc_instance = NULL;
  *
  * Obtain the singleton instance of AtkMisc for this application.
  * 
- * Since: ATK 1.13
+ * Since: 1.13
  *
  * Returns: The singleton instance of AtkMisc for this application.
  *

diff --git a/atk/atkobject.c b/atk/atkobject.c
index bea02d7..988cb5c 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -1171,7 +1171,7 @@ atk_implementor_ref_accessible (AtkImplementor *implementor)
  * as distinct from strongly-typed object data available via other get/set methods.
  * Not all objects have explicit "name-value pair" #AtkAttributeSet properties.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  *
  * Returns: an #AtkAttributeSet consisting of all explicit properties/annotations applied to 
  * the object, or an empty set if the object has no name-value pair attributes assigned to it.

diff --git a/atk/atkobject.h b/atk/atkobject.h
index bfd94f3..19d974d 100755 (executable)
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -111,7 +111,7 @@ G_BEGIN_DECLS
  *@ATK_ROLE_UNKNOWN: The object contains some Accessible information, but its role is not known
  *@ATK_ROLE_VIEWPORT: An object usually used in a scroll pane
  *@ATK_ROLE_WINDOW: A top level window with no title or border.
- *@ATK_ROLE_HEADER: An object that serves as a document header. @Since:ATK 1.1.1
+ *@ATK_ROLE_HEADER: An object that serves as a document header. @Since: ATK-1.1.1
  *@ATK_ROLE_FOOTER: An object that serves as a document footer.  @Since: ATK-1.1.1
  *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.   @Since: ATK-1.1.1
  *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).   @Since: ATK-1.1.1

diff --git a/atk/atkrelation.c b/atk/atkrelation.c
index da9cdb7..e4ae7c5 100755 (executable)
--- a/atk/atkrelation.c
+++ b/atk/atkrelation.c
@@ -313,7 +313,7 @@ delete_object_while_in_relation (gpointer callback_data,
  * not already present.  See also atk_object_add_relationship().
  *
  *
- * Since: ATK 1.9
+ * Since: 1.9
  **/
 void
 atk_relation_add_target (AtkRelation *relation,

diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c
index f594cac..da0af10 100755 (executable)
--- a/atk/atkrelationset.c
+++ b/atk/atkrelationset.c
@@ -310,7 +310,7 @@ atk_relation_set_finalize (GObject *object)
  * of that type. If it is does contain a relation of that typea the target
  * is added to the relation.
  *
- * Since: ATK 1.9
+ * Since: 1.9
  **/
 void
 atk_relation_set_add_relation_by_type (AtkRelationSet  *set,

diff --git a/atk/atkstreamablecontent.c b/atk/atkstreamablecontent.c
index 37f5549..7510245 100755 (executable)
--- a/atk/atkstreamablecontent.c
+++ b/atk/atkstreamablecontent.c
@@ -135,7 +135,7 @@ atk_streamable_content_get_stream (AtkStreamableContent *streamable,
  * Returns:  Returns a string representing a URI, or NULL if no corresponding URI
  * can be constructed.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  **/
 gchar*
 atk_streamable_content_get_uri (AtkStreamableContent *streamable,

diff --git a/atk/atktext.c b/atk/atktext.c
index bb6b294..10a80ee 100755 (executable)
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -937,7 +937,7 @@ atk_text_set_caret_offset (AtkText *text,
  *
  * Get the bounding box for text within the specified range.
  *
- * Since: ATK 1.3
+ * Since: 1.3
  **/
 void
 atk_text_get_range_extents (AtkText          *text,
@@ -970,7 +970,7 @@ atk_text_get_range_extents (AtkText          *text,
  *
  * Get the ranges of text in the specified bounding box.
  *
- * Since: ATK 1.3
+ * Since: 1.3
  *
  * Returns: Array of AtkTextRange. The last element of the array returned 
  *          by this function will be NULL.
@@ -1348,7 +1348,7 @@ atk_text_real_get_bounded_ranges (AtkText          *text,
  * that the array was returned by the function atk_text_get_bounded_ranges
  * and is NULL terminated.
  *
- * Since: ATK 1.3
+ * Since: 1.3
  **/
 void
 atk_text_free_ranges (AtkTextRange **ranges)

diff --git a/atk/atkutil.c b/atk/atkutil.c
index aa62ffd..a3baad2 100755 (executable)
--- a/atk/atkutil.c
+++ b/atk/atkutil.c
@@ -323,7 +323,7 @@ atk_get_root (void)
  *
  * Gets the currently focused object.
  * 
- * Since: ATK 1.6
+ * Since: 1.6
  *
  * Returns: the currently focused object for the current application
  **/

diff --git a/atk/atkvalue.c b/atk/atkvalue.c
index f2856a1..f8d3236 100755 (executable)
--- a/atk/atkvalue.c
+++ b/atk/atkvalue.c
@@ -136,7 +136,7 @@ atk_value_get_minimum_value (AtkValue *obj,
  * the minimum increment is undefined, which may mean that it is limited only by the 
  * floating point precision of the platform.
  *
- * Since: ATK 1.12
+ * Since: 1.12
  **/
 void
 atk_value_get_minimum_increment (AtkValue *obj,