gail: use const instead G_CONST_RETURN

21 files changed, 108 insertions, 108 deletions

diff --git a/modules/other/gail/gailarrow.c b/modules/other/gail/gailarrow.c
index 77992242c3..9253d84769 100644
--- a/modules/other/gail/gailarrow.c
+++ b/modules/other/gail/gailarrow.c
@@ -29,7 +29,7 @@ static void gail_arrow_initialize       (AtkObject      *accessible,
 
 /* AtkImage */
 static void  atk_image_interface_init   (AtkImageIface  *iface);
-static G_CONST_RETURN gchar* gail_arrow_get_image_description 
+static const gchar* gail_arrow_get_image_description
                                         (AtkImage       *obj);
 static gboolean gail_arrow_set_image_description 
                                         (AtkImage       *obj,
@@ -72,7 +72,7 @@ atk_image_interface_init (AtkImageIface *iface)
   iface->set_image_description = gail_arrow_set_image_description;
 }
 
-static G_CONST_RETURN gchar* 
+static const gchar*
 gail_arrow_get_image_description (AtkImage       *obj)
 {
   GailArrow* arrow;
diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 8a187261c3..f8c648ed7e 100644
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -30,7 +30,7 @@
 static void                  gail_button_class_init       (GailButtonClass *klass);
 static void                  gail_button_init             (GailButton      *button);
 
-static G_CONST_RETURN gchar* gail_button_get_name         (AtkObject       *obj);
+static const gchar* gail_button_get_name         (AtkObject       *obj);
 static gint                  gail_button_get_n_children   (AtkObject       *obj);
 static AtkObject*            gail_button_ref_child        (AtkObject       *obj,
                                                            gint            i);
@@ -59,11 +59,11 @@ static gboolean              gail_button_do_action      (AtkAction      *action,
                                                          gint           i);
 static gboolean              idle_do_action             (gpointer       data);
 static gint                  gail_button_get_n_actions  (AtkAction      *action);
-static G_CONST_RETURN gchar* gail_button_get_description(AtkAction      *action,
+static const gchar* gail_button_get_description(AtkAction      *action,
                                                          gint           i);
-static G_CONST_RETURN gchar* gail_button_get_keybinding (AtkAction      *action,
+static const gchar* gail_button_get_keybinding (AtkAction      *action,
                                                          gint           i);
-static G_CONST_RETURN gchar* gail_button_action_get_name(AtkAction      *action,
+static const gchar* gail_button_action_get_name(AtkAction      *action,
                                                          gint           i);
 static gboolean              gail_button_set_description(AtkAction      *action,
                                                          gint           i,
@@ -76,7 +76,7 @@ static void                  gail_button_notify_weak_ref       (gpointer data,
 
 /* AtkImage.h */
 static void                  atk_image_interface_init   (AtkImageIface  *iface);
-static G_CONST_RETURN gchar* gail_button_get_image_description 
+static const gchar* gail_button_get_image_description
                                                         (AtkImage       *image);
 static void	             gail_button_get_image_position
                                                         (AtkImage       *image,
@@ -182,10 +182,10 @@ gail_button_init (GailButton *button)
   button->textutil = NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_button_get_name (AtkObject *obj)
 {
-  G_CONST_RETURN gchar* name = NULL;
+  const gchar* name = NULL;
 
   g_return_val_if_fail (GAIL_IS_BUTTON (obj), NULL);
 
@@ -603,12 +603,12 @@ gail_button_get_n_actions (AtkAction *action)
   return 3;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_button_get_description (AtkAction *action,
                              gint      i)
 {
   GailButton *button;
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   button = GAIL_BUTTON (action);
 
@@ -637,7 +637,7 @@ gail_button_get_description (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_button_get_keybinding (AtkAction *action,
                             gint      i)
 {
@@ -718,11 +718,11 @@ gail_button_get_keybinding (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_button_action_get_name (AtkAction *action,
                              gint      i)
 {
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
   GailButton *button;
 
   button = GAIL_BUTTON (action);
@@ -981,7 +981,7 @@ get_image_from_button (GtkWidget *button)
   return image;
 }
 
-static G_CONST_RETURN gchar* 
+static const gchar*
 gail_button_get_image_description (AtkImage *image) {
 
   GtkWidget *widget;
diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.c
index 8da67c8f44..6aaee03298 100644
--- a/modules/other/gail/gailcell.c
+++ b/modules/other/gail/gailcell.c
@@ -47,10 +47,10 @@ static void         _gail_cell_destroy_action_info
 
 static gint         gail_cell_action_get_n_actions 
                                                   (AtkAction           *action);
-static G_CONST_RETURN gchar*
+static const gchar*
                     gail_cell_action_get_name     (AtkAction           *action,
 			                           gint                index);
-static G_CONST_RETURN gchar *
+static const gchar *
                     gail_cell_action_get_description 
                                                   (AtkAction           *action,
 				                   gint                index);
@@ -58,7 +58,7 @@ static gboolean     gail_cell_action_set_description
                                                   (AtkAction           *action,
 				                   gint                index,
 				                   const gchar         *desc);
-static G_CONST_RETURN gchar *
+static const gchar *
                     gail_cell_action_get_keybinding 
                                                   (AtkAction           *action,
 				                   gint                index);
@@ -402,7 +402,7 @@ gail_cell_action_get_n_actions (AtkAction *action)
     return 0;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_cell_action_get_name (AtkAction *action,
 			   gint      index)
 {
@@ -414,7 +414,7 @@ gail_cell_action_get_name (AtkAction *action,
   return info->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_cell_action_get_description (AtkAction *action,
 				  gint      index)
 {
@@ -441,7 +441,7 @@ gail_cell_action_set_description (AtkAction   *action,
   return TRUE;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_cell_action_get_keybinding (AtkAction *action,
 				 gint      index)
 {
diff --git a/modules/other/gail/gailcombobox.c b/modules/other/gail/gailcombobox.c
index 26dd6b0e40..8c78337a66 100644
--- a/modules/other/gail/gailcombobox.c
+++ b/modules/other/gail/gailcombobox.c
@@ -30,7 +30,7 @@ static void         gail_combo_box_real_initialize         (AtkObject      *obj,
 
 static void         gail_combo_box_changed_gtk             (GtkWidget      *widget);
 
-static G_CONST_RETURN gchar* gail_combo_box_get_name       (AtkObject      *obj);
+static const gchar* gail_combo_box_get_name       (AtkObject      *obj);
 static gint         gail_combo_box_get_n_children          (AtkObject      *obj);
 static AtkObject*   gail_combo_box_ref_child               (AtkObject      *obj,
                                                             gint           i);
@@ -41,11 +41,11 @@ static gboolean     gail_combo_box_do_action               (AtkAction      *acti
                                                             gint           i);
 static gboolean     idle_do_action                         (gpointer       data);
 static gint         gail_combo_box_get_n_actions           (AtkAction      *action);
-static G_CONST_RETURN gchar* gail_combo_box_get_description(AtkAction      *action,
+static const gchar* gail_combo_box_get_description(AtkAction      *action,
                                                             gint           i);
-static G_CONST_RETURN gchar* gail_combo_box_get_keybinding   (AtkAction       *action,
+static const gchar* gail_combo_box_get_keybinding   (AtkAction       *action,
 		                                             gint            i);
-static G_CONST_RETURN gchar* gail_combo_box_action_get_name(AtkAction      *action,
+static const gchar* gail_combo_box_action_get_name(AtkAction      *action,
                                                             gint           i);
 static gboolean              gail_combo_box_set_description(AtkAction      *action,
                                                             gint           i,
@@ -143,14 +143,14 @@ gail_combo_box_changed_gtk (GtkWidget *widget)
     }
 }
 
-static G_CONST_RETURN gchar* 
+static const gchar*
 gail_combo_box_get_name (AtkObject *obj)
 {
   GtkWidget *widget;
   GtkComboBox *combo_box;
   GailComboBox *gail_combo_box;
   GtkTreeIter iter;
-  G_CONST_RETURN gchar *name;
+  const gchar *name;
   GtkTreeModel *model;
   gint n_columns;
   gint i;
@@ -340,7 +340,7 @@ gail_combo_box_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_combo_box_get_description (AtkAction *action,
                            gint      i)
 {
@@ -355,7 +355,7 @@ gail_combo_box_get_description (AtkAction *action,
     return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_combo_box_get_keybinding (AtkAction *action,
 		                    gint      i)
 {
@@ -406,7 +406,7 @@ gail_combo_box_get_keybinding (AtkAction *action,
 }
 
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_combo_box_action_get_name (AtkAction *action,
                                 gint      i)
 {
diff --git a/modules/other/gail/gailentry.c b/modules/other/gail/gailentry.c
index b30d80778c..1a24de9282 100644
--- a/modules/other/gail/gailentry.c
+++ b/modules/other/gail/gailentry.c
@@ -151,11 +151,11 @@ static gboolean              gail_entry_do_action               (AtkAction
                                                                  gint            i);
 static gboolean              idle_do_action                     (gpointer        data);
 static gint                  gail_entry_get_n_actions           (AtkAction       *action);
-static G_CONST_RETURN gchar* gail_entry_action_get_description  (AtkAction       *action,
+static const gchar* gail_entry_action_get_description  (AtkAction       *action,
                                                                  gint            i);
-static G_CONST_RETURN gchar* gail_entry_get_keybinding          (AtkAction       *action,
+static const gchar* gail_entry_get_keybinding          (AtkAction       *action,
                                                                  gint            i);
-static G_CONST_RETURN gchar* gail_entry_action_get_name         (AtkAction       *action,
+static const gchar* gail_entry_action_get_name         (AtkAction       *action,
                                                                  gint            i);
 static gboolean              gail_entry_action_set_description  (AtkAction       *action,
                                                                  gint            i,
@@ -1309,12 +1309,12 @@ gail_entry_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_entry_action_get_description (AtkAction *action,
                                    gint      i)
 {
   GailEntry *entry;
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   entry = GAIL_ENTRY (action);
   switch (i)
@@ -1329,7 +1329,7 @@ gail_entry_action_get_description (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_entry_get_keybinding (AtkAction *action,
                            gint      i)
 {
@@ -1393,11 +1393,11 @@ gail_entry_get_keybinding (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_entry_action_get_name (AtkAction *action,
                             gint      i)
 {
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   switch (i)
     {
diff --git a/modules/other/gail/gailexpander.c b/modules/other/gail/gailexpander.c
index 25251702ce..559c686407 100644
--- a/modules/other/gail/gailexpander.c
+++ b/modules/other/gail/gailexpander.c
@@ -28,7 +28,7 @@
 static void                  gail_expander_class_init       (GailExpanderClass *klass);
 static void                  gail_expander_init             (GailExpander      *expander);
 
-static G_CONST_RETURN gchar* gail_expander_get_name         (AtkObject         *obj);
+static const gchar* gail_expander_get_name         (AtkObject         *obj);
 static gint                  gail_expander_get_n_children   (AtkObject         *obj)
 ;
 static AtkObject*            gail_expander_ref_child        (AtkObject         *obj,
@@ -45,20 +45,20 @@ static void                  gail_expander_real_initialize  (AtkObject         *
 static void                  gail_expander_finalize         (GObject           *object);
 static void                  gail_expander_init_textutil    (GailExpander      *expander,
                                                              GtkExpander       *widget);
-static G_CONST_RETURN gchar* gail_expander_get_full_text    (GtkExpander       *widget);
+static const gchar* gail_expander_get_full_text    (GtkExpander       *widget);
 
 static void                  atk_action_interface_init  (AtkActionIface *iface);
 static gboolean              gail_expander_do_action    (AtkAction      *action,
                                                          gint           i);
 static gboolean              idle_do_action             (gpointer       data);
 static gint                  gail_expander_get_n_actions(AtkAction      *action);
-static G_CONST_RETURN gchar* gail_expander_get_description
+static const gchar* gail_expander_get_description
                                                         (AtkAction      *action,
                                                          gint           i);
-static G_CONST_RETURN gchar* gail_expander_get_keybinding 
+static const gchar* gail_expander_get_keybinding
                                                         (AtkAction      *action,
                                                          gint           i);
-static G_CONST_RETURN gchar* gail_expander_action_get_name
+static const gchar* gail_expander_action_get_name
                                                         (AtkAction      *action,
                                                          gint           i);
 static gboolean              gail_expander_set_description
@@ -145,10 +145,10 @@ gail_expander_init (GailExpander *expander)
   expander->textutil = NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_expander_get_name (AtkObject *obj)
 {
-  G_CONST_RETURN gchar *name;
+  const gchar *name;
   g_return_val_if_fail (GAIL_IS_EXPANDER (obj), NULL);
 
   name = ATK_OBJECT_CLASS (gail_expander_parent_class)->get_name (obj);
@@ -323,7 +323,7 @@ gail_expander_real_notify_gtk (GObject    *obj,
     GAIL_WIDGET_CLASS (gail_expander_parent_class)->notify_gtk (obj, pspec);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_expander_get_full_text (GtkExpander *widget)
 {
   GtkWidget *label_widget;
@@ -417,12 +417,12 @@ gail_expander_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_expander_get_description (AtkAction *action,
                                gint      i)
 {
   GailExpander *expander;
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   expander = GAIL_EXPANDER (action);
 
@@ -438,7 +438,7 @@ gail_expander_get_description (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_expander_get_keybinding (AtkAction *action,
                               gint      i)
 {
@@ -484,11 +484,11 @@ gail_expander_get_keybinding (AtkAction *action,
   return return_value; 
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_expander_action_get_name (AtkAction *action,
                                gint      i)
 {
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   switch (i)
     {
diff --git a/modules/other/gail/gailframe.c b/modules/other/gail/gailframe.c
index bdbf4218b7..7806837e28 100644
--- a/modules/other/gail/gailframe.c
+++ b/modules/other/gail/gailframe.c
@@ -27,7 +27,7 @@ static void                  gail_frame_class_init       (GailFrameClass  *klass
 static void                  gail_frame_init             (GailFrame       *frame);
 static void                  gail_frame_initialize       (AtkObject       *accessible,
                                                           gpointer         data);
-static G_CONST_RETURN gchar* gail_frame_get_name         (AtkObject       *obj);
+static const gchar* gail_frame_get_name         (AtkObject       *obj);
 
 G_DEFINE_TYPE (GailFrame, gail_frame, GAIL_TYPE_CONTAINER)
 
@@ -54,10 +54,10 @@ gail_frame_initialize (AtkObject *accessible,
   accessible->role = ATK_ROLE_PANEL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_frame_get_name (AtkObject *obj)
 {
-  G_CONST_RETURN gchar *name;
+  const gchar *name;
   g_return_val_if_fail (GAIL_IS_FRAME (obj), NULL);
 
   name = ATK_OBJECT_CLASS (gail_frame_parent_class)->get_name (obj);
diff --git a/modules/other/gail/gailimage.c b/modules/other/gail/gailimage.c
index da8698551d..1a5552c7ee 100644
--- a/modules/other/gail/gailimage.c
+++ b/modules/other/gail/gailimage.c
@@ -27,12 +27,12 @@ static void      gail_image_class_init         (GailImageClass *klass);
 static void      gail_image_init               (GailImage      *image);
 static void      gail_image_initialize         (AtkObject       *accessible,
                                                 gpointer        data);
-static G_CONST_RETURN gchar* gail_image_get_name  (AtkObject     *accessible);
+static const gchar* gail_image_get_name  (AtkObject     *accessible);
 
 
 static void      atk_image_interface_init      (AtkImageIface  *iface);
 
-static G_CONST_RETURN gchar *
+static const gchar *
                  gail_image_get_image_description (AtkImage     *image);
 static void	 gail_image_get_image_position    (AtkImage     *image,
                                                    gint         *x,
@@ -118,7 +118,7 @@ elide_underscores (const gchar *original)
   return result;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_image_get_name (AtkObject *accessible)
 {
   GtkWidget* widget;
@@ -169,7 +169,7 @@ atk_image_interface_init (AtkImageIface *iface)
   iface->set_image_description = gail_image_set_image_description;
 }
 
-static G_CONST_RETURN gchar * 
+static const gchar *
 gail_image_get_image_description (AtkImage     *image)
 {
   GailImage* aimage = GAIL_IMAGE (image);
diff --git a/modules/other/gail/gailimagecell.c b/modules/other/gail/gailimagecell.c
index 095b8bc921..078b4b7cac 100644
--- a/modules/other/gail/gailimagecell.c
+++ b/modules/other/gail/gailimagecell.c
@@ -29,7 +29,7 @@ static void      gail_image_cell_finalize            (GObject            *object
 
 /* AtkImage */
 static void      atk_image_interface_init              (AtkImageIface  *iface);
-static G_CONST_RETURN gchar *
+static const gchar *
                  gail_image_cell_get_image_description (AtkImage       *image);
 static gboolean  gail_image_cell_set_image_description (AtkImage       *image,
                                                         const gchar    *description);
@@ -120,7 +120,7 @@ atk_image_interface_init (AtkImageIface  *iface)
   iface->get_image_size = gail_image_cell_get_image_size;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_image_cell_get_image_description (AtkImage     *image)
 {
   GailImageCell *image_cell;
diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index a527a8ae0e..1961e88421 100644
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -42,7 +42,7 @@ static void       atk_text_interface_init          (AtkTextIface      *iface);
 
 /* atkobject.h */
 
-static G_CONST_RETURN gchar* gail_label_get_name         (AtkObject         *accessible);
+static const gchar* gail_label_get_name         (AtkObject         *accessible);
 static AtkStateSet*          gail_label_ref_state_set	 (AtkObject	    *accessible);
 static AtkRelationSet*       gail_label_ref_relation_set (AtkObject         *accessible);
 
@@ -529,10 +529,10 @@ gail_label_ref_relation_set (AtkObject *obj)
   return relation_set;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_label_get_name (AtkObject *accessible)
 {
-  G_CONST_RETURN gchar *name;
+  const gchar *name;
 
   g_return_val_if_fail (GAIL_IS_LABEL (accessible), NULL);
 
diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 7aea9bfd3d..34e63910ef 100644
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -52,11 +52,11 @@ static gboolean              gail_menu_item_do_action      (AtkAction      *acti
                                                             gint           i);
 static gboolean              idle_do_action                (gpointer       data);
 static gint                  gail_menu_item_get_n_actions  (AtkAction      *action);
-static G_CONST_RETURN gchar* gail_menu_item_get_description(AtkAction      *action,
+static const gchar* gail_menu_item_get_description(AtkAction      *action,
                                                             gint           i);
-static G_CONST_RETURN gchar* gail_menu_item_action_get_name (AtkAction      *action,
+static const gchar* gail_menu_item_action_get_name (AtkAction      *action,
                                                              gint           i);
-static G_CONST_RETURN gchar* gail_menu_item_get_keybinding (AtkAction      *action,
+static const gchar* gail_menu_item_get_keybinding (AtkAction      *action,
                                                             gint           i);
 static gboolean              gail_menu_item_set_description(AtkAction      *action,
                                                             gint           i,
@@ -905,7 +905,7 @@ gail_menu_item_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_menu_item_get_description (AtkAction *action,
                                 gint      i)
 {
@@ -920,7 +920,7 @@ gail_menu_item_get_description (AtkAction *action,
     return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_menu_item_action_get_name (AtkAction *action,
                                 gint      i)
 {
@@ -930,7 +930,7 @@ gail_menu_item_action_get_name (AtkAction *action,
     return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_menu_item_get_keybinding (AtkAction *action,
                                gint      i)
 {
diff --git a/modules/other/gail/gailnotebookpage.c b/modules/other/gail/gailnotebookpage.c
index 6263941c5a..7c201a8435 100644
--- a/modules/other/gail/gailnotebookpage.c
+++ b/modules/other/gail/gailnotebookpage.c
@@ -31,7 +31,7 @@ static void                  gail_notebook_page_finalize       (GObject   *objec
 static void                  gail_notebook_page_label_map_gtk  (GtkWidget *widget,
                                                                 gpointer  data);
 
-static G_CONST_RETURN gchar* gail_notebook_page_get_name       (AtkObject *accessible);
+static const gchar* gail_notebook_page_get_name       (AtkObject *accessible);
 static AtkObject*            gail_notebook_page_get_parent     (AtkObject *accessible);
 static gint                  gail_notebook_page_get_n_children (AtkObject *accessible);
 static AtkObject*            gail_notebook_page_ref_child      (AtkObject *accessible,
@@ -295,7 +295,7 @@ gail_notebook_page_finalize (GObject *object)
   G_OBJECT_CLASS (gail_notebook_page_parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_notebook_page_get_name (AtkObject *accessible)
 {
   g_return_val_if_fail (GAIL_IS_NOTEBOOK_PAGE (accessible), NULL);
diff --git a/modules/other/gail/gailrange.c b/modules/other/gail/gailrange.c
index d708567c7f..fbdec38091 100644
--- a/modules/other/gail/gailrange.c
+++ b/modules/other/gail/gailrange.c
@@ -57,12 +57,12 @@ static gboolean     gail_range_do_action        (AtkAction       *action,
                                                 gint            i);
 static gboolean     idle_do_action              (gpointer        data);
 static gint         gail_range_get_n_actions    (AtkAction       *action);
-static G_CONST_RETURN gchar* gail_range_get_description  (AtkAction    *action, 
-                                                         gint          i);
-static G_CONST_RETURN gchar* gail_range_get_keybinding   (AtkAction     *action,
-                                                         gint            i);
-static G_CONST_RETURN gchar* gail_range_action_get_name  (AtkAction    *action,
-                                                        gint            i);
+static const gchar* gail_range_get_description  (AtkAction    *action,
+                                                 gint          i);
+static const gchar* gail_range_get_keybinding   (AtkAction     *action,
+                                                 gint           i);
+static const gchar* gail_range_action_get_name  (AtkAction    *action,
+                                                 gint          i);
 static gboolean   gail_range_set_description  (AtkAction       *action,
                                               gint            i,
                                               const gchar     *desc);
@@ -392,12 +392,12 @@ gail_range_get_n_actions (AtkAction *action)
     return 1;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_range_get_description (AtkAction *action,
                               gint      i)
 {
   GailRange *range;
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
 
   range = GAIL_RANGE (action);
   if (i==0)
@@ -407,7 +407,7 @@ gail_range_get_description (AtkAction *action,
   return return_value;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_range_get_keybinding (AtkAction *action,
                               gint      i)
 {
@@ -453,11 +453,11 @@ gail_range_get_keybinding (AtkAction *action,
   return return_value;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_range_action_get_name (AtkAction *action,
                            gint      i)
 {
-  G_CONST_RETURN gchar *return_value;
+  const gchar *return_value;
   
   if (i==0)
    return_value = "activate";
diff --git a/modules/other/gail/gailscalebutton.c b/modules/other/gail/gailscalebutton.c
index 820d767439..38f9af8699 100644
--- a/modules/other/gail/gailscalebutton.c
+++ b/modules/other/gail/gailscalebutton.c
@@ -42,11 +42,11 @@ static void                  atk_action_interface_init        (AtkActionIface *i
 static gboolean              gail_scale_button_do_action      (AtkAction      *action,
                                                                gint           i);
 static gint                  gail_scale_button_get_n_actions  (AtkAction      *action);
-static G_CONST_RETURN gchar* gail_scale_button_get_description(AtkAction      *action,
+static const gchar* gail_scale_button_get_description(AtkAction      *action,
                                                                gint           i);
-static G_CONST_RETURN gchar* gail_scale_button_action_get_name(AtkAction      *action,
+static const gchar* gail_scale_button_action_get_name(AtkAction      *action,
                                                                gint           i);
-static G_CONST_RETURN gchar* gail_scale_button_get_keybinding (AtkAction      *action,
+static const gchar* gail_scale_button_get_keybinding (AtkAction      *action,
                                                                gint           i);
 static gboolean              gail_scale_button_set_description(AtkAction      *action,
                                                                gint           i,
@@ -159,14 +159,14 @@ gail_scale_button_get_n_actions (AtkAction *action)
   return 2;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_scale_button_get_description (AtkAction *action,
                                    gint       i)
 {
   return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_scale_button_action_get_name (AtkAction *action,
                                    gint       i)
 {
@@ -180,7 +180,7 @@ gail_scale_button_action_get_name (AtkAction *action,
   }
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_scale_button_get_keybinding (AtkAction *action,
                                   gint       i)
 {
diff --git a/modules/other/gail/gailstatusbar.c b/modules/other/gail/gailstatusbar.c
index 0216862418..c1dd2356d1 100644
--- a/modules/other/gail/gailstatusbar.c
+++ b/modules/other/gail/gailstatusbar.c
@@ -26,7 +26,7 @@
 
 static void         gail_statusbar_class_init          (GailStatusbarClass *klass);
 static void         gail_statusbar_init                (GailStatusbar      *bar);
-static G_CONST_RETURN gchar* gail_statusbar_get_name   (AtkObject          *obj);
+static const gchar* gail_statusbar_get_name   (AtkObject          *obj);
 static gint         gail_statusbar_get_n_children      (AtkObject          *obj);
 static AtkObject*   gail_statusbar_ref_child           (AtkObject          *obj,
                                                         gint               i);
@@ -119,10 +119,10 @@ gail_statusbar_init (GailStatusbar *bar)
 {
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_statusbar_get_name (AtkObject *obj)
 {
-  G_CONST_RETURN gchar* name;
+  const gchar* name;
 
   g_return_val_if_fail (GAIL_IS_STATUSBAR (obj), NULL);
 
diff --git a/modules/other/gail/gailtextcell.c b/modules/other/gail/gailtextcell.c
index f5d7a2afb9..220191709a 100644
--- a/modules/other/gail/gailtextcell.c
+++ b/modules/other/gail/gailtextcell.c
@@ -30,7 +30,7 @@ static void      gail_text_cell_class_init		(GailTextCellClass *klass);
 static void      gail_text_cell_init			(GailTextCell	*text_cell);
 static void      gail_text_cell_finalize		(GObject	*object);
 
-static G_CONST_RETURN gchar* gail_text_cell_get_name    (AtkObject      *atk_obj);
+static const gchar* gail_text_cell_get_name    (AtkObject      *atk_obj);
 
 static void      atk_text_interface_init		(AtkTextIface	*iface);
 
@@ -190,7 +190,7 @@ gail_text_cell_finalize (GObject            *object)
   G_OBJECT_CLASS (gail_text_cell_parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_text_cell_get_name (AtkObject *atk_obj)
 {
   if (atk_obj->name)
diff --git a/modules/other/gail/gailtextview.c b/modules/other/gail/gailtextview.c
index a36a829411..fb05b0feef 100644
--- a/modules/other/gail/gailtextview.c
+++ b/modules/other/gail/gailtextview.c
@@ -133,7 +133,7 @@ static void       gail_text_view_paste_received        (GtkClipboard     *clipbo
 /* AtkStreamableContent */
 static void       atk_streamable_content_interface_init    (AtkStreamableContentIface *iface);
 static gint       gail_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
-static G_CONST_RETURN gchar* gail_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+static const gchar* gail_streamable_content_get_mime_type (AtkStreamableContent *streamable,
 								    gint i);
 static GIOChannel* gail_streamable_content_get_stream       (AtkStreamableContent *streamable,
 							     const gchar *mime_type);
@@ -1662,7 +1662,7 @@ static gint       gail_streamable_content_get_n_mime_types (AtkStreamableContent
     return n_mime_types;
 }
 
-static G_CONST_RETURN gchar*       
+static const gchar*
 gail_streamable_content_get_mime_type (AtkStreamableContent *streamable, gint i)
 {
     if (GAIL_IS_TEXT_VIEW (streamable) && GAIL_TEXT_VIEW (streamable)->textutil)
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
index 0dd82b640e..77ef9c9d27 100644
--- a/modules/other/gail/gailtreeview.c
+++ b/modules/other/gail/gailtreeview.c
@@ -116,7 +116,7 @@ static void             gail_tree_view_set_caption      (AtkTable
 static AtkObject*       gail_tree_view_get_summary      (AtkTable               *table);
 static void             gail_tree_view_set_summary      (AtkTable               *table,
                                                          AtkObject              *accessible);
-static G_CONST_RETURN gchar*
+static const gchar*
                         gail_tree_view_get_row_description 
                                                         (AtkTable               *table,
                                                          gint                   row);
@@ -124,7 +124,7 @@ static void             gail_tree_view_set_row_description
                                                         (AtkTable               *table,
                                                          gint                   row,
                                                          const gchar            *description);
-static G_CONST_RETURN gchar*
+static const gchar*
                         gail_tree_view_get_column_description
                                                         (AtkTable               *table,
                                                          gint                   column);
@@ -1618,7 +1618,7 @@ gail_tree_view_set_caption (AtkTable	*table,
     g_object_unref (old_caption);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_tree_view_get_column_description (AtkTable	  *table,
                                        gint       in_col)
 {
@@ -1684,7 +1684,7 @@ gail_tree_view_set_column_description (AtkTable	   *table,
                          &values, NULL);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_tree_view_get_row_description (AtkTable    *table,
                                     gint        row)
 {
diff --git a/modules/other/gail/gailutil.c b/modules/other/gail/gailutil.c
index 23d758cc42..4d1d6da02c 100644
--- a/modules/other/gail/gailutil.c
+++ b/modules/other/gail/gailutil.c
@@ -38,8 +38,8 @@ static guint		gail_util_add_key_event_listener	(AtkKeySnoopFunc	listener,
 								 gpointer               data);
 static void 		gail_util_remove_key_event_listener	(guint			remove_listener);
 static AtkObject*	gail_util_get_root			(void);
-static G_CONST_RETURN gchar *gail_util_get_toolkit_name		(void);
-static G_CONST_RETURN gchar *gail_util_get_toolkit_version      (void);
+static const gchar *gail_util_get_toolkit_name		(void);
+static const gchar *gail_util_get_toolkit_version      (void);
 
 /* gailmisc/AtkMisc */
 static void		gail_misc_class_init			(GailMiscClass		*klass);
@@ -333,13 +333,13 @@ gail_util_get_root (void)
   return root;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_util_get_toolkit_name (void)
 {
   return "GAIL";
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gail_util_get_toolkit_version (void)
 {
  /*
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 65fc643664..ee7029315a 100644
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -37,7 +37,7 @@ static void gail_widget_connect_widget_destroyed (GtkAccessible    *accessible);
 static void gail_widget_destroyed                (GtkWidget        *widget,
                                                   GtkAccessible    *accessible);
 
-static G_CONST_RETURN gchar* gail_widget_get_description (AtkObject *accessible);
+static const gchar* gail_widget_get_description (AtkObject *accessible);
 static AtkObject* gail_widget_get_parent (AtkObject *accessible);
 static AtkStateSet* gail_widget_ref_state_set (AtkObject *accessible);
 static AtkRelationSet* gail_widget_ref_relation_set (AtkObject *accessible);
@@ -237,7 +237,7 @@ gail_widget_destroyed (GtkWidget     *widget,
                                   TRUE);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_widget_get_description (AtkObject *accessible)
 {
   if (accessible->description)
diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 6d017e3ab0..6cf1066515 100644
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -48,7 +48,7 @@ static void                  gail_window_real_initialize (AtkObject    *obj,
                                                           gpointer     data);
 static void                  gail_window_finalize        (GObject      *object);
 
-static G_CONST_RETURN gchar* gail_window_get_name       (AtkObject     *accessible);
+static const gchar* gail_window_get_name       (AtkObject     *accessible);
 
 static AtkObject*            gail_window_get_parent     (AtkObject     *accessible);
 static gint                  gail_window_get_index_in_parent (AtkObject *accessible);
@@ -263,10 +263,10 @@ gail_window_finalize (GObject *object)
   G_OBJECT_CLASS (gail_window_parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_window_get_name (AtkObject *accessible)
 {
-  G_CONST_RETURN gchar* name;
+  const gchar* name;
 
   name = ATK_OBJECT_CLASS (gail_window_parent_class)->get_name (accessible);
   if (name == NULL)