From ce62390010057fad06b4aa7f1ee0ea08c90eb225 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 9 Jun 2011 15:00:03 -0400 Subject: Replace G_CONST_RETURN with 'const'. GLib is finally dropping this hack. --- addressbook/gui/widgets/ea-addressbook-view.c | 8 ++++---- addressbook/gui/widgets/ea-minicard-view.c | 16 ++++++++-------- addressbook/gui/widgets/ea-minicard.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'addressbook') 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 #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) -- cgit v1.2.3