Replace G_CONST_RETURN with 'const'.

GLib is finally dropping this hack.

8 files changed, 27 insertions, 27 deletions

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)
 {