Prefer GLib basic types over C types.

11 files changed, 72 insertions, 72 deletions

diff --git a/calendar/gui/a11y/ea-cal-view-event.c b/calendar/gui/a11y/ea-cal-view-event.c
index e0c0f8fdac..5da164323f 100644
--- a/calendar/gui/a11y/ea-cal-view-event.c
+++ b/calendar/gui/a11y/ea-cal-view-event.c
@@ -31,8 +31,8 @@ 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* ea_cal_view_event_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_cal_view_event_get_description (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_cal_view_event_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_cal_view_event_get_description (AtkObject *accessible);
 static AtkObject* ea_cal_view_event_get_parent (AtkObject *accessible);
 static gint ea_cal_view_event_get_index_in_parent (AtkObject *accessible);
 static AtkStateSet *ea_cal_view_event_ref_state_set (AtkObject *accessible);
@@ -46,7 +46,7 @@ static void ea_cal_view_get_extents (AtkComponent *component,
 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* ea_cal_view_event_action_get_name (AtkAction *action, gint i);
+static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i);
 
 
 #ifdef ACC_DEBUG
@@ -240,7 +240,7 @@ ea_cal_view_event_dispose (GObject *object)
                 G_OBJECT_CLASS(parent_class)->dispose (object);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_cal_view_event_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -251,7 +251,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	const gchar *recur_string;
 	const gchar *meeting_string;
 	gchar *summary_string;
-        const char *summary;
+        const gchar *summary;
 
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
@@ -287,13 +287,13 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string);
 #ifdef ACC_DEBUG
 	printf("EvoAcc:  name for event accobj=%p, is %s\n",
-	       (void *)accessible, new_name);
+	       (gpointer)accessible, new_name);
 #endif
 	g_free (name_string);
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_cal_view_event_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -526,7 +526,7 @@ ea_cal_view_get_extents (AtkComponent   *component,
 
 #define CAL_VIEW_EVENT_ACTION_NUM 1
 
-static const char * action_name [CAL_VIEW_EVENT_ACTION_NUM] = {
+static const gchar * action_name [CAL_VIEW_EVENT_ACTION_NUM] = {
         N_("Grab Focus")
 };
 
@@ -563,7 +563,7 @@ ea_cal_view_event_get_n_actions (AtkAction *action)
         return CAL_VIEW_EVENT_ACTION_NUM;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN 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/a11y/ea-cal-view.c b/calendar/gui/a11y/ea-cal-view.c
index 7e337ac16b..952afcc791 100644
--- a/calendar/gui/a11y/ea-cal-view.c
+++ b/calendar/gui/a11y/ea-cal-view.c
@@ -45,11 +45,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 G_CONST_RETURN gchar *
 action_interface_get_description(AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 action_interface_get_keybinding (AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 action_interface_action_get_name(AtkAction *action, gint i);
 
 static gpointer parent_class = NULL;
@@ -212,7 +212,7 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event
 	}
 	if (event_atk_obj) {
 #ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p changed\n", (void *)event);
+		printf ("AccDebug: event=%p changed\n", (gpointer)event);
 #endif
 		g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
 		g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
@@ -254,7 +254,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
 		if (index < 0)
 			return;
 #ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p added\n", (void *)event);
+		printf ("AccDebug: event=%p added\n", (gpointer)event);
 #endif
 		g_signal_emit_by_name (atk_obj, "children_changed::add",
 				       index, event_atk_obj, NULL);
@@ -295,7 +295,7 @@ ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data)
 
 #define CAL_VIEW_ACTION_NUM 5
 
-static const char * action_name [CAL_VIEW_ACTION_NUM] = {
+static const gchar * action_name [CAL_VIEW_ACTION_NUM] = {
 	N_("New Appointment"),
 	N_("New All Day Event"),
 	N_("New Meeting"),
@@ -374,13 +374,13 @@ action_interface_get_n_actions (AtkAction *action)
 	return CAL_VIEW_ACTION_NUM;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 action_interface_get_description(AtkAction *action, gint index)
 {
 	return action_interface_action_get_name (action, index);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 action_interface_get_keybinding (AtkAction *action, gint index)
 {
 	GtkWidget *widget;
@@ -417,7 +417,7 @@ action_interface_get_keybinding (AtkAction *action, gint index)
 	 return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 action_interface_action_get_name(AtkAction *action, gint i)
 {
 	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
diff --git a/calendar/gui/a11y/ea-calendar.c b/calendar/gui/a11y/ea-calendar.c
index 2662f42283..d09efae4d2 100644
--- a/calendar/gui/a11y/ea-calendar.c
+++ b/calendar/gui/a11y/ea-calendar.c
@@ -172,7 +172,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
 				/* focus out */
 				ea_event = NULL;
 #ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on day main item %p\n", (void *)object);
+			printf ("EvoAcc: focus notify on day main item %p\n", (gpointer)object);
 #endif
 			atk_focus_tracker_notify (ea_event);
 		}
@@ -195,7 +195,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
 				/* focus out */
 				ea_event = NULL;
 #ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on week main item %p\n", (void *)object);
+			printf ("EvoAcc: focus notify on week main item %p\n", (gpointer)object);
 #endif
 			atk_focus_tracker_notify (ea_event);
 		}
diff --git a/calendar/gui/a11y/ea-day-view-cell.c b/calendar/gui/a11y/ea-day-view-cell.c
index 3555723b13..fa491e87ea 100644
--- a/calendar/gui/a11y/ea-day-view-cell.c
+++ b/calendar/gui/a11y/ea-day-view-cell.c
@@ -79,7 +79,7 @@ e_day_view_cell_new (EDayView *day_view, gint row, gint column)
 	cell->column = column;
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: e_day_view_cell created %p\n", (void *)cell);
+	printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer)cell);
 #endif
 
 	return cell;
@@ -89,8 +89,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 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 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);
@@ -196,7 +196,7 @@ static void ea_day_view_cell_finalize (GObject *object)
 }
 #endif
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_cell_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -230,7 +230,7 @@ ea_day_view_cell_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_cell_get_description (AtkObject *accessible)
 {
 	return ea_day_view_cell_get_name (accessible);
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/a11y/ea-day-view-main-item.c
index 783710dc61..c1176b4417 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/a11y/ea-day-view-main-item.c
@@ -32,8 +32,8 @@
 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* ea_day_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_description (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_day_view_main_item_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_day_view_main_item_get_description (AtkObject *accessible);
 
 static gint         ea_day_view_main_item_get_n_children (AtkObject *obj);
 static AtkObject*   ea_day_view_main_item_ref_child (AtkObject *obj,
@@ -95,10 +95,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 G_CONST_RETURN gchar *
 table_interface_get_column_description (AtkTable *table, gint in_col);
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_row_description (AtkTable *table, gint row);
 
 static AtkObject* table_interface_get_summary (AtkTable *table);
@@ -282,7 +282,7 @@ ea_day_view_main_item_finalize (GObject *object)
 #endif
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_main_item_get_name (AtkObject *accessible)
 {
 	AtkObject *parent;
@@ -295,7 +295,7 @@ ea_day_view_main_item_get_name (AtkObject *accessible)
 	return atk_object_get_name (parent);
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_main_item_get_description (AtkObject *accessible)
 {
 	return _("a table to view and select the current time range");
@@ -1045,7 +1045,7 @@ table_interface_get_caption (AtkTable	*table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_column_description (AtkTable	  *table,
 					gint       in_col)
 {
@@ -1081,7 +1081,7 @@ table_interface_get_column_description (AtkTable	  *table,
 	return description;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_row_description (AtkTable    *table,
 				     gint        row)
 {
diff --git a/calendar/gui/a11y/ea-day-view.c b/calendar/gui/a11y/ea-day-view.c
index 107f983bb0..9eb3e343f3 100644
--- a/calendar/gui/a11y/ea-day-view.c
+++ b/calendar/gui/a11y/ea-day-view.c
@@ -31,8 +31,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 G_CONST_RETURN gchar * ea_day_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN 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);
@@ -111,13 +111,13 @@ ea_day_view_new (GtkWidget *widget)
 	atk_object_initialize (accessible, widget);
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view created %p\n", (void *)accessible);
+	printf ("EvoAcc: ea_day_view created %p\n", (gpointer)accessible);
 #endif
 
 	return accessible;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_get_name (AtkObject *accessible)
 {
 	EDayView *day_view;
@@ -172,7 +172,7 @@ ea_day_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_day_view_get_description (AtkObject *accessible)
 {
 	EDayView *day_view;
diff --git a/calendar/gui/a11y/ea-gnome-calendar.c b/calendar/gui/a11y/ea-gnome-calendar.c
index 4d6e752b8e..e5d9654c1a 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.c
+++ b/calendar/gui/a11y/ea-gnome-calendar.c
@@ -31,8 +31,8 @@
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
 
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_description (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_gnome_calendar_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_gnome_calendar_get_description (AtkObject *accessible);
 static gint ea_gnome_calendar_get_n_children (AtkObject* obj);
 static AtkObject * ea_gnome_calendar_ref_child (AtkObject *obj, gint i);
 
@@ -130,7 +130,7 @@ ea_gnome_calendar_new (GtkWidget *widget)
 	}
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (void *)accessible);
+	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer)accessible);
 #endif
 
 	return accessible;
@@ -143,8 +143,8 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal)
 	struct icaltimetype start_tt, end_tt;
 	time_t start_time, end_time;
 	struct tm start_tm, end_tm;
-	static char buffer[512];
-	char end_buffer[256];
+	static gchar buffer[512];
+	gchar end_buffer[256];
 	GnomeCalendarViewType view;
 
 	gnome_calendar_get_visible_time_range (gcal, &start_time, &end_time);
@@ -237,7 +237,7 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal)
 	return buffer;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_gnome_calendar_get_name (AtkObject *accessible)
 {
 	if (accessible->name)
@@ -245,7 +245,7 @@ ea_gnome_calendar_get_name (AtkObject *accessible)
 	return _("Gnome Calendar");
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_gnome_calendar_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -328,7 +328,7 @@ ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
 
 #ifdef ACC_DEBUG
 	printf ("AccDebug: view switch to widget %p (index=%d) \n",
-		(void *)new_widget, index);
+		(gpointer)new_widget, index);
 #endif
 }
 
diff --git a/calendar/gui/a11y/ea-jump-button.c b/calendar/gui/a11y/ea-jump-button.c
index 7888196b8d..eb24bea42c 100644
--- a/calendar/gui/a11y/ea-jump-button.c
+++ b/calendar/gui/a11y/ea-jump-button.c
@@ -30,15 +30,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 G_CONST_RETURN gchar * ea_jump_button_get_name (AtkObject *accessible);
+static G_CONST_RETURN 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 G_CONST_RETURN gchar * jump_button_get_keybinding (AtkAction      *action,
                                                          gint           i);
 
 static gpointer parent_class = NULL;
@@ -137,7 +137,7 @@ ea_jump_button_new (GObject *obj)
 	return atk_obj;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_jump_button_get_name (AtkObject *accessible)
 {
 	g_return_val_if_fail (EA_IS_JUMP_BUTTON (accessible), NULL);
@@ -147,7 +147,7 @@ ea_jump_button_get_name (AtkObject *accessible)
 	return _("Jump button");
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_jump_button_get_description (AtkObject *accessible)
 {
 	if (accessible->description)
@@ -204,7 +204,7 @@ jump_button_get_n_actions (AtkAction *action)
   return 1;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 jump_button_get_keybinding (AtkAction *action,
                             gint      i)
 {
diff --git a/calendar/gui/a11y/ea-week-view-cell.c b/calendar/gui/a11y/ea-week-view-cell.c
index b45cf66e94..dda6ad6a32 100644
--- a/calendar/gui/a11y/ea-week-view-cell.c
+++ b/calendar/gui/a11y/ea-week-view-cell.c
@@ -79,7 +79,7 @@ e_week_view_cell_new (EWeekView *week_view, gint row, gint column)
 	cell->column = column;
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: e_week_view_cell created %p\n", (void *)cell);
+	printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer)cell);
 #endif
 
 	return cell;
@@ -89,8 +89,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 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 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);
@@ -196,7 +196,7 @@ static void ea_week_view_cell_finalize (GObject *object)
 }
 #endif
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_cell_get_name (AtkObject *accessible)
 {
 	AtkGObjectAccessible *atk_gobj;
@@ -242,7 +242,7 @@ ea_week_view_cell_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_cell_get_description (AtkObject *accessible)
 {
 	return ea_week_view_cell_get_name (accessible);
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/a11y/ea-week-view-main-item.c
index ae507df235..3ba4508ba3 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/a11y/ea-week-view-main-item.c
@@ -31,8 +31,8 @@
 static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass);
 
 static void ea_week_view_main_item_finalize (GObject *object);
-static G_CONST_RETURN gchar* ea_week_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_main_item_get_description (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_week_view_main_item_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar * ea_week_view_main_item_get_description (AtkObject *accessible);
 
 static gint         ea_week_view_main_item_get_n_children (AtkObject *obj);
 static AtkObject*   ea_week_view_main_item_ref_child (AtkObject *obj,
@@ -95,10 +95,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 G_CONST_RETURN gchar *
 table_interface_get_column_description (AtkTable *table, gint in_col);
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_row_description (AtkTable *table, gint row);
 
 static AtkObject* table_interface_get_summary (AtkTable *table);
@@ -282,7 +282,7 @@ ea_week_view_main_item_finalize (GObject *object)
 #endif
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_main_item_get_name (AtkObject *accessible)
 {
 	AtkObject *parent;
@@ -292,7 +292,7 @@ ea_week_view_main_item_get_name (AtkObject *accessible)
 
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_main_item_get_description (AtkObject *accessible)
 {
 	return _("a table to view and select the current time range");
@@ -1008,7 +1008,7 @@ table_interface_get_caption (AtkTable	*table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_column_description (AtkTable	  *table,
 					gint       in_col)
 {
@@ -1065,7 +1065,7 @@ table_interface_get_column_description (AtkTable	  *table,
 	return description;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 table_interface_get_row_description (AtkTable    *table,
 				     gint        row)
 {
diff --git a/calendar/gui/a11y/ea-week-view.c b/calendar/gui/a11y/ea-week-view.c
index 1d88e40c46..734f09239a 100644
--- a/calendar/gui/a11y/ea-week-view.c
+++ b/calendar/gui/a11y/ea-week-view.c
@@ -30,8 +30,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 G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN 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);
@@ -112,13 +112,13 @@ ea_week_view_new (GtkWidget *widget)
 	atk_object_initialize (accessible, widget);
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view created %p\n", (void *)accessible);
+	printf ("EvoAcc: ea_week_view created %p\n", (gpointer)accessible);
 #endif
 
 	return accessible;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_get_name (AtkObject *accessible)
 {
 	EWeekView *week_view;
@@ -165,7 +165,7 @@ ea_week_view_get_name (AtkObject *accessible)
 	return accessible->name;
 }
 
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
 ea_week_view_get_description (AtkObject *accessible)
 {
 	EWeekView *week_view;
@@ -239,7 +239,7 @@ ea_week_view_get_n_children (AtkObject *accessible)
 	count++;
 
 #ifdef ACC_DEBUG
-	printf("AccDebug: week view %p has %d children\n", (void *)week_view, count);
+	printf("AccDebug: week view %p has %d children\n", (gpointer)week_view, count);
 #endif
 	return count;
 }
@@ -315,7 +315,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index)
 
 #ifdef ACC_DEBUG
 	printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n",
-		index, (void *)atk_object);
+		index, (gpointer)atk_object);
 #endif
 	return atk_object;
 }