Replace G_CONST_RETURN with 'const'.

GLib is finally dropping this hack.

21 files changed, 99 insertions, 99 deletions

diff --git a/addressbook/gui/widgets/ea-addressbook-view.c b/addressbook/gui/widgets/ea-addressbook-view.c
index 46a54a4154..2d432b6a76 100644
--- a/addressbook/gui/widgets/ea-addressbook-view.c
+++ b/addressbook/gui/widgets/ea-addressbook-view.c
@@ -27,8 +27,8 @@
 #include <glib/gi18n.h>
 #include "ea-addressbook-view.h"
 
-static G_CONST_RETURN gchar * ea_ab_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_ab_view_get_description (AtkObject *accessible);
+static const gchar * ea_ab_view_get_name (AtkObject *accessible);
+static const gchar * ea_ab_view_get_description (AtkObject *accessible);
 
 static void ea_ab_view_class_init (EAddressbookViewClass *class);
 
@@ -87,7 +87,7 @@ ea_ab_view_class_init (EAddressbookViewClass *class)
 	atk_object_class->get_description = ea_ab_view_get_description;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_ab_view_get_name (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_AB_VIEW (accessible), NULL);
@@ -97,7 +97,7 @@ ea_ab_view_get_name (AtkObject *accessible)
 	return _("evolution address book");
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_ab_view_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index a6cd1f799c..6850813ca7 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -37,8 +37,8 @@ static const gchar * action_name[] = {
 	N_("New Contact List")
 };
 
-static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible);
+static const gchar * ea_minicard_view_get_name (AtkObject *accessible);
+static const gchar * ea_minicard_view_get_description (AtkObject *accessible);
 
 static void ea_minicard_view_class_init (EaMinicardViewClass *klass);
 
