Prefer GLib basic types over C types.

3 files changed, 22 insertions, 22 deletions

diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index 6c2da221b9..75309daa14 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -25,8 +25,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 G_CONST_RETURN gchar * ea_ab_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_ab_view_get_description (AtkObject *accessible);
 
 static void ea_ab_view_class_init (EABViewClass *klass);
 
@@ -84,7 +84,7 @@ ea_ab_view_class_init (EABViewClass *klass)
 	class->get_description = ea_ab_view_get_description;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_ab_view_get_name (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_AB_VIEW(accessible), NULL);
@@ -94,7 +94,7 @@ ea_ab_view_get_name (AtkObject *accessible)
 	return _("evolution address book");
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_ab_view_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index dab53e6ce5..d13975b34a 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -29,14 +29,14 @@
 #include "eab-gui-util.h"
 #include "e-addressbook-view.h"
 
-static const char * action_name[] = {
+static const gchar * action_name[] = {
 	N_("New Contact"),
 	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 G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible);
 
 static void ea_minicard_view_class_init (EaMinicardViewClass *klass);
 
@@ -58,8 +58,8 @@ 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* atk_action_interface_get_description (AtkAction *iface, gint i);
-static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i);
 
 static gpointer parent_class = NULL;
 
@@ -135,7 +135,7 @@ ea_minicard_view_class_init (EaMinicardViewClass *klass)
 	class->ref_child = ea_minicard_view_ref_child;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_minicard_view_get_name (AtkObject *accessible)
 {
 	EReflow *reflow;
@@ -169,7 +169,7 @@ ea_minicard_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_minicard_view_get_description (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_MINICARD_VIEW(accessible), NULL);
@@ -403,13 +403,13 @@ static gint atk_action_interface_get_n_action (AtkAction *iface)
 	return G_N_ELEMENTS (action_name);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 atk_action_interface_get_description (AtkAction *iface, gint i)
 {
 	return atk_action_interface_get_name (iface, i);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
 	if( i >= G_N_ELEMENTS (action_name) || i < 0)
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
index d77d591fcc..b1b1ebbe33 100644
--- a/a11y/addressbook/ea-minicard.c
+++ b/a11y/addressbook/ea-minicard.c
@@ -27,12 +27,12 @@
 #include "ea-minicard-view.h"
 #include "e-minicard.h"
 
-static const char * action_name[] = {
+static const gchar * action_name[] = {
 	N_("Open")
 };
 
-static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_minicard_get_description (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_minicard_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_minicard_get_description (AtkObject *accessible);
 
 static void ea_minicard_class_init (EaMinicardClass *klass);
 
@@ -44,8 +44,8 @@ static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj);
 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* atk_action_interface_get_description (AtkAction *iface, gint i);
-static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i);
 
 static gpointer parent_class = NULL;
 
@@ -117,7 +117,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 G_CONST_RETURN gchar *
 ea_minicard_get_name (AtkObject *accessible)
 {
 #define BUFFERSIZE 500
@@ -159,7 +159,7 @@ ea_minicard_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_minicard_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -256,13 +256,13 @@ static gint atk_action_interface_get_n_action (AtkAction *iface)
 	return G_N_ELEMENTS (action_name);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 atk_action_interface_get_description (AtkAction *iface, gint i)
 {
 	return atk_action_interface_get_name (iface, i);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 atk_action_interface_get_name (AtkAction *iface, gint i)
 {
 	if( i >= G_N_ELEMENTS (action_name) || i < 0)