Prefer GLib basic types over C types.

31 files changed, 307 insertions, 307 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 73bfde30cc..ca8a58d528 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -86,7 +86,7 @@ typedef struct {
 	GtkWidget *aalarm_file_chooser;
 
 	/* Mail alarm widgets */
-	const char *email;
+	const gchar *email;
 	GtkWidget *malarm_group;
 	GtkWidget *malarm_address_group;
 	GtkWidget *malarm_addresses;
@@ -103,7 +103,7 @@ typedef struct {
 	ENameSelector *name_selector;
 } Dialog;
 
-static const char *section_name = "Send To";
+static const gchar *section_name = "Send To";
 
 /* "relative" types */
 enum {
@@ -119,7 +119,7 @@ enum {
 };
 
 /* Combo box maps */
-static const int action_map[] = {
+static const gint action_map[] = {
 	E_CAL_COMPONENT_ALARM_DISPLAY,
 	E_CAL_COMPONENT_ALARM_AUDIO,
 	E_CAL_COMPONENT_ALARM_PROCEDURE,
@@ -127,27 +127,27 @@ static const int action_map[] = {
 	-1
 };
 
-static const char *action_map_cap[] = {
+static const gchar *action_map_cap[] = {
 	CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS,
 	CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS,
         CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS,
 	CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS
 };
 
-static const int value_map[] = {
+static const gint value_map[] = {
 	MINUTES,
 	HOURS,
 	DAYS,
 	-1
 };
 
-static const int relative_map[] = {
+static const gint relative_map[] = {
 	BEFORE,
 	AFTER,
 	-1
 };
 
-static const int time_map[] = {
+static const gint time_map[] = {
 	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START,
 	E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END,
 	-1
@@ -159,7 +159,7 @@ enum duration_units {
 	DUR_DAYS
 };
 
-static const int duration_units_map[] = {
+static const gint duration_units_map[] = {
 	DUR_MINUTES,
 	DUR_HOURS,
 	DUR_DAYS,
@@ -197,8 +197,8 @@ alarm_to_dialog (Dialog *dialog)
 	gboolean valid;
 	gboolean repeat;
 	ECalComponentAlarmAction action;
-	char *email;
-	int i;
+	gchar *email;
+	gint i;
 
 	/* Clean the page */
 	clear_widgets (dialog);
@@ -314,7 +314,7 @@ repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 static void
 aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 {
-	char *url;
+	gchar *url;
 	icalattach *attach;
 
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->aalarm_sound)))
@@ -333,7 +333,7 @@ aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 static void
 alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 {
-	const char *url;
+	const gchar *url;
 	icalattach *attach;
 
 	e_cal_component_alarm_get_attach (alarm, (&attach));
@@ -368,7 +368,7 @@ alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
 static void
 dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 {
-	char *str;
+	gchar *str;
 	ECalComponentText description;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
@@ -394,7 +394,7 @@ dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
 	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 	while (icalprop) {
-		const char *x_name;
+		const gchar *x_name;
 
 		x_name = icalproperty_get_x_name (icalprop);
 		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
@@ -410,7 +410,7 @@ dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 static void
 malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 {
-	char *str;
+	gchar *str;
 	ECalComponentText description;
 	GSList *attendee_list = NULL;
 	GtkTextBuffer *text_buffer;
@@ -468,7 +468,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
 	icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY);
 	while (icalprop) {
-		const char *x_name;
+		const gchar *x_name;
 
 		x_name = icalproperty_get_x_name (icalprop);
 		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
@@ -489,7 +489,7 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
     ECalComponentText description;
     GtkTextBuffer *text_buffer;
     GSList *attendee_list, *l;
-    int len;
+    gint len;
 
     /* Attendees */
     name_selector_model = e_name_selector_peek_model (dialog->name_selector);
@@ -531,7 +531,7 @@ static void
 alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 {
 	ECalComponentText description;
-	const char *url;
+	const gchar *url;
 	icalattach *attach;
 
 	e_cal_component_alarm_get_attach (alarm, (&attach));
@@ -551,9 +551,9 @@ alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 static void
 palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 {
-	char *program;
+	gchar *program;
 	icalattach *attach;
-	char *str;
+	gchar *str;
 	ECalComponentText description;
 	icalcomponent *icalcomp;
 	icalproperty *icalprop;
@@ -579,7 +579,7 @@ palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
 	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 	while (icalprop) {
-		const char *x_name;
+		const gchar *x_name;
 
 		x_name = icalproperty_get_x_name (icalprop);
 		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) {
@@ -792,7 +792,7 @@ get_widgets (Dialog *dialog)
 #undef GW
 
 	if (dialog->action_combo) {
-		const char *actions[] = {
+		const gchar *actions[] = {
 			N_("Pop up an alert"),
 			N_("Play a sound"),
 			N_("Run a program"),
@@ -865,7 +865,7 @@ static void
 show_options (Dialog *dialog)
 {
 	gboolean repeat;
-	char *email;
+	gchar *email;
 
 	e_cal_component_alarm_set_action (dialog->alarm,
 					e_dialog_combo_box_get (dialog->action_combo, action_map));
@@ -943,7 +943,7 @@ repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data)
 static void
 check_custom_sound (Dialog *dialog)
 {
-	char *str, *dir;
+	gchar *str, *dir;
 	gboolean sens;
 
 	str = gtk_file_chooser_get_filename (
@@ -985,7 +985,7 @@ aalarm_attach_changed_cb (GtkWidget *widget, gpointer data)
 static void
 check_custom_message (Dialog *dialog)
 {
-	char *str;
+	gchar *str;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 	gboolean sens;
@@ -1024,7 +1024,7 @@ dalarm_description_changed_cb (GtkWidget *widget, gpointer data)
 static void
 check_custom_program (Dialog *dialog)
 {
-	char *str;
+	gchar *str;
 	gboolean sens;
 
 	str = e_dialog_editable_get (dialog->palarm_program);
@@ -1044,7 +1044,7 @@ palarm_program_changed_cb (GtkWidget *widget, gpointer data)
 static void
 check_custom_email (Dialog *dialog)
 {
-	char *str;
+	gchar *str;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 	ENameSelectorModel *name_selector_model;
@@ -1100,9 +1100,9 @@ static void
 action_changed_cb (GtkWidget *action_combo, gpointer data)
 {
 	Dialog *dialog = data;
-	char *dir;
+	gchar *dir;
 	ECalComponentAlarmAction action;
-	int page = 0, i;
+	gint page = 0, i;
 
 	action = e_dialog_combo_box_get (dialog->action_combo, action_map);
 	for (i = 0; action_map[i] != -1 ; i++) {
@@ -1188,8 +1188,8 @@ gboolean
 alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 {
 	Dialog dialog;
-	int response_id;
-	char *gladefile;
+	gint response_id;
+	gchar *gladefile;
 
 	g_return_val_if_fail (alarm != NULL, FALSE);
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 8520b3727b..882f3fd0cc 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -263,8 +263,8 @@ gboolean
 alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 {
 	Dialog dialog;
-	int response_id;
-	char *gladefile;
+	gint response_id;
+	gchar *gladefile;
 
 	dialog.ecal = ecal;
 	dialog.list_store = list_store;
@@ -312,7 +312,7 @@ GtkWidget *
 alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 {
 	Dialog *dialog;
-	char *gladefile;
+	gchar *gladefile;
 
 	dialog = (Dialog *)g_new (Dialog, 1);
 	dialog->ecal = ecal;
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 9c502153d3..b33753c42e 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -42,11 +42,11 @@ enum {
 };
 
 static GtkWidget*
-run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *showinline_p)
+run_selector(CompEditor *editor, const gchar *title, guint32 flags, gboolean *showinline_p)
 {
 	GtkWidget *selection;
 	GtkWidget *showinline = NULL;
-	char *path;
+	gchar *path;
 
 	path = g_object_get_data ((GObject *) editor, "attach_path");
 
@@ -117,12 +117,12 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
  * Return value: the selected filename, or %NULL if the user
  * cancelled.
  **/
-char *
-comp_editor_select_file (CompEditor *editor, const char *title, gboolean save_mode)
+gchar *
+comp_editor_select_file (CompEditor *editor, const gchar *title, gboolean save_mode)
 {
 	guint32 flags = save_mode ? SELECTOR_MODE_SAVE : SELECTOR_MODE_MULTI;
 	GtkWidget *selection;
-	char *name = NULL;
+	gchar *name = NULL;
 
 	selection = run_selector (editor, title, flags, NULL);
 	if (selection) {
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h
index 0f965e6c9b..b69a741007 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.h
+++ b/calendar/gui/dialogs/cal-attachment-select-file.h
@@ -26,8 +26,8 @@
 
 #include "comp-editor.h"
 
-char *comp_editor_select_file (CompEditor *editor,
-				  const char *title,
+gchar *comp_editor_select_file (CompEditor *editor,
+				  const gchar *title,
 				  gboolean save_mode);
 
 GPtrArray *comp_editor_select_file_attachments (CompEditor *editor,
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 097c91907f..9ddd9af6cb 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -37,21 +37,21 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-static const int week_start_day_map[] = {
+static const gint week_start_day_map[] = {
 	1, 2, 3, 4, 5, 6, 0, -1
 };
 
-static const int time_division_map[] = {
+static const gint time_division_map[] = {
 	60, 30, 15, 10, 5, -1
 };
 
 /* The following two are kept separate in case we need to re-order each menu individually */
-static const int hide_completed_units_map[] = {
+static const gint hide_completed_units_map[] = {
 	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
 };
 
 /* same is used for Birthdays & Anniversaries calendar */
-static const int default_reminder_units_map[] = {
+static const gint default_reminder_units_map[] = {
 	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
 };
 
@@ -93,7 +93,7 @@ calendar_prefs_dialog_init (CalendarPrefsDialog *dialog)
 }
 
 static GtkWidget *
-eccp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data)
+eccp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	CalendarPrefsDialog *prefs = data;
 
@@ -105,7 +105,7 @@ working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
 	CalWeekdays working_days = 0;
 	guint32 mask = 1;
-	int day;
+	gint day;
 
 	for (day = 0; day < 7; day++) {
 		if (e_dialog_toggle_get (prefs->working_days[day]))
@@ -129,8 +129,8 @@ timezone_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 static void
 update_day_second_zone_caption (CalendarPrefsDialog *prefs)
 {
-	char *location;
-	const char *caption;
+	gchar *location;
+	const gchar *caption;
 	icaltimezone *zone;
 
 	g_return_if_fail (prefs != NULL);
@@ -173,7 +173,7 @@ day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
 	GtkWidget *menu, *item;
 	GSList *group = NULL, *recent_zones, *s;
-	char *location;
+	gchar *location;
 	icaltimezone *zone, *second_zone = NULL;
 
 	menu = gtk_menu_new ();
@@ -224,7 +224,7 @@ day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs)
 static void
 start_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 	EDateEdit *start, *end;
 
 	start = E_DATE_EDIT (prefs->start_of_day);
@@ -249,7 +249,7 @@ start_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 static void
 end_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 	EDateEdit *start, *end;
 
 	start = E_DATE_EDIT (prefs->start_of_day);
@@ -273,7 +273,7 @@ end_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 static void
 week_start_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
-	int week_start_day;
+	gint week_start_day;
 
 	week_start_day = e_dialog_combo_box_get (prefs->week_start_day, week_start_day_map);
 	calendar_config_set_week_start_day (week_start_day);
@@ -295,7 +295,7 @@ use_24_hour_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs)
 static void
 time_divisions_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
-	int time_divisions;
+	gint time_divisions;
 
 	time_divisions = e_dialog_combo_box_get (prefs->time_divisions, time_division_map);
 	calendar_config_set_time_divisions (time_divisions);
@@ -418,7 +418,7 @@ static void
 ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 {
 	const gchar *str;
-	int value;
+	gint value;
 
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
 	value = (int) g_ascii_strtod (str, NULL);
@@ -495,7 +495,7 @@ update_system_tz_widgets (EShellSettings *shell_settings,
 
 	zone = e_cal_util_get_system_timezone ();
 	if (zone) {
-		char *tmp = g_strdup_printf ("(%s)", icaltimezone_get_display_name (zone));
+		gchar *tmp = g_strdup_printf ("(%s)", icaltimezone_get_display_name (zone));
 		gtk_label_set_text (GTK_LABEL (prefs->system_tz_label), tmp);
 		g_free (tmp);
 	} else {
@@ -506,7 +506,7 @@ update_system_tz_widgets (EShellSettings *shell_settings,
 static void
 setup_changes (CalendarPrefsDialog *prefs)
 {
-	int i;
+	gint i;
 
 	for (i = 0; i < 7; i ++)
 		g_signal_connect (G_OBJECT (prefs->working_days[i]), "toggled", G_CALLBACK (working_days_changed), prefs);
@@ -610,7 +610,7 @@ initialize_selection (ESourceSelector *selector, ESourceList *source_list)
 		GSList *sources;
 		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
 			ESource *source = E_SOURCE (sources->data);
-			const char *completion = e_source_get_property (source, "alarm");
+			const gchar *completion = e_source_get_property (source, "alarm");
 			if (!completion  || !g_ascii_strcasecmp (completion, "true")) {
 				if (!completion)
 					e_source_set_property (E_SOURCE (source), "alarm", "true");
@@ -641,9 +641,9 @@ show_config (CalendarPrefsDialog *prefs)
 	gint mask, day, week_start_day, time_divisions;
 	icaltimezone *zone;
 	gboolean sensitive, set = FALSE;
-	char *location;
+	gchar *location;
 	CalUnits units;
-	int interval;
+	gint interval;
 
 	/* Timezone. */
 	location = calendar_config_get_timezone_stored ();
@@ -744,7 +744,7 @@ static ECalConfigItem eccp_items[] = {
 };
 
 static void
-eccp_free (EConfig *ec, GSList *items, void *data)
+eccp_free (EConfig *ec, GSList *items, gpointer data)
 {
 	g_slist_free (items);
 }
@@ -757,11 +757,11 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 	ECalConfig *ec;
 	ECalConfigTargetPrefs *target;
 	EShellSettings *shell_settings;
-	int i;
+	gint i;
 	GtkWidget *toplevel;
 	GtkWidget *widget;
 	GSList *l;
-	const char *working_day_names[] = {
+	const gchar *working_day_names[] = {
 		"sun_button",
 		"mon_button",
 		"tue_button",
@@ -770,7 +770,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 		"fri_button",
 		"sat_button",
 	};
-	char *gladefile;
+	gchar *gladefile;
 
 	shell_settings = e_shell_get_shell_settings (shell);
 
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 95820b8247..32fbc9bd68 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -58,11 +58,11 @@ struct _CalendarSourceDialog {
 };
 
 static gboolean
-eccp_check_complete (EConfig *ec, const char *pageid, void *data)
+eccp_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	gboolean valid = TRUE;
-	const char *tmp;
+	const gchar *tmp;
 	ESource *source;
 
 	tmp = e_source_peek_name (sdialog->source);
@@ -72,7 +72,7 @@ eccp_check_complete (EConfig *ec, const char *pageid, void *data)
 }
 
 static void
-eccp_commit (EConfig *ec, GSList *items, void *data)
+eccp_commit (EConfig *ec, GSList *items, gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	xmlNodePtr xml;
@@ -80,7 +80,7 @@ eccp_commit (EConfig *ec, GSList *items, void *data)
 	if (sdialog->original_source) {
 		const gchar *color_spec;
 
-		xml = xmlNewNode (NULL, (const unsigned char *)"dummy");
+		xml = xmlNewNode (NULL, (const guchar *)"dummy");
 		e_source_dump_to_xml_node (sdialog->source, xml);
 		e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL);
 		xmlFreeNode (xml);
@@ -95,7 +95,7 @@ eccp_commit (EConfig *ec, GSList *items, void *data)
 }
 
 static void
-eccp_free (EConfig *ec, GSList *items, void *data)
+eccp_free (EConfig *ec, GSList *items, gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 
@@ -113,7 +113,7 @@ eccp_free (EConfig *ec, GSList *items, void *data)
 static void
 eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog)
 {
-	int id = gtk_combo_box_get_active (dropdown);
+	gint id = gtk_combo_box_get_active (dropdown);
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 
@@ -134,15 +134,15 @@ eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog)
 }
 
 static GtkWidget *
-eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data)
+eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	static GtkWidget *label, *type;
-	int row;
+	gint row;
 	CalendarSourceDialog *sdialog = data;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
 	ESource *source = t->source;
 	ESourceGroup *group = e_source_peek_group (source);
-	char *markup;
+	gchar *markup;
 
 	if (old)
 		gtk_widget_destroy (label);
@@ -164,7 +164,7 @@ eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 		GtkListStore *store;
 		GtkTreeIter iter;
 		GSList *l;
-		int active = 0, i = 0;
+		gint active = 0, i = 0;
 
 		label = gtk_label_new_with_mnemonic(_("_Type:"));
 
@@ -211,10 +211,10 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t)
 }
 
 static GtkWidget *
-eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
+eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
 {
 	static GtkWidget *label, *entry;
-	int row;
+	gint row;
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
 	ESource *source = t->source;
 
@@ -252,13 +252,13 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
 }
 
 static GtkWidget *
-eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
+eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	GtkWidget *offline_setting = NULL;
-	const char *offline_sync;
-	int row;
-	const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
+	const gchar *offline_sync;
+	gint row;
+	const gchar *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
 	gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://"));
 	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
 	if (old)
@@ -318,7 +318,7 @@ choose_initial_color (void)
 }
 
 static GtkWidget *
-eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
+eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	static GtkWidget *label, *color_button;
@@ -434,9 +434,9 @@ void
 calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
-	char *xml;
+	gchar *xml;
 	ECalConfig *ec;
-	int i;
+	gint i;
 	GSList *items = NULL;
 	ECalConfigTargetSource *target;
 
@@ -491,9 +491,9 @@ void
 calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
-	char *xml;
+	gchar *xml;
 	ECalConfig *ec;
-	int i;
+	gint i;
 	GSList *items = NULL;
 	ECalConfigTargetSource *target;
 
@@ -547,9 +547,9 @@ void
 calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
-	char *xml;
+	gchar *xml;
 	ECalConfig *ec;
-	int i;
+	gint i;
 	GSList *items = NULL;
 	ECalConfigTargetSource *target;
 
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index cddd4f8d8d..cdb388e7b9 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -67,7 +67,7 @@ gboolean
 cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting)
 {
 	ECalComponentVType vtype;
-	const char *id;
+	const gchar *id;
 
 	if (deleting && e_cal_get_save_schedules (client))
 		return TRUE;
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index d1abc1724d..5fb0240037 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -48,7 +48,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 {
 	GtkWidget *dialog;
 	ECalComponentVType vtype;
-	char *str;
+	gchar *str;
 	gint response;
 
 	vtype = e_cal_component_get_vtype (comp);
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 93b9cd9304..2281e5d0fc 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -432,7 +432,7 @@ comp_editor_page_notify_dates_changed (CompEditorPage *page,
  */
 void
 comp_editor_page_display_validation_error (CompEditorPage *page,
-					   const char *msg,
+					   const gchar *msg,
 					   GtkWidget *field)
 {
 	GtkWidget *dialog;
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index 819ea74ccc..a58da9b804 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -82,7 +82,7 @@ struct _CompEditorPageClass {
 
 	/* Notification signals */
 
-	void (* dates_changed)   (CompEditorPage *page, const char *dates);
+	void (* dates_changed)   (CompEditorPage *page, const gchar *dates);
 
 	/* Virtual methods */
 
@@ -119,7 +119,7 @@ void		comp_editor_page_notify_dates_changed
 						 CompEditorPageDates *dates);
 void		comp_editor_page_display_validation_error
 						(CompEditorPage *page,
-						 const char *msg,
+						 const gchar *msg,
 						 GtkWidget *field);
 
 G_END_DECLS
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 4666058b51..e9661db372 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -121,7 +121,7 @@ write_label_piece (struct icaltimetype *tt,
 {
 	struct tm tmp_tm = { 0 };
 	struct icaltimetype tt_copy = *tt;
-	int len;
+	gint len;
 
 	/* FIXME: May want to convert the time to an appropriate zone. */
 
@@ -166,7 +166,7 @@ write_label_piece (struct icaltimetype *tt,
 void
 comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label)
 {
-	char buffer[1024];
+	gchar buffer[1024];
 	gboolean start_set = FALSE, end_set = FALSE;
 	gboolean complete_set = FALSE, due_set = FALSE;
 
@@ -290,13 +290,13 @@ comp_editor_get_current_time (GtkObject *object, gpointer data)
  * Return value: The category names stripped of surrounding whitespace
  * and separated with commas.
  **/
-char *
-comp_editor_strip_categories (const char *categories)
+gchar *
+comp_editor_strip_categories (const gchar *categories)
 {
-	char *new_categories;
-	const char *start, *end;
-	const char *p;
-	char *new_p;
+	gchar *new_categories;
+	const gchar *start, *end;
+	const gchar *p;
+	gchar *new_p;
 
 	if (!categories)
 		return NULL;
@@ -314,7 +314,7 @@ comp_editor_strip_categories (const char *categories)
 		if (g_unichar_isspace (c))
 			continue;
 		else if (c == ',') {
-			int len;
+			gint len;
 
 			if (!start)
 				continue;
@@ -337,7 +337,7 @@ comp_editor_strip_categories (const char *categories)
 	}
 
 	if (start) {
-		int len;
+		gint len;
 
 		g_return_val_if_fail (start <= end, NULL);
 
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 5516fe4cc4..3bf8921291 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -39,6 +39,6 @@ GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
 struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
 
 
-char *comp_editor_strip_categories (const char *categories);
+gchar *comp_editor_strip_categories (const gchar *categories);
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 06fd724680..c01ca844c9 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -213,10 +213,10 @@ get_attachment_list (CompEditor *editor)
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	GSList *list = NULL;
-	const char *comp_uid = NULL;
-	const char *local_store = e_cal_get_local_attachment_store (editor->priv->client);
+	const gchar *comp_uid = NULL;
+	const gchar *local_store = e_cal_get_local_attachment_store (editor->priv->client);
 	gboolean valid;
-	int ticker=0;
+	gint ticker=0;
 
 	e_cal_component_get_uid (editor->priv->comp, &comp_uid);
 
@@ -231,9 +231,9 @@ get_attachment_list (CompEditor *editor)
 		CamelDataWrapper *wrapper;
 		CamelMimePart *mime_part;
 		CamelStream *stream;
-		char *attach_file_url;
-		char *safe_fname, *utf8_safe_fname;
-		char *filename;
+		gchar *attach_file_url;
+		gchar *safe_fname, *utf8_safe_fname;
+		gchar *filename;
 		gint column_id;
 
 		column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT;
@@ -259,7 +259,7 @@ get_attachment_list (CompEditor *editor)
 		if (!utf8_safe_fname)
 			safe_fname = g_strdup_printf ("%s-%d", _("attachment"), ticker++);
 		else {
-			safe_fname = g_filename_from_utf8 ((const char *) utf8_safe_fname, -1, NULL, NULL, NULL);
+			safe_fname = g_filename_from_utf8 ((const gchar *) utf8_safe_fname, -1, NULL, NULL, NULL);
 			g_free (utf8_safe_fname);
 		}
 		filename = g_strdup_printf ("%s-%s", comp_uid, safe_fname);
@@ -313,7 +313,7 @@ static void
 listen_for_changes (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
-	const char *uid = NULL;
+	const gchar *uid = NULL;
 
 	priv = editor->priv;
 
@@ -333,7 +333,7 @@ listen_for_changes (CompEditor *editor)
 		e_cal_component_get_uid (priv->comp, &uid);
 
 	if (uid) {
-		char *query;
+		gchar *query;
 
 		query = g_strdup_printf ("(uid? \"%s\")", uid);
 		e_cal_get_query (priv->source_client, query, &priv->view, NULL);
@@ -371,7 +371,7 @@ save_comp (CompEditor *editor)
 	gboolean result;
 	GError *error = NULL;
 	GHashTable *timezones;
-	const char *orig_uid;
+	const gchar *orig_uid;
 	icalcomponent *icalcomp;
 
 	priv = editor->priv;
@@ -464,7 +464,7 @@ save_comp (CompEditor *editor)
 		icalproperty *icalprop;
 		icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 		while (icalprop) {
-			const char *x_name;
+			const gchar *x_name;
 
 			x_name = icalproperty_get_x_name (icalprop);
 			if (!strcmp (x_name, "X-EVOLUTION-OPTIONS-DELAY")) {
@@ -842,7 +842,7 @@ action_save_cb (GtkAction *action,
 		delegate = flags & COMP_EDITOR_DELEGATE;
 
 		if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) {
-			const char *uid = NULL;
+			const gchar *uid = NULL;
 			GError *error = NULL;
 
 			e_cal_component_get_uid (priv->comp, &uid);
@@ -2177,7 +2177,7 @@ page_unmapped_cb (GtkWidget *page_widget,
 void
 comp_editor_append_page (CompEditor *editor,
 			 CompEditorPage *page,
-			 const char *label,
+			 const gchar *label,
 			 gboolean add)
 {
 	CompEditorPrivate *priv;
@@ -2446,7 +2446,7 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp)
 
 /* TODO These functions should be available in e-cal-component.c */
 static void
-set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComponentItipMethod method)
+set_attendees_for_delegation (ECalComponent *comp, const gchar *address, ECalComponentItipMethod method)
 {
 	icalproperty *prop;
 	icalparameter *param;
@@ -2457,8 +2457,8 @@ set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComp
 	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
 			prop;
 			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
-		const char *attendee = icalproperty_get_attendee (prop);
-		const char *delfrom = NULL;
+		const gchar *attendee = icalproperty_get_attendee (prop);
+		const gchar *delfrom = NULL;
 
 		param = icalproperty_get_first_parameter(prop, ICAL_DELEGATEDFROM_PARAMETER);
 		if (param)
@@ -2478,8 +2478,8 @@ get_users_from_memo_comp (ECalComponent *comp, GList **users)
 {
 	icalcomponent *icalcomp;
 	icalproperty *icalprop;
-	const char *attendees = NULL;
-	char **emails, **iter;
+	const gchar *attendees = NULL;
+	gchar **emails, **iter;
 
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 
@@ -2509,7 +2509,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 	CompEditorPrivate *priv;
 	CompEditorFlags flags;
 	ECalComponent *send_comp = NULL;
-	char *address = NULL;
+	gchar *address = NULL;
 	GList *users = NULL;
 
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
@@ -2520,7 +2520,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 	if (priv->mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (priv->comp)) {
 		/* Ensure we send the master object, not the instance only */
 		icalcomponent *icalcomp = NULL;
-		const char *uid = NULL;
+		const gchar *uid = NULL;
 
 		e_cal_component_get_uid (priv->comp, &uid);
 		if (e_cal_get_object (priv->client, uid, NULL, &icalcomp, NULL) && icalcomp) {
@@ -2556,7 +2556,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 		}
 	} else {
 		/* Clone the component with attachments set to CID:...  */
-		int num_attachments, i;
+		gint num_attachments, i;
 		GSList *attach_list = NULL;
 		GSList *mime_attach_list;
 
@@ -2674,7 +2674,7 @@ void
 comp_editor_delete_comp (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
-	const char *uid;
+	const gchar *uid;
 
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 
@@ -2754,8 +2754,8 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		CamelDataWrapper *wrapper;
 		CamelMimePart *mime_part;
 		CamelStreamMem *mstream;
-		unsigned char *buffer = NULL;
-		const char *desc, *disp;
+		guchar *buffer = NULL;
+		const gchar *desc, *disp;
 		gint column_id;
 
 		column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT;
@@ -2775,7 +2775,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
 		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
 
-		cal_mime_attach->encoded_data = (char *)buffer;
+		cal_mime_attach->encoded_data = (gchar *)buffer;
 		cal_mime_attach->length = mstream->buffer->len;
 		cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename (mime_part));
 		desc = camel_mime_part_get_description (mime_part);
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 92444678be..49cf8b3ce4 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -38,7 +38,7 @@ typedef struct {
 } CopySourceDialogData;
 
 static void
-show_error (GtkWindow *parent, const char *msg)
+show_error (GtkWindow *parent, const gchar *msg)
 {
 	GtkWidget *dialog;
 
@@ -82,7 +82,7 @@ copy_source (CopySourceDialogData *csdd)
 	} else {
 		if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) {
 			GList *l;
-			const char *uid;
+			const gchar *uid;
 			icalcomponent *icalcomp;
 
 			for (l = obj_list; l != NULL; l = l->next) {
@@ -93,7 +93,7 @@ copy_source (CopySourceDialogData *csdd)
 					e_cal_modify_object (dest_client, l->data, CALOBJ_MOD_ALL, NULL);
 					icalcomponent_free (icalcomp);
 				} else {
-					e_cal_create_object (dest_client, l->data, (char **) &uid, NULL);
+					e_cal_create_object (dest_client, l->data, (gchar **) &uid, NULL);
 					g_free ((gpointer) uid);
 				}
 			}
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index ae371aabb2..1a004272d1 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -58,12 +58,12 @@
 gboolean
 delete_component_dialog (ECalComponent *comp,
 			 gboolean consider_as_untitled,
-			 int n_comps, ECalComponentVType vtype,
+			 gint n_comps, ECalComponentVType vtype,
 			 GtkWidget *widget)
 {
-	const char *id;
-	char *arg0 = NULL;
-	int response;
+	const gchar *id;
+	gchar *arg0 = NULL;
+	gint response;
 
 	if (comp) {
 		g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
@@ -167,9 +167,9 @@ cb_toggled_cb (GtkWidget *toggle, gpointer data)
 }
 
 gboolean
-prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract)
+prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract)
 {
-	char *message = NULL;
+	gchar *message = NULL;
 	ECalComponentVType type = E_CAL_COMPONENT_NO_TYPE;
 	GtkMessageDialog *dialog = NULL;
 	GtkWidget *cb, *label, *entry, *vbox, *sw, *frame;
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
index c619e28b98..9123dcc479 100644
--- a/calendar/gui/dialogs/delete-comp.h
+++ b/calendar/gui/dialogs/delete-comp.h
@@ -31,8 +31,8 @@
 
 gboolean delete_component_dialog (ECalComponent *comp,
 				  gboolean consider_as_untitled,
-				  int n_comps, ECalComponentVType vtype,
+				  gint n_comps, ECalComponentVType vtype,
 				  GtkWidget *widget);
-gboolean prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract);
+gboolean prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract);
 
 #endif
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index f8df587aa4..c312e16ada 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -42,7 +42,7 @@ void
 delete_error_dialog (GError *error, ECalComponentVType vtype)
 {
 	GtkWidget *dialog;
-	const char *str;
+	const gchar *str;
 	const gchar *icon_name = NULL;
 
 	if (!error)
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 8e060832df..87fb164e6a 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -36,8 +36,8 @@
 #include "e-delegate-dialog.h"
 
 struct _EDelegateDialogPrivate {
-	char *name;
-	char *address;
+	gchar *name;
+	gchar *address;
 
 	/* Glade XML data */
 	GladeXML *xml;
@@ -51,7 +51,7 @@ struct _EDelegateDialogPrivate {
 	GtkWidget *entry;
 };
 
-static const char *section_name = "Delegate To";
+static const gchar *section_name = "Delegate To";
 
 static void e_delegate_dialog_finalize		(GObject	*object);
 
@@ -116,14 +116,14 @@ e_delegate_dialog_finalize (GObject *object)
 
 
 EDelegateDialog *
-e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address)
+e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address)
 {
 	EDelegateDialogPrivate *priv;
 	EDestinationStore *destination_store;
 	EDestination *dest;
 	ENameSelectorModel *name_selector_model;
 	ENameSelectorDialog *name_selector_dialog;
-	char *gladefile;
+	gchar *gladefile;
 
 	g_return_val_if_fail (edd != NULL, NULL);
 	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
@@ -234,7 +234,7 @@ addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
  * editor could not be created.
  **/
 EDelegateDialog *
-e_delegate_dialog_new (const char *name, const char *address)
+e_delegate_dialog_new (const gchar *name, const gchar *address)
 {
 	EDelegateDialog *edd;
 
@@ -242,7 +242,7 @@ e_delegate_dialog_new (const char *name, const char *address)
 	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address);
 }
 
-char *
+gchar *
 e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 {
 	EDelegateDialogPrivate *priv;
@@ -274,7 +274,7 @@ e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 }
 
 
-char *
+gchar *
 e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
 {
 	EDelegateDialogPrivate *priv;
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index e4f474781a..6ff872e7e4 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -54,18 +54,18 @@ struct _EDelegateDialogClass {
 GType            e_delegate_dialog_get_type          (void);
 
 EDelegateDialog* e_delegate_dialog_construct         (EDelegateDialog *etd,
-						      const char      *name,
-						      const char      *address);
+						      const gchar      *name,
+						      const gchar      *address);
 
-EDelegateDialog* e_delegate_dialog_new               (const char      *name,
-						      const char      *address);
+EDelegateDialog* e_delegate_dialog_new               (const gchar      *name,
+						      const gchar      *address);
 
-char*            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
+gchar *            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
 
-char*            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
+gchar *            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
 
 void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
-						      const char      *address);
+						      const gchar      *address);
 
 GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
 
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index fd6bf245c2..5af9d4bc43 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -34,8 +34,8 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
 	ESendOptionsStatusTracking *sopts;
 	GConfClient *gconf = gconf_client_get_default ();
 	ESourceList *source_list;
-	const char *uid;
-	const char *value;
+	const gchar *uid;
+	const gchar *value;
 
 	gopts = sod->data->gopts;
 	sopts = sod->data->sopts;
@@ -153,7 +153,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
 void
 e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp)
 {
-	int i = 1;
+	gint i = 1;
 	icalproperty *prop;
 	icalcomponent *icalcomp;
 	ESendOptionsGeneral *gopts;
@@ -166,7 +166,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 
 	if (e_sendoptions_get_need_general_options (sod)) {
-		prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", gopts->priority));
+		prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", gopts->priority));
 		icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY");
 		icalcomponent_add_property (icalcomp, prop);
 
@@ -174,20 +174,20 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 			if (gopts->reply_convenient)
 				prop = icalproperty_new_x ("convenient");
 			else
-				prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->reply_within));
+				prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", gopts->reply_within));
 			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-REPLY");
 			icalcomponent_add_property (icalcomp, prop);
 		}
 
 		if (gopts->expiration_enabled && gopts->expire_after) {
-			prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->expire_after));
+			prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", gopts->expire_after));
 			icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-EXPIRE");
 			icalcomponent_add_property (icalcomp, prop);
 		}
 
 		if (gopts->delay_enabled) {
 			struct icaltimetype temp;
-			char *str;
+			gchar *str;
 
 			icaltimezone *zone = calendar_config_get_icaltimezone ();
 			temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone);
@@ -201,7 +201,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	}
 
 	if (sopts->tracking_enabled)
-		prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", sopts->track_when));
+		prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", sopts->track_when));
 	else
 		prop = icalproperty_new_x ("0");
 
@@ -209,19 +209,19 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	icalcomponent_add_property (icalcomp, prop);
 
 
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->opened));
+	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->opened));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED");
 	icalcomponent_add_property (icalcomp, prop);
 
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->accepted));
+	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->accepted));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-ACCEPTED");
 	icalcomponent_add_property (icalcomp, prop);
 
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->declined));
+	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->declined));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DECLINED");
 	icalcomponent_add_property (icalcomp, prop);
 
-	prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->completed));
+	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->completed));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-COMPLETED");
 	icalcomponent_add_property (icalcomp, prop);
 }
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 987c716b6f..ee34590941 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -554,8 +554,8 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 	/* Set up the attendees */
 	if (attendees != NULL) {
 		GSList *l;
-		int row;
-		char *user_email;
+		gint row;
+		gchar *user_email;
 		user_email = itip_get_comp_attendee (comp, client);
 
 		if (!priv->meeting_shown) {
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index fa1faa2f79..928d159292 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -73,7 +73,7 @@ enum {
 	ALARM_CUSTOM
 };
 
-static const int alarm_map_with_user_time[] = {
+static const gint alarm_map_with_user_time[] = {
 	ALARM_NONE,
 	ALARM_15_MINUTES,
 	ALARM_1_HOUR,
@@ -83,7 +83,7 @@ static const int alarm_map_with_user_time[] = {
 	-1
 };
 
-static const int alarm_map_without_user_time[] = {
+static const gint alarm_map_without_user_time[] = {
 	ALARM_NONE,
 	ALARM_15_MINUTES,
 	ALARM_1_HOUR,
@@ -113,7 +113,7 @@ struct _EventPagePrivate {
 	EAccountList *accounts;
 	GList *address_strings;
 	EMeetingAttendee *ia;
-	char *user_add;
+	gchar *user_add;
 	ECalComponent *comp;
 
 	/* For meeting/event */
@@ -176,9 +176,9 @@ struct _EventPagePrivate {
 	gboolean sendoptions_shown;
 
 	ESendOptionsDialog *sod;
-	char *old_summary;
+	gchar *old_summary;
 	CalUnits alarm_units;
-	int alarm_interval;
+	gint alarm_interval;
 
 	/* This is TRUE if both the start & end timezone are the same. If the
 	   start timezone is then changed, we updated the end timezone to the
@@ -189,7 +189,7 @@ struct _EventPagePrivate {
 	GtkWidget *alarm_list_dlg_widget;
 
 	/* either with-user-time or without it */
-	const int *alarm_map;
+	const gint *alarm_map;
 };
 
 static GtkWidget *event_page_get_widget (CompEditorPage *page);
@@ -206,8 +206,8 @@ static void hour_sel_changed ( GtkSpinButton *widget, EventPage *epage);
 static void minute_sel_changed ( GtkSpinButton *widget, EventPage *epage);
 static void hour_minute_changed ( EventPage *epage);
 static void update_end_time_combo ( EventPage *epage);
-static void event_page_select_organizer (EventPage *epage, const char *backend_address);
-static void set_subscriber_info_string (EventPage *epage, const char *backend_address);
+static void event_page_select_organizer (EventPage *epage, const gchar *backend_address);
+static void set_subscriber_info_string (EventPage *epage, const gchar *backend_address);
 
 G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE)
 
@@ -512,7 +512,7 @@ clear_widgets (EventPage *epage)
 }
 
 static gboolean
-is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type)
+is_custom_alarm (ECalComponentAlarm *ca, gchar *old_summary, CalUnits user_units, gint user_interval, gint *alarm_type)
 {
 	ECalComponentAlarmTrigger trigger;
 	ECalComponentAlarmRepeat repeat;
@@ -534,7 +534,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units,
 	icalcomp = e_cal_component_alarm_get_icalcomponent (ca);
 	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 	while (icalprop) {
-		const char *x_name;
+		const gchar *x_name;
 
 		x_name = icalproperty_get_x_name (icalprop);
 		if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION"))
@@ -631,7 +631,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units,
 }
 
 static gboolean
-is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type)
+is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, gchar *old_summary, CalUnits user_units, gint user_interval, gint *alarm_type)
 {
 	ECalComponentAlarm *ca;
 	gboolean result;
@@ -647,7 +647,7 @@ is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary,
 }
 
 static gboolean
-is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary,  CalUnits user_units, int user_interval, int *alarm_type)
+is_custom_alarm_store (EAlarmList *alarm_list_store, gchar *old_summary,  CalUnits user_units, gint user_interval, gint *alarm_type)
 {
 	const ECalComponentAlarm *alarm;
 	GtkTreeModel *model;
@@ -704,7 +704,7 @@ event_page_set_view_rsvp (EventPage *epage, gboolean state)
 }
 
 static GtkWidget *
-create_image_event_box (const char *image_text, const char *tip_text)
+create_image_event_box (const gchar *image_text, const gchar *tip_text)
 {
 	GtkWidget *image, *box;
 
@@ -870,7 +870,7 @@ get_current_account (EventPage *epage)
 {
 	EventPagePrivate *priv;
 	EIterator *it;
-	const char *str;
+	const gchar *str;
 
 	priv = epage->priv;
 
@@ -880,7 +880,7 @@ get_current_account (EventPage *epage)
 
 	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
 		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
+		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
 			g_free (full);
@@ -909,8 +909,8 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	ECalComponentClassification cl;
 	ECalComponentTransparency transparency;
 	ECalComponentDateTime start_date, end_date;
-	const char *location, *uid = NULL;
-	const char *categories;
+	const gchar *location, *uid = NULL;
+	const gchar *categories;
 	gchar *backend_addr = NULL;
 	GSList *l;
 	gboolean validated = TRUE;
@@ -1088,7 +1088,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 	if (e_cal_component_has_alarms (comp)) {
 		GList *alarms, *list;
-		int alarm_type;
+		gint alarm_type;
 
 		alarms = e_cal_component_get_alarm_uids (comp);
 		if (!is_custom_alarm_uid_list (comp, alarms, priv->old_summary, priv->alarm_units, priv->alarm_interval, &alarm_type))
@@ -1144,7 +1144,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	ECalComponentDateTime start_date, end_date;
 	struct icaltimetype start_tt, end_tt;
 	gboolean all_day_event, start_date_set, end_date_set, busy;
-	char *cat, *str;
+	gchar *cat, *str;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 
@@ -1326,7 +1326,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 				icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
 				icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 				while (icalprop) {
-					const char *x_name;
+					const gchar *x_name;
 					ECalComponentText summary;
 
 					x_name = icalproperty_get_x_name (icalprop);
@@ -1353,7 +1353,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 			ECalComponentAlarm *ca;
 			ECalComponentText summary;
 			ECalComponentAlarmTrigger trigger;
-			int alarm_type;
+			gint alarm_type;
 
 			ca = e_cal_component_alarm_new ();
 
@@ -1460,7 +1460,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 		if (flags & COMP_EDITOR_DELEGATE) {
 			GSList *attendee_list, *l;
-			int i;
+			gint i;
 			const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
 
 			e_cal_component_get_attendee_list (priv->comp, &attendee_list);
@@ -1534,7 +1534,7 @@ static void
 time_sel_changed (GtkComboBox *combo, EventPage *epage)
 {
 	EventPagePrivate *priv;
-	int selection = gtk_combo_box_get_active (combo);
+	gint selection = gtk_combo_box_get_active (combo);
 
 	priv = epage->priv;
 
@@ -1687,8 +1687,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *attendee = l->data;
-		const char *address;
-		const char *sentby = NULL;
+		const gchar *address;
+		const gchar *sentby = NULL;
 
 		address = itip_strip_mailto (attendee->value);
 		if (attendee->sentby)
@@ -1711,7 +1711,7 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia)
 	EventPagePrivate *priv = epage->priv;
 	CompEditor *editor;
 	CompEditorFlags flags;
-	int pos = 0;
+	gint pos = 0;
 	gboolean delegate;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
@@ -1771,7 +1771,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage)
 	GtkTreePath *path = NULL;
 	GtkTreeModel *model = NULL;
 	gboolean valid_iter;
-	char *address;
+	gchar *address;
 
 	priv = epage->priv;
 
@@ -1846,7 +1846,7 @@ attendee_added_cb (EMeetingListView *emlv,
 		e_meeting_store_remove_attendee (priv->model, ia);
 	} else {
 		if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
-			const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
+			const gchar *delegator_id = e_meeting_attendee_get_delfrom (ia);
 			EMeetingAttendee *delegator;
 
 			delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
@@ -1865,7 +1865,7 @@ attendee_added_cb (EMeetingListView *emlv,
 
 /* Callbacks for list view*/
 static void
-popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
+popup_add_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	EventPage *epage = data;
 
@@ -1873,7 +1873,7 @@ popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
+popup_delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	EventPage *epage = data;
 
@@ -1893,7 +1893,7 @@ static EPopupItem context_menu_items[] = {
 };
 
 static void
-context_popup_free(EPopup *ep, GSList *items, void *data)
+context_popup_free(EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free(items);
 }
@@ -1908,11 +1908,11 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage)
 	EMeetingAttendee *ia;
 	GtkTreePath *path;
 	GtkTreeIter iter;
-	char *address;
+	gchar *address;
 	guint32 disable_mask = ~0;
 	GSList *menus = NULL;
 	ECalPopup *ep;
-	int i;
+	gint i;
 
 	/* only process right-clicks */
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
@@ -2356,7 +2356,7 @@ check_start_before_end (struct icaltimetype *start_tt,
 			gboolean adjust_end_time)
 {
 	struct icaltimetype end_tt_copy;
-	int cmp;
+	gint cmp;
 
 	/* Convert the end time to the same timezone as the start time. */
 	end_tt_copy = *end_tt;
@@ -2428,7 +2428,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 	if (all_day_event) {
 		/* All Day Events are simple. We just compare the dates and if
 		   start > end we copy one of them to the other. */
-		int cmp = icaltime_compare_date_only (start_tt, end_tt);
+		gint cmp = icaltime_compare_date_only (start_tt, end_tt);
 		if (cmp > 0) {
 			if (adjust_end_time) {
 				end_tt = start_tt;
@@ -2640,7 +2640,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
 }
 
 static void
-set_subscriber_info_string (EventPage *epage, const char *backend_address)
+set_subscriber_info_string (EventPage *epage, const gchar *backend_address)
 {
 	CompEditor *editor;
 	ECal *client;
@@ -2670,7 +2670,7 @@ alarm_changed_cb (GtkWidget *widget,
 		ECalComponentAlarmTrigger trigger;
 		icalcomponent *icalcomp;
 		icalproperty *icalprop;
-		int alarm_type;
+		gint alarm_type;
 
 		ca = e_cal_component_alarm_new ();
 
@@ -2804,7 +2804,7 @@ init_widgets (EventPage *epage)
 	CompEditor *editor;
 	GtkTextBuffer *text_buffer;
 	icaltimezone *zone;
-	char *combo_label = NULL;
+	gchar *combo_label = NULL;
 	GtkAction *action;
 	GtkTreeSelection *selection;
 	gboolean active;
@@ -3026,7 +3026,7 @@ init_widgets (EventPage *epage)
 
 
 static void
-event_page_select_organizer (EventPage *epage, const char *backend_address)
+event_page_select_organizer (EventPage *epage, const gchar *backend_address)
 {
 	EventPagePrivate *priv = epage->priv;
 	CompEditor *editor;
@@ -3034,10 +3034,10 @@ event_page_select_organizer (EventPage *epage, const char *backend_address)
 	ECal *client;
 	EAccount *def_account;
 	gchar *def_address = NULL;
-	const char *default_address;
+	const gchar *default_address;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
-	const char *user_addr = NULL;
+	const gchar *user_addr = NULL;
 
 	def_account = itip_addresses_get_default();
 	if (def_account && def_account->enabled)
@@ -3060,7 +3060,7 @@ event_page_select_organizer (EventPage *epage, const char *backend_address)
 	if (user_addr)
 		for (l = priv->address_strings; l != NULL; l = l->next)
 			if (g_strrstr ((gchar *) l->data, user_addr) != NULL) {
-				default_address = (const char *) l->data;
+				default_address = (const gchar *) l->data;
 				break;
 			}
 
@@ -3093,7 +3093,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model)
 	EventPagePrivate *priv;
 	EIterator *it;
 	EAccount *a;
-	char *gladefile;
+	gchar *gladefile;
 
 	priv = epage->priv;
 	g_object_ref (model);
@@ -3230,7 +3230,7 @@ static void
 set_attendees (ECalComponent *comp, const GPtrArray *attendees)
 {
 	GSList *comp_attendees = NULL, *l;
-	int i;
+	gint i;
 
 	for (i = 0; i < attendees->len; i++) {
 		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index f8ce1bece2..4903f8f29e 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -101,10 +101,10 @@ struct _MemoPagePrivate {
 };
 
 static void set_subscriber_info_string (MemoPage *mpage, const gchar *backend_address);
-static const char * get_recipients (ECalComponent *comp);
+static const gchar * get_recipients (ECalComponent *comp);
 static void sensitize_widgets (MemoPage *mpage);
 static gboolean memo_page_fill_component (CompEditorPage *page, ECalComponent *comp);
-static void memo_page_select_organizer (MemoPage *mpage, const char *backend_address);
+static void memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address);
 
 G_DEFINE_TYPE (MemoPage, memo_page, TYPE_COMP_EDITOR_PAGE)
 
@@ -196,7 +196,7 @@ memo_page_fill_widgets (CompEditorPage *page,
 	ECalComponentText text;
 	ECalComponentDateTime d;
 	GSList *l;
-	const char *categories;
+	const gchar *categories;
 	gchar *backend_addr = NULL;
 
 	mpage = MEMO_PAGE (page);
@@ -363,7 +363,7 @@ sensitize_widgets (MemoPage *mpage)
 }
 
 /* returns empty string rather than NULL because of simplicity of usage */
-static const char *
+static const gchar *
 get_recipients (ECalComponent *comp)
 {
 	icalcomponent *icalcomp;
@@ -377,7 +377,7 @@ get_recipients (ECalComponent *comp)
 	for (icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 	     icalprop;
 	     icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY)) {
-		const char *xname = icalproperty_get_x_name (icalprop);
+		const gchar *xname = icalproperty_get_x_name (icalprop);
 
 		if (xname && strcmp (xname, "X-EVOLUTION-RECIPIENTS") == 0)
 			break;
@@ -420,7 +420,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 				ENameSelectorDialog *dialog;
 				EContactStore *c_store;
 				GList *books, *l;
-				char *uri = e_contact_get (contact, E_CONTACT_BOOK_URI);
+				gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI);
 
 				dialog = e_name_selector_peek_dialog (name_selector);
 				c_store = dialog->name_selector_model->contact_store;
@@ -437,11 +437,11 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 				if (book) {
 					GList *contacts = NULL;
 					EContact *n_con = NULL;
-					char *qu;
+					gchar *qu;
 					EBookQuery *query;
 
 					qu = g_strdup_printf ("(is \"full_name\" \"%s\")",
-							(char *) e_contact_get (contact, E_CONTACT_FULL_NAME));
+							(gchar *) e_contact_get (contact, E_CONTACT_FULL_NAME));
 					query = e_book_query_from_string (qu);
 
 					if (!e_book_get_contacts (book, query, &contacts, NULL)) {
@@ -471,7 +471,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 
 		for (l = list_dests; l; l = l->next) {
 			EDestination *dest = l->data;
-			const char *name, *attendee = NULL;
+			const gchar *name, *attendee = NULL;
 
 			name = e_destination_get_name (dest);
 
@@ -512,7 +512,7 @@ get_current_account (MemoPage *page)
 {
 	MemoPagePrivate *priv = page->priv;
 	EIterator *it;
-	const char *str;
+	const gchar *str;
 
 	str = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->org_combo))));
 	if (!str)
@@ -520,7 +520,7 @@ get_current_account (MemoPage *page)
 
 	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
 		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
+		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
 			g_free (full);
@@ -549,8 +549,8 @@ memo_page_fill_component (CompEditorPage *page,
 	ECalComponentClassification classification;
 	ECalComponentDateTime start_date;
 	struct icaltimetype start_tt;
-	char *cat, *str;
-	int i;
+	gchar *cat, *str;
+	gint i;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
 
@@ -591,10 +591,10 @@ memo_page_fill_component (CompEditorPage *page,
 		e_cal_component_set_description_list (comp, NULL);
 	}
 	else {
-		int idxToUse = 1;
+		gint idxToUse = 1;
 		GSList l;
 		ECalComponentText text, sumText;
-		char *txt, *p;
+		gchar *txt, *p;
 		gunichar uc;
 
 		for(i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
@@ -1022,7 +1022,7 @@ get_to_entry (ENameSelector *name_selector)
 }
 
 static void
-memo_page_select_organizer (MemoPage *mpage, const char *backend_address)
+memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address)
 {
 	MemoPagePrivate *priv;
 	CompEditor *editor;
@@ -1031,10 +1031,10 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address)
 	ECal *client;
 	EAccount *def_account;
 	gchar *def_address = NULL;
-	const char *default_address;
+	const gchar *default_address;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
-	const char *user_addr = NULL;
+	const gchar *user_addr = NULL;
 
 	def_account = itip_addresses_get_default();
 	if (def_account && def_account->enabled)
@@ -1059,7 +1059,7 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address)
 	if (user_addr)
 		for (l = priv->address_strings; l != NULL; l = l->next)
 			if (g_strrstr ((gchar *) l->data, user_addr) != NULL) {
-				default_address = (const char *) l->data;
+				default_address = (const gchar *) l->data;
 				break;
 			}
 
@@ -1093,7 +1093,7 @@ memo_page_construct (MemoPage *mpage)
 	CompEditor *editor;
 	CompEditorFlags flags;
 	EIterator *it;
-	char *gladefile;
+	gchar *gladefile;
 	EAccount *a;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage));
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 8d8dabbaf2..1323755cb1 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -37,7 +37,7 @@ recur_component_dialog (ECal *client,
 			CalObjModType *mod,
 			GtkWindow *parent, gboolean delegated)
 {
-	char *str;
+	gchar *str;
 	GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox;
 	GtkWidget *placeholder, *vbox;
 	ECalComponentVType vtype;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index f89993154f..5e24495b5c 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -61,7 +61,7 @@ enum month_num_options {
 	MONTH_NUM_OTHER
 };
 
-static const int month_num_options_map[] = {
+static const gint month_num_options_map[] = {
 	MONTH_NUM_FIRST,
 	MONTH_NUM_SECOND,
 	MONTH_NUM_THIRD,
@@ -83,7 +83,7 @@ enum month_day_options {
 	MONTH_DAY_SUN
 };
 
-static const int month_day_options_map[] = {
+static const gint month_day_options_map[] = {
 	MONTH_DAY_NTH,
 	MONTH_DAY_MON,
 	MONTH_DAY_TUE,
@@ -101,14 +101,14 @@ enum recur_type {
 	RECUR_CUSTOM
 };
 
-static const int type_map[] = {
+static const gint type_map[] = {
 	RECUR_NONE,
 	RECUR_SIMPLE,
 	RECUR_CUSTOM,
 	-1
 };
 
-static const int freq_map[] = {
+static const gint freq_map[] = {
 	ICAL_DAILY_RECURRENCE,
 	ICAL_WEEKLY_RECURRENCE,
 	ICAL_MONTHLY_RECURRENCE,
@@ -122,7 +122,7 @@ enum ending_type {
 	ENDING_FOREVER
 };
 
-static const int ending_types_map[] = {
+static const gint ending_types_map[] = {
 	ENDING_FOR,
 	ENDING_UNTIL,
 	ENDING_FOREVER,
@@ -157,7 +157,7 @@ struct _RecurrencePagePrivate {
 	guint8 weekday_blocked_day_mask;
 
 	/* For monthly recurrences, created by hand */
-	int month_index;
+	gint month_index;
 
 	GtkWidget *month_day_combo;
 	enum month_day_options month_day;
@@ -171,7 +171,7 @@ struct _RecurrencePagePrivate {
 
 	/* For ending count of occurrences, created by hand */
 	GtkWidget *ending_count_spin;
-	int ending_count;
+	gint ending_count;
 
 	/* More widgets from the Glade file */
 	GtkWidget *exception_list;  /* This is a GtkTreeView now */
@@ -583,7 +583,7 @@ sensitize_buttons (RecurrencePage *rpage)
 	gint selected_rows;
 	icalcomponent *icalcomp;
 	ECal *client;
-	const char *uid;
+	const gchar *uid;
 
 	if (priv->comp == NULL)
 		return;
@@ -639,7 +639,7 @@ sensitize_buttons (RecurrencePage *rpage)
  * icalrecurrencetype.by_day. Not needed at present.
  */
 static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
+nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
 {
 	g_assert (pos > 0 && pos <= 5);
 
@@ -679,7 +679,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 
 	case ICAL_WEEKLY_RECURRENCE: {
 		guint8 day_mask;
-		int i;
+		gint i;
 
 		g_return_if_fail (GTK_BIN (priv->special)->child != NULL);
 		g_return_if_fail (priv->weekday_picker != NULL);
@@ -976,10 +976,10 @@ make_weekly_special (RecurrencePage *rpage)
 
 /* Creates the subtree for the monthly recurrence number */
 static void
-make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const char *title, int start, int end)
+make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const gchar *title, gint start, gint end)
 {
 	GtkTreeIter iter, parent;
-	int i;
+	gint i;
 
 	gtk_tree_store_append (store, &parent, par);
 	gtk_tree_store_set (store, &parent, 0, _(title), 1, -1, -1);
@@ -1004,9 +1004,9 @@ only_leaf_sensitive (GtkCellLayout   *cell_layout,
 }
 
 static GtkWidget *
-make_recur_month_num_combo (int month_index)
+make_recur_month_num_combo (gint month_index)
 {
-	static const char *options[] = {
+	static const gchar *options[] = {
 		/* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 		 * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -1035,7 +1035,7 @@ make_recur_month_num_combo (int month_index)
 		N_("last")
 	};
 
-	int i;
+	gint i;
 	GtkTreeStore *store;
 	GtkTreeIter iter;
 	GtkWidget *combo;
@@ -1095,7 +1095,7 @@ make_recur_month_num_combo (int month_index)
 static GtkWidget *
 make_recur_month_combobox (void)
 {
-	static const char *options[] = {
+	static const gchar *options[] = {
 		/* For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 		   (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 		   the name of a week day (like 'Monday' or 'Friday') always follow. */
@@ -1110,7 +1110,7 @@ make_recur_month_combobox (void)
 	};
 
 	GtkWidget *combo;
-	int i;
+	gint i;
 
 	combo = gtk_combo_box_new_text ();
 
@@ -1313,9 +1313,9 @@ make_recurrence_special (RecurrencePage *rpage)
 
 /* Counts the elements in the by_xxx fields of an icalrecurrencetype */
 static int
-count_by_xxx (short *field, int max_elements)
+count_by_xxx (short *field, gint max_elements)
 {
-	int i;
+	gint i;
 
 	for (i = 0; i < max_elements; i++)
 		if (field[i] == ICAL_RECURRENCE_ARRAY_MAX)
@@ -1540,11 +1540,11 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	CompEditorFlags flags;
 	CompEditorPageDates dates;
 	GSList *rrule_list;
-	int len;
+	gint len;
 	struct icalrecurrencetype *r;
-	int n_by_second, n_by_minute, n_by_hour;
-	int n_by_day, n_by_month_day, n_by_year_day;
-	int n_by_week_no, n_by_month, n_by_set_pos;
+	gint n_by_second, n_by_minute, n_by_hour;
+	gint n_by_day, n_by_month_day, n_by_year_day;
+	gint n_by_week_no, n_by_month, n_by_set_pos;
 	GtkAdjustment *adj;
 
 	rpage = RECURRENCE_PAGE (page);
@@ -1661,7 +1661,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		break;
 
 	case ICAL_WEEKLY_RECURRENCE: {
-		int i;
+		gint i;
 		guint8 day_mask;
 
 		if (n_by_month_day != 0
@@ -1675,7 +1675,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 		for (i = 0; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
 			enum icalrecurrencetype_weekday weekday;
-			int pos;
+			gint pos;
 
 			weekday = icalrecurrencetype_day_day_of_week (r->by_day[i]);
 			pos = icalrecurrencetype_day_position (r->by_day[i]);
@@ -1735,7 +1735,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 			goto custom;
 
 		if (n_by_month_day == 1) {
-			int nth;
+			gint nth;
 
 			if (n_by_set_pos != 0)
 				goto custom;
@@ -1759,7 +1759,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 		} else if (n_by_day == 1) {
 			enum icalrecurrencetype_weekday weekday;
-			int pos;
+			gint pos;
 			enum month_day_options month_day;
 
 			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
@@ -2064,7 +2064,7 @@ type_toggled_cb (GtkToggleButton *toggle,
 }
 
 static GtkWidget *
-create_exception_dialog (RecurrencePage *rpage, const char *title, GtkWidget **date_edit)
+create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **date_edit)
 {
 	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *toplevel;
@@ -2332,7 +2332,7 @@ recurrence_page_construct (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv = rpage->priv;
 	CompEditor *editor;
-	char *gladefile;
+	gchar *gladefile;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
 
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 4baa22ab8a..c85ccbb4fe 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -387,7 +387,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
 {
 	SchedulePagePrivate *priv = spage->priv;
 	CompEditor *editor;
-	char *gladefile;
+	gchar *gladefile;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (spage));
 
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index f73af156b0..462ed7d82a 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -40,7 +40,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	GtkWidget *dialog;
 	ESourceList *source_list;
 	ESource *selected_source = NULL;
-	const char *gconf_key;
+	const gchar *gconf_key;
 	GConfClient *conf_client;
 	const gchar *icon_name = NULL;
 
@@ -72,12 +72,12 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
 		selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
 		if (selected_source) {
-			char *absolute_uri;
+			gchar *absolute_uri;
 
 			/* set the absolute URI on the source we keep around, since the group
 			   will be unrefed */
 			absolute_uri = e_source_build_absolute_uri (selected_source);
-			e_source_set_absolute_uri (selected_source, (const char *) absolute_uri);
+			e_source_set_absolute_uri (selected_source, (const gchar *) absolute_uri);
 
 			g_object_ref (selected_source);
 			g_free (absolute_uri);
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 4eca089435..c11dadf853 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -45,7 +45,7 @@ have_nonprocedural_alarm (ECalComponent *comp)
 		ECalComponentAlarm *alarm;
 		ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
 
-		alarm = e_cal_component_get_alarm (comp, (const char *)l->data);
+		alarm = e_cal_component_get_alarm (comp, (const gchar *)l->data);
 		if (alarm) {
 			e_cal_component_alarm_get_action (alarm, &action);
 			e_cal_component_alarm_free (alarm);
@@ -76,7 +76,7 @@ gboolean
 send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms)
 {
 	ECalComponentVType vtype;
-	const char *id;
+	const gchar *id;
 
 	if (strip_alarms)
 		*strip_alarms = TRUE;
@@ -140,7 +140,7 @@ gboolean
 send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *comp)
 {
 	ECalComponentVType vtype;
-	const char *id;
+	const gchar *id;
 
 	vtype = e_cal_component_get_vtype (comp);
 
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 95764cde48..67aee1ecab 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -65,7 +65,7 @@ struct _TaskDetailsPagePrivate {
 };
 
 /* Note that these two arrays must match. */
-static const int status_map[] = {
+static const gint status_map[] = {
 	ICAL_STATUS_NONE,
 	ICAL_STATUS_INPROCESS,
 	ICAL_STATUS_COMPLETED,
@@ -80,7 +80,7 @@ typedef enum {
 	PRIORITY_UNDEFINED
 } TaskEditorPriority;
 
-static const int priority_map[] = {
+static const gint priority_map[] = {
 	PRIORITY_HIGH,
 	PRIORITY_NORMAL,
 	PRIORITY_LOW,
@@ -170,7 +170,7 @@ task_details_page_focus_main_widget (CompEditorPage *page)
 
 
 static TaskEditorPriority
-priority_value_to_index (int priority_value)
+priority_value_to_index (gint priority_value)
 {
 	TaskEditorPriority retval;
 
@@ -189,7 +189,7 @@ priority_value_to_index (int priority_value)
 static int
 priority_index_to_value (TaskEditorPriority priority)
 {
-	int retval;
+	gint retval;
 
 	switch (priority) {
 	case PRIORITY_UNDEFINED:
@@ -255,10 +255,10 @@ task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 {
 	TaskDetailsPage *tdpage;
 	TaskDetailsPagePrivate *priv;
-	int *priority_value, *percent = NULL;
+	gint *priority_value, *percent = NULL;
 	TaskEditorPriority priority;
 	icalproperty_status status;
-	const char *url;
+	const gchar *url;
 	struct icaltimetype *completed = NULL;
 
 	tdpage = TASK_DETAILS_PAGE (page);
@@ -345,8 +345,8 @@ task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	struct icaltimetype icalcomplete, icaltoday;
 	icalproperty_status status;
 	TaskEditorPriority priority;
-	int priority_value, percent;
-	char *url;
+	gint priority_value, percent;
+	gchar *url;
 	gboolean date_set;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 
@@ -712,7 +712,7 @@ task_details_page_construct (TaskDetailsPage *tdpage)
 {
 	TaskDetailsPagePrivate *priv = tdpage->priv;
 	CompEditor *editor;
-	char *gladefile;
+	gchar *gladefile;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tdpage));
 
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 8926ac720b..5acc509f8c 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -394,7 +394,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 
 	if (attendees != NULL) {
 		GSList *l;
-		int row;
+		gint row;
 
 		task_page_hide_options (priv->task_page);
 		task_page_set_assignment (priv->task_page, TRUE);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index a3700f5bf7..90eee6dcf4 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -70,7 +70,7 @@ struct _TaskPagePrivate {
 	EAccountList *accounts;
 	GList *address_strings;
 	EMeetingAttendee *ia;
-	char *user_add;
+	gchar *user_add;
 	ECalComponent *comp;
 
 	/* For meeting/event */
@@ -127,7 +127,7 @@ struct _TaskPagePrivate {
 	ESendOptionsDialog *sod;
 };
 
-static const int classification_map[] = {
+static const gint classification_map[] = {
 	E_CAL_COMPONENT_CLASS_PUBLIC,
 	E_CAL_COMPONENT_CLASS_PRIVATE,
 	E_CAL_COMPONENT_CLASS_CONFIDENTIAL,
@@ -143,8 +143,8 @@ static void task_page_focus_main_widget (CompEditorPage *page);
 static gboolean task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
 static gboolean task_page_fill_component (CompEditorPage *page, ECalComponent *comp);
 static gboolean task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
-static void task_page_select_organizer (TaskPage *tpage, const char *backend_address);
-static void set_subscriber_info_string (TaskPage *tpage, const char *backend_address);
+static void task_page_select_organizer (TaskPage *tpage, const gchar *backend_address);
+static void set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address);
 
 G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE)
 
@@ -414,7 +414,7 @@ get_current_account (TaskPage *page)
 {
 	TaskPagePrivate *priv;
 	EIterator *it;
-	const char *str;
+	const gchar *str;
 
 	priv = page->priv;
 
@@ -424,7 +424,7 @@ get_current_account (TaskPage *page)
 
 	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
 		EAccount *a = (EAccount *)e_iterator_get(it);
-		char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
+		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
 			g_free (full);
@@ -455,7 +455,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 	ECal *client;
 	GSList *l;
 	icalcomponent *icalcomp;
-	const char *categories, *uid;
+	const gchar *categories, *uid;
 	icaltimezone *zone, *default_zone;
 	gchar *backend_addr = NULL;
 	gboolean active;
@@ -692,7 +692,7 @@ static void
 set_attendees (ECalComponent *comp, const GPtrArray *attendees)
 {
 	GSList *comp_attendees = NULL, *l;
-	int i;
+	gint i;
 
 	for (i = 0; i < attendees->len; i++) {
 		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);
@@ -724,7 +724,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	CompEditorFlags flags;
 	ECal *client;
 	struct icaltimetype start_tt, due_tt;
-	char *cat, *str;
+	gchar *cat, *str;
 	gboolean start_date_set, due_date_set, time_set;
 	GtkTextBuffer *text_buffer;
 	GtkTextIter text_iter_start, text_iter_end;
@@ -913,7 +913,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 		if (flags & COMP_EDITOR_DELEGATE ) {
 			GSList *attendee_list, *l;
-			int i;
+			gint i;
 			const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model);
 
 			e_cal_component_get_attendee_list (priv->comp, &attendee_list);
@@ -1001,8 +1001,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *attendee = l->data;
-		const char *address;
-		const char *sentby = NULL;
+		const gchar *address;
+		const gchar *sentby = NULL;
 
 		address = itip_strip_mailto (attendee->value);
 		if (attendee->sentby)
@@ -1025,7 +1025,7 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia)
 	TaskPagePrivate *priv = page->priv;
 	CompEditor *editor;
 	CompEditorFlags flags;
-	int pos = 0;
+	gint pos = 0;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (page));
 	flags = comp_editor_get_flags (editor);
@@ -1082,7 +1082,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page)
 	GtkTreePath *path = NULL;
 	GtkTreeModel *model = NULL;
 	gboolean valid_iter;
-	char *address;
+	gchar *address;
 
 	priv = page->priv;
 
@@ -1157,7 +1157,7 @@ attendee_added_cb (EMeetingListView *emlv,
 		e_meeting_store_remove_attendee (priv->model, ia);
 	else {
 		if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) {
-			const char *delegator_id = e_meeting_attendee_get_delfrom (ia);
+			const gchar *delegator_id = e_meeting_attendee_get_delfrom (ia);
 			EMeetingAttendee *delegator;
 
 			delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
@@ -1176,7 +1176,7 @@ attendee_added_cb (EMeetingListView *emlv,
 
 /* Callbacks for list view*/
 static void
-popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
+popup_add_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TaskPage *page = data;
 
@@ -1184,7 +1184,7 @@ popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
+popup_delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TaskPage *page = data;
 
@@ -1204,7 +1204,7 @@ static EPopupItem context_menu_items[] = {
 };
 
 static void
-context_popup_free(EPopup *ep, GSList *items, void *data)
+context_popup_free(EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free(items);
 }
@@ -1219,11 +1219,11 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page)
 	EMeetingAttendee *ia;
 	GtkTreePath *path;
 	GtkTreeIter iter;
-	char *address;
+	gchar *address;
 	guint32 disable_mask = ~0;
 	GSList *menus = NULL;
 	ECalPopup *ep;
-	int i;
+	gint i;
 
 	/* only process right-clicks */
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
@@ -1591,7 +1591,7 @@ check_start_before_end (struct icaltimetype *start_tt,
 			gboolean adjust_by_hour)
 {
 	struct icaltimetype end_tt_copy;
-	int cmp;
+	gint cmp;
 
 	/* Convert the end time to the same timezone as the start time. */
 	end_tt_copy = *end_tt;
@@ -1783,7 +1783,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage)
 }
 
 static void
-set_subscriber_info_string (TaskPage *tpage, const char *backend_address)
+set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address)
 {
 	CompEditor *editor;
 	ECal *client;
@@ -1977,18 +1977,18 @@ init_widgets (TaskPage *tpage)
 
 
 static void
-task_page_select_organizer (TaskPage *tpage, const char *backend_address)
+task_page_select_organizer (TaskPage *tpage, const gchar *backend_address)
 {
 	TaskPagePrivate *priv = tpage->priv;
 	CompEditor *editor;
 	GList *l;
 	EAccount *def_account;
 	gchar *def_address = NULL;
-	const char *default_address;
+	const gchar *default_address;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
 	ECal *client;
-	const char *user_addr = NULL;
+	const gchar *user_addr = NULL;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage));
 	client = comp_editor_get_client (editor);
@@ -2011,7 +2011,7 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address)
 	if (user_addr)
 		for (l = priv->address_strings; l != NULL; l = l->next)
 			if (g_strrstr ((gchar *) l->data, user_addr) != NULL) {
-				default_address = (const char *) l->data;
+				default_address = (const gchar *) l->data;
 				break;
 			}
 
@@ -2044,7 +2044,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 	TaskPagePrivate *priv;
 	EIterator *it;
 	EAccount *a;
-	char *gladefile;
+	gchar *gladefile;
 
 	priv = tpage->priv;
 	g_object_ref (model);