atk: Use const instead G_CONST_RETURN

https://bugzilla.gnome.org/show_bug.cgi?id=652205

20 files changed, 71 insertions, 76 deletions

diff --git a/atk/atkaction.c b/atk/atkaction.c
index f47687c..b37ebc9 100755
--- a/atk/atkaction.c
+++ b/atk/atkaction.c
@@ -101,7 +101,7 @@ atk_action_get_n_actions  (AtkAction *obj)
  * Returns a description string, or %NULL
  * if @action does not implement this interface.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_action_get_description (AtkAction *obj,
                             gint      i)
 {
@@ -140,7 +140,7 @@ atk_action_get_description (AtkAction *obj,
  * Returns a name string, or %NULL
  * if @action does not implement this interface.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_action_get_name (AtkAction *obj,
                      gint      i)
 {
@@ -166,7 +166,7 @@ atk_action_get_name (AtkAction *obj,
  * Returns a name string, or %NULL
  * if @action does not implement this interface.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_action_get_localized_name (AtkAction *obj,
                                gint      i)
 {
@@ -203,7 +203,7 @@ atk_action_get_localized_name (AtkAction *obj,
  * if there is no keybinding for this action.
  *
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_action_get_keybinding (AtkAction *obj,
                            gint      i)
 {
diff --git a/atk/atkaction.h b/atk/atkaction.h
index 45d74b8..68cb7a0 100755
--- a/atk/atkaction.h
+++ b/atk/atkaction.h
@@ -55,16 +55,16 @@ struct _AtkActionIface
   gboolean                (*do_action)         (AtkAction         *action,
                                                 gint              i);
   gint                    (*get_n_actions)     (AtkAction         *action);
-  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
+  const gchar*            (*get_description)   (AtkAction         *action,
                                                 gint              i);
-  G_CONST_RETURN gchar*   (*get_name)          (AtkAction         *action,
+  const gchar*            (*get_name)          (AtkAction         *action,
                                                 gint              i);
-  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
+  const gchar*            (*get_keybinding)    (AtkAction         *action,
                                                 gint              i);
   gboolean                (*set_description)   (AtkAction         *action,
                                                 gint              i,
                                                 const gchar       *desc);
-  G_CONST_RETURN gchar*   (*get_localized_name)(AtkAction         *action,
+  const gchar*            (*get_localized_name)(AtkAction         *action,
 						gint              i);
   AtkFunction             pad2;
 };
@@ -85,11 +85,11 @@ GType atk_action_get_type (void);
 gboolean   atk_action_do_action                (AtkAction         *action,
                                             gint              i);
 gint   atk_action_get_n_actions            (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
+const gchar*          atk_action_get_description  (AtkAction         *action,
                                                    gint              i);
-G_CONST_RETURN gchar* atk_action_get_name         (AtkAction         *action,
+const gchar*          atk_action_get_name         (AtkAction         *action,
                                                    gint              i);
-G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
+const gchar*          atk_action_get_keybinding   (AtkAction         *action,
                                                    gint              i);
 gboolean              atk_action_set_description  (AtkAction         *action,
                                                    gint              i,
@@ -97,7 +97,7 @@ gboolean              atk_action_set_description  (AtkAction         *action,
 
 /* NEW in ATK 1.1: */
 
-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction       *action,
+const gchar* atk_action_get_localized_name (AtkAction       *action,
 						     gint            i);
 
 /*
diff --git a/atk/atkdocument.c b/atk/atkdocument.c
index 7072713..01d0111 100755
--- a/atk/atkdocument.c
+++ b/atk/atkdocument.c
@@ -93,7 +93,7 @@ atk_document_base_init (AtkDocumentIface *class)
  *
  * Returns: a string indicating the document type
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_document_get_document_type (AtkDocument *document)
 {
   AtkDocumentIface *iface;
@@ -155,7 +155,7 @@ atk_document_get_document (AtkDocument *document)
  *          locale of the document content as a whole, or NULL if
  *          the document content does not specify a locale.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 atk_document_get_locale (AtkDocument *document)
 {
   AtkDocumentIface *iface;
@@ -219,7 +219,7 @@ atk_document_get_attributes (AtkDocument *document)
  *    document, or NULL if a value for #attribute_name has not been specified
  *    for this document.
  */
-G_CONST_RETURN gchar *
+const gchar *
 atk_document_get_attribute_value (AtkDocument *document, 
 				  const gchar *attribute_name)
 {
diff --git a/atk/atkdocument.h b/atk/atkdocument.h
index 275b5e8..168a252 100755
--- a/atk/atkdocument.h
+++ b/atk/atkdocument.h
@@ -49,12 +49,12 @@ typedef struct _AtkDocumentIface AtkDocumentIface;
 struct _AtkDocumentIface
 {
   GTypeInterface parent;
-  G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument              *document);
+  const gchar*          ( *get_document_type) (AtkDocument              *document);
   gpointer              ( *get_document)      (AtkDocument              *document);
 
-  G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument              *document);
+  const gchar*          ( *get_document_locale) (AtkDocument              *document);
   AtkAttributeSet *     ( *get_document_attributes) (AtkDocument        *document);
-  G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument   *document,
+  const gchar*          ( *get_document_attribute_value) (AtkDocument   *document,
                                                           const gchar   *attribute_name);
   gboolean              ( *set_document_attribute) (AtkDocument         *document,
                                                     const gchar         *attribute_name,
@@ -68,11 +68,11 @@ struct _AtkDocumentIface
 
 GType  atk_document_get_type             (void);
 
-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument   *document);
+const gchar*          atk_document_get_document_type (AtkDocument   *document);
 gpointer atk_document_get_document (AtkDocument   *document);
-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
+const gchar*          atk_document_get_locale (AtkDocument *document);
 AtkAttributeSet*      atk_document_get_attributes (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, 
+const gchar*          atk_document_get_attribute_value (AtkDocument *document,
                                                         const gchar *attribute_name);
 gboolean              atk_document_set_attribute_value (AtkDocument *document,
                                                         const gchar *attribute_name,
diff --git a/atk/atkimage.c b/atk/atkimage.c
index 78fcebd..a2f939c 100755
--- a/atk/atkimage.c
+++ b/atk/atkimage.c
@@ -46,7 +46,7 @@ atk_image_get_type (void)
  *
  * Returns: a string representing the image description
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_image_get_image_description (AtkImage *image)
 {
   AtkImageIface *iface;
@@ -192,7 +192,7 @@ atk_image_get_image_position (AtkImage *image,
  * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale. 
  *
  */
-G_CONST_RETURN gchar* 
+const gchar*
 atk_image_get_image_locale (AtkImage   *image)
 {
 	
diff --git a/atk/atkimage.h b/atk/atkimage.h
index dd45916..1091d7c 100755
--- a/atk/atkimage.h
+++ b/atk/atkimage.h
@@ -53,13 +53,13 @@ struct _AtkImageIface
                                                    gint                  *x,
 				                   gint	                 *y,
     			                           AtkCoordType	         coord_type);
-  G_CONST_RETURN gchar* ( *get_image_description) (AtkImage              *image);
+  const gchar*          ( *get_image_description) (AtkImage              *image);
   void                  ( *get_image_size)        (AtkImage              *image,
                                                    gint                  *width,
                                                    gint                  *height);
   gboolean              ( *set_image_description) (AtkImage              *image,
                                                    const gchar           *description);
-  G_CONST_RETURN gchar* ( *get_image_locale)      (AtkImage              *image);
+  const gchar*          ( *get_image_locale)      (AtkImage              *image);
 
   AtkFunction           pad1;
 	
@@ -67,7 +67,7 @@ struct _AtkImageIface
 
 GType  atk_image_get_type             (void);
 
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
+const gchar* atk_image_get_image_description (AtkImage   *image);
 
 void     atk_image_get_image_size        (AtkImage           *image,
                                           gint               *width,
@@ -80,7 +80,7 @@ void     atk_image_get_image_position    (AtkImage	     *image,
 					  gint	             *y,
     					  AtkCoordType	     coord_type);
 
-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
+const gchar* atk_image_get_image_locale (AtkImage   *image);
 
 G_END_DECLS
 
diff --git a/atk/atkobject.c b/atk/atkobject.c
index 54948b1..010a8b1 100755
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -285,10 +285,8 @@ static void            atk_object_real_get_property (GObject         *object,
                                                      GValue          *value,
                                                      GParamSpec      *pspec);
 static void            atk_object_finalize          (GObject         *object);
-static G_CONST_RETURN gchar*
-                       atk_object_real_get_name     (AtkObject       *object);
-static G_CONST_RETURN gchar*
-                       atk_object_real_get_description    
+static const gchar*    atk_object_real_get_name     (AtkObject       *object);
+static const gchar*    atk_object_real_get_description
                                                    (AtkObject       *object);
 static AtkObject*      atk_object_real_get_parent  (AtkObject       *object);
 static AtkRole         atk_object_real_get_role    (AtkObject       *object);
@@ -692,7 +690,7 @@ atk_implementor_get_type (void)
  *
  * Returns: a character string representing the accessible name of the object.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_object_get_name (AtkObject *accessible)
 {
   AtkObjectClass *klass;
@@ -716,7 +714,7 @@ atk_object_get_name (AtkObject *accessible)
  * of the accessible.
  *
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_object_get_description (AtkObject *accessible)
 {
   AtkObjectClass *klass;
@@ -1125,7 +1123,7 @@ atk_object_notify_state_change (AtkObject *accessible,
                                 AtkState  state,
                                 gboolean  value)
 {
-  G_CONST_RETURN gchar* name;
+  const gchar* name;
 
   g_return_if_fail (ATK_IS_OBJECT (accessible));
 
@@ -1323,13 +1321,13 @@ atk_object_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 atk_object_real_get_name (AtkObject *object)
 {
   return object->name;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 atk_object_real_get_description (AtkObject *object)
 {
   return object->description;
@@ -1491,7 +1489,7 @@ atk_object_notify (GObject     *obj,
  *
  * Returns: the string describing the AtkRole
  */
-G_CONST_RETURN gchar*
+const gchar*
 atk_role_get_name (AtkRole role)
 {
   if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
@@ -1518,7 +1516,7 @@ atk_role_get_name (AtkRole role)
  *
  * Returns: the localized string describing the AtkRole
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_role_get_localized_name (AtkRole role)
 {
   gettext_initialization ();
diff --git a/atk/atkobject.h b/atk/atkobject.h
index 19d974d..1385e54 100755
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -381,11 +381,11 @@ struct _AtkObjectClass
   /*
    * Gets the accessible name of the object
    */
-  G_CONST_RETURN gchar*    (* get_name)            (AtkObject                *accessible);
+  const gchar*             (* get_name)            (AtkObject                *accessible);
   /*
    * Gets the accessible description of the object
    */
-  G_CONST_RETURN gchar*    (* get_description)     (AtkObject                *accessible);
+  const gchar*             (* get_description)     (AtkObject                *accessible);
   /*
    * Gets the accessible parent of the object
    */
@@ -535,8 +535,8 @@ AtkObject*              atk_implementor_ref_accessible            (AtkImplemento
  * Properties directly supported by AtkObject
  */
 
-G_CONST_RETURN gchar*   atk_object_get_name                       (AtkObject *accessible);
-G_CONST_RETURN gchar*   atk_object_get_description                (AtkObject *accessible);
+const gchar*            atk_object_get_name                       (AtkObject *accessible);
+const gchar*            atk_object_get_description                (AtkObject *accessible);
 AtkObject*              atk_object_get_parent                     (AtkObject *accessible);
 gint                    atk_object_get_n_accessible_children      (AtkObject *accessible);
 AtkObject*              atk_object_ref_accessible_child           (AtkObject *accessible,
@@ -571,7 +571,7 @@ void                 atk_object_notify_state_change              (AtkObject
 void                 atk_object_initialize                       (AtkObject                     *accessible,
                                                                   gpointer                      data);
                                     
-G_CONST_RETURN gchar* atk_role_get_name      (AtkRole         role);
+const gchar*          atk_role_get_name      (AtkRole         role);
 AtkRole               atk_role_for_name      (const gchar     *name);
 
 
@@ -582,7 +582,7 @@ gboolean              atk_object_add_relationship              (AtkObject      *
 gboolean              atk_object_remove_relationship           (AtkObject      *object,
 								AtkRelationType relationship,
 								AtkObject      *target);
-G_CONST_RETURN gchar* atk_role_get_localized_name              (AtkRole     role);
+const gchar*          atk_role_get_localized_name              (AtkRole     role);
 
 /* */
 
diff --git a/atk/atkrelation.c b/atk/atkrelation.c
index 9c26660..171d4f3 100755
--- a/atk/atkrelation.c
+++ b/atk/atkrelation.c
@@ -130,7 +130,7 @@ atk_relation_type_register (const gchar *name)
  *
  * Returns: the string describing the AtkRelationType
  */
-G_CONST_RETURN gchar*
+const gchar*
 atk_relation_type_get_name (AtkRelationType type)
 {
   GTypeClass *type_class;
diff --git a/atk/atkrelation.h b/atk/atkrelation.h
index 794747c..5cccaee 100755
--- a/atk/atkrelation.h
+++ b/atk/atkrelation.h
@@ -61,7 +61,7 @@ struct _AtkRelationClass
 GType atk_relation_get_type (void);
 
 AtkRelationType       atk_relation_type_register      (const gchar     *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
+const gchar*          atk_relation_type_get_name      (AtkRelationType type);
 AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
 
 /*
diff --git a/atk/atkstate.c b/atk/atkstate.c
index 7483b98..9eee876 100755
--- a/atk/atkstate.c
+++ b/atk/atkstate.c
@@ -57,7 +57,7 @@ atk_state_type_register (const gchar *name)
  *
  * Returns: the string describing the AtkStateType
  */
-G_CONST_RETURN gchar*
+const gchar*
 atk_state_type_get_name (AtkStateType type)
 {
   GTypeClass *type_class;
diff --git a/atk/atkstate.h b/atk/atkstate.h
index 0beba72..16feb52 100755
--- a/atk/atkstate.h
+++ b/atk/atkstate.h
@@ -170,7 +170,7 @@ typedef guint64      AtkState;
 
 AtkStateType atk_state_type_register            (const gchar *name);
 
-G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
+const gchar*          atk_state_type_get_name   (AtkStateType type);
 AtkStateType          atk_state_type_for_name   (const gchar  *name);
 
 G_END_DECLS
diff --git a/atk/atkstreamablecontent.c b/atk/atkstreamablecontent.c
index 4ef168e..468f79d 100755
--- a/atk/atkstreamablecontent.c
+++ b/atk/atkstreamablecontent.c
@@ -73,7 +73,7 @@ atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable)
  * Returns : a gchar* representing the specified mime type; the caller
  * should not free the character string.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
                                       gint                 i)
 {
diff --git a/atk/atkstreamablecontent.h b/atk/atkstreamablecontent.h
index e5271a2..54d832b 100755
--- a/atk/atkstreamablecontent.h
+++ b/atk/atkstreamablecontent.h
@@ -54,11 +54,11 @@ struct _AtkStreamableContentIface
    * at index 0 should be considered the "default" data type for the stream.
    *
    * This assumes that the strings for the mime types are stored in the
-   * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
+   * AtkStreamableContent. Alternatively the const could be removed
    * and the caller would be responsible for calling g_free() on the
    * returned value.
    */
-  G_CONST_RETURN gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
+  const gchar*              (* get_mime_type)     (AtkStreamableContent     *streamable,
                                                    gint                     i);
   /*
    * One possible implementation for this method is that it constructs the
@@ -80,7 +80,7 @@ struct _AtkStreamableContentIface
  * constructed.  Note that it is possible for get_uri to return NULL but for
  * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
  */
-    G_CONST_RETURN  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
+    const  gchar*           (* get_uri)           (AtkStreamableContent     *streamable,
                                                    const gchar              *mime_type);
 
 
@@ -92,12 +92,12 @@ GType                  atk_streamable_content_get_type (void);
 
 gint                   atk_streamable_content_get_n_mime_types (AtkStreamableContent     *streamable);
                                                        
-G_CONST_RETURN gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
+const gchar*           atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
                                                                 gint                     i);
 GIOChannel*             atk_streamable_content_get_stream       (AtkStreamableContent     *streamable,
                                                                  const gchar              *mime_type);
 
-G_CONST_RETURN gchar*  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
+const gchar*           atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
                                                                 const gchar              *mime_type);
 
 G_END_DECLS
diff --git a/atk/atktable.c b/atk/atktable.c
index 729f6ec..891109b 100755
--- a/atk/atktable.c
+++ b/atk/atktable.c
@@ -301,7 +301,7 @@ atk_table_get_n_columns (AtkTable *table)
  * Returns: a gchar* representing the column description, or %NULL
  * if value does not implement this interface.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_table_get_column_description (AtkTable *table,
                                   gint     column)
 {
@@ -405,7 +405,7 @@ atk_table_get_n_rows (AtkTable *table)
  * Returns: a gchar* representing the row description, or %NULL
  * if value does not implement this interface.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_table_get_row_description (AtkTable *table,
                                gint      row)
 {
diff --git a/atk/atktable.h b/atk/atktable.h
index 909b508..e8d5075 100755
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -69,13 +69,11 @@ struct _AtkTableIface
                                                   gint          column);
   AtkObject*
                     (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar*
-                    (* get_column_description)   (AtkTable      *table,
+  const gchar*      (* get_column_description)   (AtkTable      *table,
                                                   gint          column);
   AtkObject*        (* get_column_header)        (AtkTable      *table,
 						  gint		column);
-  G_CONST_RETURN gchar*
-                    (* get_row_description)      (AtkTable      *table,
+  const gchar*      (* get_row_description)      (AtkTable      *table,
                                                   gint          row);
   AtkObject*        (* get_row_header)           (AtkTable      *table,
 						  gint		row);
@@ -163,13 +161,12 @@ gint              atk_table_get_row_extent_at    (AtkTable         *table,
                                                   gint             column);
 AtkObject*
                   atk_table_get_caption          (AtkTable         *table);
-G_CONST_RETURN gchar*
-                  atk_table_get_column_description (AtkTable         *table,
+const gchar*      atk_table_get_column_description
+                                                 (AtkTable         *table,
                                                   gint             column);
 AtkObject*        atk_table_get_column_header    (AtkTable         *table,
 						  gint		   column);
-G_CONST_RETURN gchar*
-                  atk_table_get_row_description  (AtkTable         *table,
+const gchar*      atk_table_get_row_description  (AtkTable         *table,
                                                   gint             row);
 AtkObject*        atk_table_get_row_header       (AtkTable         *table,
 						  gint		   row);
diff --git a/atk/atktext.c b/atk/atktext.c
index 3fe5870..a1e90de 100755
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -1092,7 +1092,7 @@ atk_text_attribute_register (const gchar *name)
  *
  * Returns: a string containing the name; this string should not be freed
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_text_attribute_get_name (AtkTextAttribute attr)
 {
   GTypeClass *type_class;
@@ -1188,7 +1188,7 @@ atk_text_attribute_for_name (const gchar *name)
  * Returns: a string containing the value; this string should not be freed;
  * NULL is returned if there are no values maintained for the attr value. 
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_text_attribute_get_value (AtkTextAttribute attr,
                               gint             index)
 {
diff --git a/atk/atktext.h b/atk/atktext.h
index 041b064..81ad312 100755
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -357,9 +357,9 @@ AtkTextRange**  atk_text_get_bounded_ranges               (AtkText          *tex
                                                            AtkTextClipType  y_clip_type);
 void          atk_text_free_ranges                        (AtkTextRange     **ranges);
 void 	      atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
-G_CONST_RETURN gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
+const gchar*  atk_text_attribute_get_name                 (AtkTextAttribute attr);
 AtkTextAttribute       atk_text_attribute_for_name        (const gchar      *name);
-G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
+const gchar*  atk_text_attribute_get_value                (AtkTextAttribute attr,
                                                            gint             index_);
 
 G_END_DECLS
diff --git a/atk/atkutil.c b/atk/atkutil.c
index bd4e67a..5286432 100755
--- a/atk/atkutil.c
+++ b/atk/atkutil.c
@@ -342,7 +342,7 @@ atk_get_focus_object (void)
  *
  * Returns: name string for the GUI toolkit implementing ATK for this application
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_get_toolkit_name (void)
 {
   const gchar *retval;
@@ -367,7 +367,7 @@ atk_get_toolkit_name (void)
  *
  * Returns: version string for the GUI toolkit implementing ATK for this application
  **/
-G_CONST_RETURN gchar*
+const gchar*
 atk_get_toolkit_version (void)
 {
   const gchar *retval;
@@ -394,7 +394,7 @@ atk_get_toolkit_version (void)
  *
  * Since: 1.20
  */
-G_CONST_RETURN gchar *
+const gchar *
 atk_get_version (void)
 {
   return VERSION;
diff --git a/atk/atkutil.h b/atk/atkutil.h
index b04b1c7..20eddc8 100755
--- a/atk/atkutil.h
+++ b/atk/atkutil.h
@@ -147,8 +147,8 @@ struct _AtkUtilClass
 						  gpointer data);
    void         (* remove_key_event_listener)    (guint               listener_id);
    AtkObject*   (* get_root)                     (void);
-   G_CONST_RETURN gchar* (* get_toolkit_name)    (void);
-   G_CONST_RETURN gchar* (* get_toolkit_version) (void);
+   const gchar* (* get_toolkit_name)             (void);
+   const gchar* (* get_toolkit_version)          (void);
 };
 GType atk_util_get_type (void);
 
@@ -229,17 +229,17 @@ AtkObject* atk_get_focus_object (void);
 /*
  * Returns name string for the GUI toolkit.
  */
-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
+const gchar *atk_get_toolkit_name (void);
 
 /*
  * Returns version string for the GUI toolkit.
  */
-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
+const gchar *atk_get_toolkit_version (void);
 
 /*
  * Gets the current version of ATK
  */
-G_CONST_RETURN gchar *atk_get_version (void);
+const gchar *atk_get_version (void);
 
 /* --- GType boilerplate --- */
 /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will: