Replace G_CONST_RETURN with 'const'.

GLib is finally dropping this hack.

10 files changed, 52 insertions, 52 deletions

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;