@@ -60,11 +60,11 @@ static gboolean selection_interface_is_child_selected (AtkSelection *selection,
 static void atk_action_interface_init (AtkActionIface *iface);
 static gboolean atk_action_interface_do_action (AtkAction *iface, gint i);
 static gint atk_action_interface_get_n_action (AtkAction *iface);
-static G_CONST_RETURN gchar *
+static const gchar *
 		atk_action_interface_get_description
 						(AtkAction *iface,
 						 gint i);
-static G_CONST_RETURN gchar *
+static const gchar *
 		atk_action_interface_get_name	(AtkAction *iface,
 						 gint i);
 
@@ -142,7 +142,7 @@ ea_minicard_view_class_init (EaMinicardViewClass *klass)
 	class->ref_child = ea_minicard_view_ref_child;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_minicard_view_get_name (AtkObject *accessible)
 {
 	EReflow *reflow;
@@ -177,7 +177,7 @@ ea_minicard_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_minicard_view_get_description (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
@@ -406,13 +406,13 @@ static gint atk_action_interface_get_n_action (AtkAction *iface)
 	return G_N_ELEMENTS (action_name);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 atk_action_interface_get_description (AtkAction *iface, gint i)
 {
 	return atk_action_interface_get_name (iface, i);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
 	if ( i >= G_N_ELEMENTS (action_name) || i < 0)
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index e218286411..2e8d4281ef 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -34,9 +34,9 @@ static const gchar * action_name[] = {
 	N_("Open")
 };
 
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_minicard_get_name		(AtkObject *accessible);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_minicard_get_description	(AtkObject *accessible);
 
 static void	ea_minicard_class_init		(EaMinicardClass *klass);
@@ -54,11 +54,11 @@ static gboolean	atk_action_interface_do_action	(AtkAction *iface,
 						 gint i);
 static gint	atk_action_interface_get_n_action
 						(AtkAction *iface);
-static G_CONST_RETURN gchar *
+static const gchar *
 		atk_action_interface_get_description
 						(AtkAction *iface,
 						 gint i);
-static G_CONST_RETURN gchar *
+static const gchar *
 		atk_action_interface_get_name	(AtkAction *iface,
 						 gint i);
 
@@ -132,7 +132,7 @@ ea_minicard_class_init (EaMinicardClass *klass)
  *  we access the main content of current minicard, including
  *  header text, label(field, field name)
  */
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_minicard_get_name (AtkObject *accessible)
 {
 #define BUFFERSIZE 500
@@ -174,7 +174,7 @@ ea_minicard_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_minicard_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -277,13 +277,13 @@ atk_action_interface_get_n_action (AtkAction *iface)
 	return G_N_ELEMENTS (action_name);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 atk_action_interface_get_description (AtkAction *iface, gint i)
 {
 	return atk_action_interface_get_name (iface, i);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
 	if ( i >= G_N_ELEMENTS (action_name) || i < 0)
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 6682681483..55457bf4dc 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -34,9 +34,9 @@
 static void	ea_cal_view_event_class_init	(EaCalViewEventClass *klass);
 static void	ea_cal_view_event_init		(EaCalViewEvent *a11y);
 static void	ea_cal_view_event_dispose	(GObject *object);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_cal_view_event_get_name	(AtkObject *accessible);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_cal_view_event_get_description
 						(AtkObject *accessible);
 static AtkObject *
@@ -59,7 +59,7 @@ static void	atk_action_interface_init	(AtkActionIface *iface);
 static gboolean	ea_cal_view_event_do_action	(AtkAction *action,
 						 gint i);
 static gint	ea_cal_view_event_get_n_actions	(AtkAction *action);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_cal_view_event_action_get_name
 						(AtkAction *action,
 						 gint i);
@@ -261,7 +261,7 @@ ea_cal_view_event_dispose (GObject *object)
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_cal_view_event_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -319,7 +319,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_cal_view_event_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -590,7 +590,7 @@ ea_cal_view_event_get_n_actions (AtkAction *action)
 	return CAL_VIEW_EVENT_ACTION_NUM;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_cal_view_event_action_get_name (AtkAction *action, gint i)
 {
 	if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM)
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 7e50284226..5b93469450 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -49,11 +49,11 @@ static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data);
 static void atk_action_interface_init (AtkActionIface *iface);
 static gboolean action_interface_do_action (AtkAction *action, gint i);
 static gint action_interface_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_get_description (AtkAction *action, gint i);
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_get_keybinding (AtkAction *action, gint i);
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_action_get_name (AtkAction *action, gint i);
 
 static gpointer parent_class = NULL;
@@ -380,13 +380,13 @@ action_interface_get_n_actions (AtkAction *action)
 	return CAL_VIEW_ACTION_NUM;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_get_description (AtkAction *action, gint index)
 {
 	return action_interface_action_get_name (action, index);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_get_keybinding (AtkAction *action, gint index)
 {
 	GtkWidget *widget;
@@ -423,7 +423,7 @@ action_interface_get_keybinding (AtkAction *action, gint index)
 	 return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 action_interface_action_get_name (AtkAction *action, gint i)
 {
 	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index bb2c32d982..a94a9d193f 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -93,8 +93,8 @@ e_day_view_cell_new (EDayView *day_view, gint row, gint column)
 
 static void ea_day_view_cell_class_init (EaDayViewCellClass *klass);
 
-static G_CONST_RETURN gchar * ea_day_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_day_view_cell_get_description (AtkObject *accessible);
+static const gchar * ea_day_view_cell_get_name (AtkObject *accessible);
+static const gchar * ea_day_view_cell_get_description (AtkObject *accessible);
 static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj);
 static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible);
 static gint ea_day_view_cell_get_index_in_parent (AtkObject *accessible);
@@ -200,7 +200,7 @@ static void ea_day_view_cell_finalize (GObject *object)
 }
 #endif
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_cell_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -234,7 +234,7 @@ ea_day_view_cell_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_cell_get_description (AtkObject *accessible)
 {
 	return ea_day_view_cell_get_name (accessible);
diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 36abbc0954..1274cb7b72 100644
--- a/calendar/gui/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
@@ -36,9 +36,9 @@
 static void	ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
 
 static void	ea_day_view_main_item_finalize	(GObject *object);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_day_view_main_item_get_name	(AtkObject *accessible);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_day_view_main_item_get_description
 						(AtkObject *accessible);
 
@@ -102,10 +102,10 @@ static AtkObject* table_interface_get_column_header (AtkTable *table,
 						     gint in_col);
 static AtkObject* table_interface_get_caption (AtkTable *table);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_column_description (AtkTable *table, gint in_col);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_row_description (AtkTable *table, gint row);
 
 static AtkObject* table_interface_get_summary (AtkTable *table);
@@ -293,7 +293,7 @@ ea_day_view_main_item_finalize (GObject *object)
 #endif
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_main_item_get_name (AtkObject *accessible)
 {
 	AtkObject *parent;
@@ -306,7 +306,7 @@ ea_day_view_main_item_get_name (AtkObject *accessible)
 	return atk_object_get_name (parent);
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_main_item_get_description (AtkObject *accessible)
 {
 	return _("a table to view and select the current time range");
@@ -1064,7 +1064,7 @@ table_interface_get_caption (AtkTable	*table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_column_description (AtkTable	  *table,
 					gint       in_col)
 {
@@ -1100,7 +1100,7 @@ table_interface_get_column_description (AtkTable	  *table,
 	return description;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_row_description (AtkTable    *table,
 				     gint        row)
 {
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 8a2c4b5031..72f3e5ba61 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -33,8 +33,8 @@
 
 static void ea_day_view_class_init (EaDayViewClass *klass);
 
-static G_CONST_RETURN gchar * ea_day_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_day_view_get_description (AtkObject *accessible);
+static const gchar * ea_day_view_get_name (AtkObject *accessible);
+static const gchar * ea_day_view_get_description (AtkObject *accessible);
 static gint         ea_day_view_get_n_children      (AtkObject *obj);
 static AtkObject*   ea_day_view_ref_child           (AtkObject *obj,
                                                      gint i);
@@ -119,7 +119,7 @@ ea_day_view_new (GtkWidget *widget)
 	return accessible;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_get_name (AtkObject *accessible)
 {
 	EDayView *day_view;
@@ -176,7 +176,7 @@ ea_day_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_day_view_get_description (AtkObject *accessible)
 {
 	EDayView *day_view;
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index 76a5a007e7..0983de84b9 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -42,7 +42,7 @@ static void ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data);
 
 static gpointer parent_class = NULL;
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_gnome_calendar_get_name (AtkObject *accessible)
 {
 	if (accessible->name)
@@ -50,7 +50,7 @@ ea_gnome_calendar_get_name (AtkObject *accessible)
 	return _("Gnome Calendar");
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_gnome_calendar_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
diff --git a/calendar/gui/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index 7a31c09535..e19b1037a0 100644
--- a/calendar/gui/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
@@ -34,15 +34,15 @@
 
 static void ea_jump_button_class_init (EaJumpButtonClass *klass);
 
-static G_CONST_RETURN gchar * ea_jump_button_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_jump_button_get_description (AtkObject *accessible);
+static const gchar * ea_jump_button_get_name (AtkObject *accessible);
+static const gchar * ea_jump_button_get_description (AtkObject *accessible);
 
 /* action interface */
 static void                  atk_action_interface_init  (AtkActionIface *iface);
 static gboolean              jump_button_do_action      (AtkAction      *action,
                                                          gint           i);
 static gint                  jump_button_get_n_actions  (AtkAction      *action);
-static G_CONST_RETURN gchar * jump_button_get_keybinding (AtkAction      *action,
+static const gchar * jump_button_get_keybinding (AtkAction      *action,
                                                          gint           i);
 
 static gpointer parent_class = NULL;
@@ -140,7 +140,7 @@ ea_jump_button_new (GObject *obj)
 	return atk_obj;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_jump_button_get_name (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_JUMP_BUTTON (accessible), NULL);
@@ -150,7 +150,7 @@ ea_jump_button_get_name (AtkObject *accessible)
 	return _("Jump button");
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_jump_button_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -207,7 +207,7 @@ jump_button_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 jump_button_get_keybinding (AtkAction *action,
                             gint      i)
 {
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index 299c730142..506a5f5724 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -93,8 +93,8 @@ e_week_view_cell_new (EWeekView *week_view, gint row, gint column)
 
 static void ea_week_view_cell_class_init (EaWeekViewCellClass *klass);
 
-static G_CONST_RETURN gchar * ea_week_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_week_view_cell_get_description (AtkObject *accessible);
+static const gchar * ea_week_view_cell_get_name (AtkObject *accessible);
+static const gchar * ea_week_view_cell_get_description (AtkObject *accessible);
 static AtkStateSet* ea_week_view_cell_ref_state_set (AtkObject *obj);
 static AtkObject * ea_week_view_cell_get_parent (AtkObject *accessible);
 static gint ea_week_view_cell_get_index_in_parent (AtkObject *accessible);
@@ -200,7 +200,7 @@ static void ea_week_view_cell_finalize (GObject *object)
 }
 #endif
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_cell_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -246,7 +246,7 @@ ea_week_view_cell_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_cell_get_description (AtkObject *accessible)
 {
 	return ea_week_view_cell_get_name (accessible);
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index b0487b7031..cdeefa0138 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -35,9 +35,9 @@
 static void	ea_week_view_main_item_class_init
 						(EaWeekViewMainItemClass *class);
 static void	ea_week_view_main_item_finalize	(GObject *object);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_week_view_main_item_get_name	(AtkObject *accessible);
-static G_CONST_RETURN gchar *
+static const gchar *
 		ea_week_view_main_item_get_description
 						(AtkObject *accessible);
 static gint	ea_week_view_main_item_get_n_children
@@ -129,12 +129,12 @@ static AtkObject *
 static AtkObject *
 		table_interface_get_caption	(AtkTable *table);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 		table_interface_get_column_description
 						(AtkTable *table,
 						 gint in_col);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 		table_interface_get_row_description
 						(AtkTable *table,
 						 gint row);
@@ -328,7 +328,7 @@ ea_week_view_main_item_finalize (GObject *object)
 #endif
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_main_item_get_name (AtkObject *accessible)
 {
 	AtkObject *parent;
@@ -338,7 +338,7 @@ ea_week_view_main_item_get_name (AtkObject *accessible)
 
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_main_item_get_description (AtkObject *accessible)
 {
 	return _("a table to view and select the current time range");
@@ -1060,7 +1060,7 @@ table_interface_get_caption (AtkTable	*table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_column_description (AtkTable	  *table,
 					gint       in_col)
 {
@@ -1117,7 +1117,7 @@ table_interface_get_column_description (AtkTable	  *table,
 	return description;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_row_description (AtkTable    *table,
 				     gint        row)
 {
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index ec9c5af3f9..c431f2ce14 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -33,8 +33,8 @@
 
 static void ea_week_view_class_init (EaWeekViewClass *klass);
 
-static G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_week_view_get_description (AtkObject *accessible);
+static const gchar * ea_week_view_get_name (AtkObject *accessible);
+static const gchar * ea_week_view_get_description (AtkObject *accessible);
 static gint         ea_week_view_get_n_children      (AtkObject *obj);
 static AtkObject*   ea_week_view_ref_child           (AtkObject *obj,
 						      gint i);
@@ -121,7 +121,7 @@ ea_week_view_new (GtkWidget *widget)
 	return accessible;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_get_name (AtkObject *accessible)
 {
 	EWeekView *week_view;
@@ -170,7 +170,7 @@ ea_week_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_week_view_get_description (AtkObject *accessible)
 {
 	EWeekView *week_view;
diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index 0d41575a58..b8e53fd359 100644
--- a/widgets/misc/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
@@ -95,8 +95,8 @@ e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column)
 static void ea_calendar_cell_class_init (EaCalendarCellClass *klass);
 static void ea_calendar_cell_init (EaCalendarCell *a11y);
 
-static G_CONST_RETURN gchar * ea_calendar_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_calendar_cell_get_description (AtkObject *accessible);
+static const gchar * ea_calendar_cell_get_name (AtkObject *accessible);
+static const gchar * ea_calendar_cell_get_description (AtkObject *accessible);
 static AtkObject * ea_calendar_cell_get_parent (AtkObject *accessible);
 static gint ea_calendar_cell_get_index_in_parent (AtkObject *accessible);
 static AtkStateSet *ea_calendar_cell_ref_state_set (AtkObject *accessible);
@@ -213,7 +213,7 @@ static void ea_calendar_cell_finalize (GObject *object)
 }
 #endif
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_calendar_cell_get_name (AtkObject *accessible)
 {
 	GObject *g_obj;
@@ -247,7 +247,7 @@ ea_calendar_cell_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_calendar_cell_get_description (AtkObject *accessible)
 {
 	return ea_calendar_cell_get_name (accessible);
diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index 89fcf3a031..5d482feb40 100644
--- a/widgets/misc/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
@@ -41,8 +41,8 @@
 static void ea_calendar_item_class_init (EaCalendarItemClass *klass);
 static void ea_calendar_item_finalize (GObject *object);
 
-static G_CONST_RETURN gchar * ea_calendar_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar * ea_calendar_item_get_description (AtkObject *accessible);
+static const gchar * ea_calendar_item_get_name (AtkObject *accessible);
+static const gchar * ea_calendar_item_get_description (AtkObject *accessible);
 static gint ea_calendar_item_get_n_children (AtkObject *accessible);
 static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index);
 static AtkStateSet* ea_calendar_item_ref_state_set (AtkObject *accessible);
@@ -91,10 +91,10 @@ static AtkObject* table_interface_get_column_header (AtkTable *table,
 						     gint in_col);
 static AtkObject* table_interface_get_caption (AtkTable *table);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_column_description (AtkTable *table, gint in_col);
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_row_description (AtkTable *table, gint row);
 
 static AtkObject* table_interface_get_summary (AtkTable *table);
@@ -266,7 +266,7 @@ ea_calendar_item_finalize (GObject *object)
 #endif
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_calendar_item_get_name (AtkObject *accessible)
 {
 	GObject *g_obj;
@@ -341,7 +341,7 @@ ea_calendar_item_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 ea_calendar_item_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -795,7 +795,7 @@ table_interface_get_caption (AtkTable	*table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_column_description (AtkTable *table, gint in_col)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -829,7 +829,7 @@ table_interface_get_column_description (AtkTable *table, gint in_col)
 	return description;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 table_interface_get_row_description (AtkTable *table, gint row)
 {
 	AtkGObjectAccessible *atk_gobj;
diff --git a/widgets/misc/ea-cell-table.c b/widgets/misc/ea-cell-table.c
index 19c4ffb4aa..c0c2bc0cde 100644
--- a/widgets/misc/ea-cell-table.c
+++ b/widgets/misc/ea-cell-table.c
@@ -146,7 +146,7 @@ ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
 	return TRUE;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 ea_cell_table_get_column_label (EaCellTable * cell_data,
 				gint column)
 {
@@ -168,7 +168,7 @@ ea_cell_table_set_column_label (EaCellTable * cell_data,
 	cell_data->column_labels[column] = g_strdup (label);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 ea_cell_table_get_row_label (EaCellTable * cell_data,
 			     gint row)
 {
diff --git a/widgets/misc/ea-cell-table.h b/widgets/misc/ea-cell-table.h
index bcd6efdc85..a13d7a52c7 100644
--- a/widgets/misc/ea-cell-table.h
+++ b/widgets/misc/ea-cell-table.h
@@ -47,11 +47,11 @@ gpointer ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
 gboolean ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
 					  gint index, gpointer cell);
 
-G_CONST_RETURN gchar *
+const gchar *
 ea_cell_table_get_column_label (EaCellTable * cell_data, gint column);
 void ea_cell_table_set_column_label (EaCellTable * cell_data,
 				     gint column, const gchar *label);
-G_CONST_RETURN gchar *
+const gchar *
 ea_cell_table_get_row_label (EaCellTable * cell_data, gint row);
 void ea_cell_table_set_row_label (EaCellTable * cell_data,
 				  gint row, const gchar *label);
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index d5853270a4..e48977f026 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -103,7 +103,7 @@ gal_a11y_e_cell_dispose (GObject *object)
 }
 
 /* Static functions */
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_get_name (AtkObject * a11y)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (a11y);
@@ -375,7 +375,7 @@ gal_a11y_e_cell_action_get_n_actions (AtkAction *action)
 		return 0;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_name (AtkAction *action,
                            gint      index)
 {
@@ -387,7 +387,7 @@ gal_a11y_e_cell_action_get_name (AtkAction *action,
 	return info->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_description (AtkAction *action,
 					gint      index)
 {
@@ -414,7 +414,7 @@ gal_a11y_e_cell_action_set_description (AtkAction   *action,
 	return TRUE;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_keybinding (AtkAction *action,
 				       gint      index)
 {
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 263af62e9a..a947415c15 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -54,7 +54,7 @@ etcta_get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_get_description (AtkAction *action,
                              gint      i)
 {
@@ -64,7 +64,7 @@ etcta_get_description (AtkAction *action,
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_action_get_name (AtkAction *action, gint      i)
 {
 	if (i == 0)
@@ -125,7 +125,7 @@ atk_action_interface_init (AtkActionIface *iface)
 	iface->get_name = etcta_action_get_name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_get_name (AtkObject *obj)
 {
 	ETableClickToAdd * etcta;
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index a7503352a3..ccbfffadc9 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -146,11 +146,11 @@ gal_a11y_e_table_column_header_get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_table_column_header_action_get_name (AtkAction *action,
 						gint      i)
 {
-	G_CONST_RETURN gchar *return_value;
+	const gchar *return_value;
 
 	switch (i) {
 		case 0:
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 560ea3f54a..e296882e65 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -511,7 +511,7 @@ eti_get_caption (AtkTable *table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 eti_get_column_description (AtkTable *table,
 			    gint column)
 {
@@ -546,7 +546,7 @@ eti_get_column_header (AtkTable *table, gint column)
 	return atk_obj;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 eti_get_row_description (AtkTable *table,
 			 gint row)
 {