Prefer GLib basic types over C types.

142 files changed, 1911 insertions, 1911 deletions

diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index a33177874f..a9e2b95ea0 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -34,11 +34,11 @@
 
 static GHashTable *source_lists_hash = NULL;
 
-static char *
-auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_data)
+static gchar *
+auth_func_cb (ECal *ecal, const gchar *prompt, const gchar *key, gpointer user_data)
 {
 	gboolean remember;
-	char *password, *auth_domain;
+	gchar *password, *auth_domain;
 	ESource *source;
 	const gchar *component_name;
 
@@ -56,11 +56,11 @@ auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_dat
 	return password;
 }
 
-static char *
+static gchar *
 build_pass_key (ECal *ecal)
 {
-	char *euri_str;
-	const char *uri;
+	gchar *euri_str;
+	const gchar *uri;
 	EUri *euri;
 
 	uri = e_cal_get_uri (ecal);
@@ -76,7 +76,7 @@ void
 auth_cal_forget_password (ECal *ecal)
 {
 	ESource *source = NULL;
-	const char *auth_domain = NULL, *component_name = NULL,  *auth_type = NULL;
+	const gchar *auth_domain = NULL, *component_name = NULL,  *auth_type = NULL;
 
 	source = e_cal_get_source (ecal);
 	auth_domain = e_source_get_property (source, "auth-domain");
@@ -84,7 +84,7 @@ auth_cal_forget_password (ECal *ecal)
 
 	auth_type = e_source_get_property (source, "auth-type");
 	if (auth_type) {
-		char *key = NULL;
+		gchar *key = NULL;
 
 		key = build_pass_key (ecal);
 		e_passwords_forget_password (component_name, key);
@@ -119,7 +119,7 @@ auth_new_cal_from_source (ESource *source, ECalSourceType type)
 }
 
 ECal *
-auth_new_cal_from_uri (const char *uri, ECalSourceType type)
+auth_new_cal_from_uri (const gchar *uri, ECalSourceType type)
 {
 	ESourceGroup *group = NULL;
 	ESource *source = NULL;
@@ -144,7 +144,7 @@ auth_new_cal_from_uri (const char *uri, ECalSourceType type)
 			GSList *sl;
 
 			for (sl = e_source_group_peek_sources (gl->data); sl != NULL; sl = sl->next) {
-				char *source_uri;
+				gchar *source_uri;
 
 				source_uri = e_source_get_uri (sl->data);
 				if (source_uri) {
diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h
index 696a36d2ff..7d9d7f5fa7 100644
--- a/calendar/common/authentication.h
+++ b/calendar/common/authentication.h
@@ -29,7 +29,7 @@
 
 ECal *auth_new_cal_from_default (ECalSourceType type);
 ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type);
-ECal *auth_new_cal_from_uri (const char *uri, ECalSourceType type);
+ECal *auth_new_cal_from_uri (const gchar *uri, ECalSourceType type);
 void auth_cal_forget_password (ECal *ecal);
 
 #endif
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 5aef1aeb53..3654f5bed1 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -151,9 +151,9 @@ calconduit_load_configuration (guint32 pilot_id)
 	c->secret = e_pilot_setup_get_bool (prefix, "secret", FALSE);
 	c->multi_day_split = e_pilot_setup_get_bool (prefix, "multi_day_split", TRUE);
 	if ((c->last_uri = e_pilot_setup_get_string (prefix, "last_uri", NULL)) && !strncmp (c->last_uri, "file://", 7)) {
-		char *filename = g_filename_from_uri (c->last_uri, NULL, NULL);
-		const char *path = filename;
-		const char *home;
+		gchar *filename = g_filename_from_uri (c->last_uri, NULL, NULL);
+		const gchar *path = filename;
+		const gchar *home;
 
 		home = g_get_home_dir ();
 
@@ -379,10 +379,10 @@ e_calendar_context_destroy (ECalConduitContext *ctxt)
 }
 
 /* Debug routines */
-static char *
+static gchar *
 print_local (ECalLocalRecord *local)
 {
-	static char buff[ 4096 ];
+	static gchar buff[ 4096 ];
 
 	if (local == NULL) {
 		sprintf (buff, "[NULL]");
@@ -403,9 +403,9 @@ print_local (ECalLocalRecord *local)
 	return "";
 }
 
-static char *print_remote (GnomePilotRecord *remote)
+static gchar *print_remote (GnomePilotRecord *remote)
 {
-	static char buff[ 4096 ];
+	static gchar buff[ 4096 ];
 	struct Appointment appt;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
@@ -446,10 +446,10 @@ static char *print_remote (GnomePilotRecord *remote)
 	return buff;
 }
 
-static char *
-auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_data)
+static gchar *
+auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_data)
 {
-	char *password;
+	gchar *password;
 	ESource *source;
 	const gchar *auth_domain, *component_name;
 
@@ -464,9 +464,9 @@ auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_dat
 static int
 start_calendar_server (ECalConduitContext *ctxt)
 {
-	char *str_uri = NULL;
-	char *pass_key = NULL;
-	int retval = 0;
+	gchar *str_uri = NULL;
+	gchar *pass_key = NULL;
+	gint retval = 0;
 
 	g_return_val_if_fail (ctxt != NULL, -2);
 
@@ -505,7 +505,7 @@ start_calendar_server (ECalConduitContext *ctxt)
 
 /* Utility routines */
 static icaltimezone *
-get_timezone (ECal *client, const char *tzid)
+get_timezone (ECal *client, const gchar *tzid)
 {
 	icaltimezone *timezone = NULL;
 
@@ -521,7 +521,7 @@ get_default_timezone (void)
 {
 	EConfigListener *listener;
 	icaltimezone *timezone = NULL;
-	char *location;
+	gchar *location;
 
 	listener = e_config_listener_new ();
 
@@ -541,10 +541,10 @@ get_default_timezone (void)
 }
 
 
-static char *
+static gchar *
 map_name (ECalConduitContext *ctxt)
 {
-	char *filename;
+	gchar *filename;
 
 	filename = g_strdup_printf ("%s/.evolution/calendar/local/system/pilot-map-calendar-%d.xml",
 				    g_get_home_dir (), ctxt->cfg->pilot_id);
@@ -553,7 +553,7 @@ map_name (ECalConduitContext *ctxt)
 }
 
 static icalrecurrencetype_weekday
-get_ical_day (int day)
+get_ical_day (gint day)
 {
 	switch (day) {
 	case 0:
@@ -634,7 +634,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp
 	icaltimezone *tz_start, *tz_end;
 	time_t event_start, event_end, day_end;
 	struct icaltimetype *old_start_value, *old_end_value;
-	const char *uid;
+	const gchar *uid;
 	gboolean is_date = FALSE;
 	gboolean last = FALSE;
 	gboolean ret = TRUE;
@@ -677,7 +677,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp
 	while (!last) {
 		ECalComponent *clone = e_cal_component_clone (ccc->comp);
 		icalcomponent *ical_comp = NULL;
-		char *new_uid = e_cal_component_gen_uid ();
+		gchar *new_uid = e_cal_component_gen_uid ();
 		struct icaltimetype start_value, end_value;
 		ECalChange *c = NULL;
 
@@ -743,7 +743,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp
 }
 
 static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
+nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
 {
 	g_assert ((pos > 0 && pos <= 5) || (pos == -1));
 
@@ -757,7 +757,7 @@ next_changed_item (ECalConduitContext *ctxt, GList *changes)
 	GList *l;
 
 	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
+		const gchar *uid;
 
 		ccc = l->data;
 
@@ -770,7 +770,7 @@ next_changed_item (ECalConduitContext *ctxt, GList *changes)
 }
 
 static void
-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
+compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const gchar *uid)
 {
 	ECalChange *ccc;
 
@@ -834,7 +834,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #else
-	static char record[0xffff];
+	static gchar record[0xffff];
 #endif
 
 	memset(&p, 0, sizeof (p));
@@ -865,7 +865,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 
 	pi_buffer_free(buffer);
 #else
-	p.record = (unsigned char *)record;
+	p.record = (guchar *)record;
 	p.length = pack_Appointment (local->appt, p.record, 0xffff);
 #endif
 	return p;
@@ -877,14 +877,14 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 static void
 local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 	ECalComponentText summary;
 	GSList *d_list = NULL, *edl = NULL, *l;
 	ECalComponentText *description;
 	ECalComponentDateTime dt_start, dt_end;
 	ECalComponentClassification classif;
 	icaltimezone *default_tz = ctxt->timezone;
-	int i;
+	gint i;
 
 	g_return_if_fail (local != NULL);
 	g_return_if_fail (comp != NULL);
@@ -902,7 +902,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
          * we don't overwrite them
 	 */
 	if (local->local.ID != 0) {
-		int cat = 0;
+		gint cat = 0;
 #ifdef PILOT_LINK_0_12
 		struct Appointment appt;
 		pi_buffer_t * record;
@@ -914,7 +914,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 		}
 #else
 		struct Appointment appt;
-		char record[0xffff];
+		gchar record[0xffff];
 #endif
 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
 					ctxt->dbi->db_handle,
@@ -930,7 +930,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 #ifdef PILOT_LINK_0_12
 			unpack_Appointment (&appt, record, datebook_v1);
 #else
-			unpack_Appointment (&appt, (unsigned char *)record, 0xffff);
+			unpack_Appointment (&appt, (guchar *)record, 0xffff);
 #endif
 			local->appt->alarm = appt.alarm;
 			local->appt->advance = appt.advance;
@@ -1152,7 +1152,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 
 static void
 local_record_from_uid (ECalLocalRecord *local,
-		       const char *uid,
+		       const gchar *uid,
 		       ECalConduitContext *ctxt)
 {
 	ECalComponent *comp;
@@ -1199,8 +1199,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 	ECalComponentText summary = {NULL, NULL};
 	ECalComponentDateTime dt = {NULL, NULL};
 	GSList *edl = NULL;
-	char *txt;
-	int pos, i;
+	gchar *txt;
+	gint pos, i;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #endif
@@ -1456,8 +1456,8 @@ static void
 check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
 {
 	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
+	gint map_count;
+	const gchar *uri;
 
 	/* If there are objects but no log */
 	map_count = g_hash_table_size (ctxt->map->pid_map);
@@ -1488,9 +1488,9 @@ pre_sync (GnomePilotConduit *conduit,
 {
 	GnomePilotConduitSyncAbs *abs_conduit;
 	GList *removed = NULL, *added = NULL, *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
+	gint len;
+	guchar *buf;
+	gchar *filename, *change_id;
 	icalcomponent *icalcomp;
 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
 #ifdef PILOT_LINK_0_12
@@ -1560,7 +1560,7 @@ pre_sync (GnomePilotConduit *conduit,
 	ctxt->changed = g_list_concat (ctxt->changed, added);
 	for (l = removed; l != NULL; l = l->next) {
 		ECalChange *ccc = l->data;
-		const char *uid;
+		const gchar *uid;
 
 		e_cal_component_get_uid (ccc->comp, &uid);
 		if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) {
@@ -1573,7 +1573,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 	for (l = ctxt->changed; l != NULL; l = l->next) {
 		ECalChange *ccc = l->data;
-		const char *uid;
+		const gchar *uid;
 
 		e_cal_component_get_uid (ccc->comp, &uid);
 		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
@@ -1614,9 +1614,9 @@ pre_sync (GnomePilotConduit *conduit,
 				DLP_BUF_SIZE,
 				buffer);
 #else
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
+			      (guchar *)buf, 0xffff);
 #endif
 	if (len < 0) {
 		WARN (_("Could not read pilot's Calendar application block"));
@@ -1649,18 +1649,18 @@ post_sync (GnomePilotConduit *conduit,
 {
 	GList *changed;
 	gchar *filename, *change_id;
-	unsigned char *buf;
-	int dlpRetVal, len;
+	guchar *buf;
+	gint dlpRetVal, len;
 
 	LOG (g_message ( "post_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
 
 	/* Write AppBlock to PDA - updates categories */
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 
 	len = pack_AppointmentAppInfo (&(ctxt->ai), buf, 0xffff);
 
 	dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle,
-			      (unsigned char *)buf, len);
+			      (guchar *)buf, len);
 
 	g_free (buf);
 
@@ -1699,7 +1699,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit,
 	      guint32 ID,
 	      ECalConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
 
@@ -1714,7 +1714,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit,
 		    ECalLocalRecord *local,
 		    ECalConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_status_cleared: clearing status\n" ));
 
@@ -1730,7 +1730,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 	  ECalConduitContext *ctxt)
 {
 	static GList *comps, *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, -1);
@@ -1789,7 +1789,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		   ECalConduitContext *ctxt)
 {
 	static GList *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, -1);
@@ -1851,7 +1851,7 @@ compare (GnomePilotConduitSyncAbs *conduit,
 {
 	/* used by the quick compare */
 	GnomePilotRecord local_pilot;
-	int retval = 0;
+	gint retval = 0;
 
 	LOG (g_message ("compare: local=%s remote=%s...\n",
 			print_local (local), print_remote (remote)));
@@ -1879,8 +1879,8 @@ add_record (GnomePilotConduitSyncAbs *conduit,
 	    ECalConduitContext *ctxt)
 {
 	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
+	gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1911,7 +1911,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
 		ECalConduitContext *ctxt)
 {
 	ECalComponent *new_comp;
-	int retval = 0;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1934,7 +1934,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit,
 	       ECalLocalRecord *local,
 	       ECalConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	g_return_val_if_fail (local != NULL, -1);
 	g_assert (local->comp != NULL);
@@ -1959,8 +1959,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit,
 		gboolean archive,
 		ECalConduitContext *ctxt)
 {
-	const char *uid;
-	int retval = 0;
+	const gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (local != NULL, -1);
 
@@ -1978,7 +1978,7 @@ match (GnomePilotConduitSyncAbs *conduit,
        ECalLocalRecord **local,
        ECalConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ("match: looking for local copy of %s\n",
 			print_remote (remote)));
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index cdb4a10d2d..1be106929d 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -58,11 +58,11 @@
  *       in UTF-8 format. A conversion must take place before calling
  *       this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c)
  */
-int
-e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category)
+gint
+e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category)
 {
-	int i, j;
-	int retval = 0; /* 0 is the Unfiled category */
+	gint i, j;
+	gint retval = 0; /* 0 is the Unfiled category */
 	LOG(g_message("e_pilot_add_category_if_possible\n"));
 
 	for(i=0; i<PILOT_MAX_CATEGORIES; i++){
@@ -70,8 +70,8 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ
 		   the PalmOS doesn't let 0-length strings for
 		   categories */
 		if(strlen(category->name[i]) == 0){
-			int cat_to_add_len;
-			int desktopUniqueID;
+			gint cat_to_add_len;
+			gint desktopUniqueID;
 
 			cat_to_add_len = strlen(cat_to_add);
 			retval = i;
@@ -95,7 +95,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ
 
 			/* find a desktop id that is not in use between 128 and 255 */
 			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
-				int found = 0;
+				gint found = 0;
 				for(j=0; j<PILOT_MAX_CATEGORIES; j++){
 					if (category->ID[i] == desktopUniqueID) {
 						found = 1;
@@ -126,15 +126,15 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ
 /*
  *conversion from an evolution category to a palm category
  */
-void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
+void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
 {
 	GSList *c_list = NULL;
-	char * category_string;
-	int i;
+	gchar * category_string;
+	gint i;
 	e_cal_component_get_categories_list (comp, &c_list);
 	if (c_list) {
 		/* list != 0, so at least 1 category is assigned */
-		category_string = e_pilot_utf8_to_pchar((const char *)c_list->data);
+		category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data);
 		if (c_list->next != 0) {
 			LOG (g_message ("Note: item has more categories in evolution, first chosen"));
 		}
@@ -162,9 +162,9 @@ void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp,
 /*
  *conversion from a palm category to an evolution category
  */
-void e_pilot_remote_category_to_local(int pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
+void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
 {
-	char *category_string = NULL;
+	gchar *category_string = NULL;
 
 	if (pilotCategory != 0) {
 		/* pda has category assigned */
@@ -206,17 +206,17 @@ void e_pilot_remote_category_to_local(int pilotCategory, ECalComponent *comp, st
 	}
 }
 
-static char *
-build_setup_path (const char *path, const char *key)
+static gchar *
+build_setup_path (const gchar *path, const gchar *key)
 {
 	return g_strconcat ("/apps/evolution/conduit", "/", path, "/", key, NULL);
 }
 
 gboolean
-e_pilot_setup_get_bool (const char *path, const char *key, gboolean def)
+e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def)
 {
 	gboolean res = def;
-	char *full_path;
+	gchar *full_path;
 	GConfValue *value;
 	GConfClient *gconf;
 
@@ -241,10 +241,10 @@ e_pilot_setup_get_bool (const char *path, const char *key, gboolean def)
 }
 
 void
-e_pilot_setup_set_bool (const char *path, const char *key, gboolean value)
+e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value)
 {
 	GError *error = NULL;
-	char *full_path;
+	gchar *full_path;
 	GConfClient *gconf;
 
 	g_return_if_fail (path != NULL);
@@ -264,11 +264,11 @@ e_pilot_setup_set_bool (const char *path, const char *key, gboolean value)
 	}
 }
 
-int
-e_pilot_setup_get_int (const char *path, const char *key, int def)
+gint
+e_pilot_setup_get_int (const gchar *path, const gchar *key, gint def)
 {
-	int res = def;
-	char *full_path;
+	gint res = def;
+	gchar *full_path;
 	GConfValue *value;
 	GConfClient *gconf;
 
@@ -293,10 +293,10 @@ e_pilot_setup_get_int (const char *path, const char *key, int def)
 }
 
 void
-e_pilot_setup_set_int (const char *path, const char *key, int value)
+e_pilot_setup_set_int (const gchar *path, const gchar *key, gint value)
 {
 	GError *error = NULL;
-	char *full_path;
+	gchar *full_path;
 	GConfClient *gconf;
 
 	g_return_if_fail (path != NULL);
@@ -316,11 +316,11 @@ e_pilot_setup_set_int (const char *path, const char *key, int value)
 	}
 }
 
-char *
-e_pilot_setup_get_string (const char *path, const char *key, const char *def)
+gchar *
+e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def)
 {
-	char *res = g_strdup (def);
-	char *full_path;
+	gchar *res = g_strdup (def);
+	gchar *full_path;
 	GConfValue *value;
 	GConfClient *gconf;
 
@@ -347,10 +347,10 @@ e_pilot_setup_get_string (const char *path, const char *key, const char *def)
 }
 
 void
-e_pilot_setup_set_string (const char *path, const char *key, const char *value)
+e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value)
 {
 	GError *error = NULL;
-	char *full_path;
+	gchar *full_path;
 	GConfClient *gconf;
 
 	g_return_if_fail (path != NULL);
diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
index aab5a58b56..8110fc5094 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.h
+++ b/calendar/conduits/common/libecalendar-common-conduit.h
@@ -25,13 +25,13 @@
 #define PILOT_MAX_CATEGORIES 16
 
 
-int e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category);
-void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
-void e_pilot_remote_category_to_local(int   pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
+gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category);
+void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
+void e_pilot_remote_category_to_local(gint   pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
 
-gboolean e_pilot_setup_get_bool (const char *path, const char *key, gboolean def);
-void e_pilot_setup_set_bool (const char *path, const char *key, gboolean value);
-int e_pilot_setup_get_int (const char *path, const char *key, int def);
-void e_pilot_setup_set_int (const char *path, const char *key, int value);
-char *e_pilot_setup_get_string (const char *path, const char *key, const char *def);
-void e_pilot_setup_set_string (const char *path, const char *key, const char *value);
+gboolean e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def);
+void e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value);
+gint e_pilot_setup_get_int (const gchar *path, const gchar *key, gint def);
+void e_pilot_setup_set_int (const gchar *path, const gchar *key, gint value);
+gchar *e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def);
+void e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 61e5c852e3..1d32917760 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -86,7 +86,7 @@ struct _EMemoLocalRecord {
 	struct Memo *memo;
 };
 
-int lastDesktopUniqueID;
+gint lastDesktopUniqueID;
 
 static void
 memoconduit_destroy_record (EMemoLocalRecord *local)
@@ -297,10 +297,10 @@ e_memo_context_destroy (EMemoConduitContext *ctxt)
 }
 
 /* Debug routines */
-static char *
+static gchar *
 print_local (EMemoLocalRecord *local)
 {
-	static char buff[ 64 ];
+	static gchar buff[ 64 ];
 
 	if (local == NULL) {
 		sprintf (buff, "[NULL]");
@@ -317,9 +317,9 @@ print_local (EMemoLocalRecord *local)
 	return "";
 }
 
-static char *print_remote (GnomePilotRecord *remote)
+static gchar *print_remote (GnomePilotRecord *remote)
 {
-	static char buff[ 64 ];
+	static gchar buff[ 64 ];
 	struct Memo memo;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t *buffer;
@@ -377,7 +377,7 @@ get_default_timezone (void)
 {
 	EConfigListener *listener;
 	icaltimezone *timezone = NULL;
-	char *location;
+	gchar *location;
 
 	listener = e_config_listener_new ();
 
@@ -396,10 +396,10 @@ get_default_timezone (void)
 	return timezone;
 }
 
-static char *
+static gchar *
 map_name (EMemoConduitContext *ctxt)
 {
-	char *filename;
+	gchar *filename;
 
 	filename = g_strdup_printf ("%s/.evolution/memos/local/system/pilot-map-memo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
 
@@ -413,7 +413,7 @@ next_changed_item (EMemoConduitContext *ctxt, GList *changes)
 	GList *l;
 
 	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
+		const gchar *uid;
 
 		ccc = l->data;
 
@@ -426,7 +426,7 @@ next_changed_item (EMemoConduitContext *ctxt, GList *changes)
 }
 
 static void
-compute_status (EMemoConduitContext *ctxt, EMemoLocalRecord *local, const char *uid)
+compute_status (EMemoConduitContext *ctxt, EMemoLocalRecord *local, const gchar *uid)
 {
 	ECalChange *ccc;
 
@@ -461,7 +461,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #else
-	static char record[0xffff];
+	static gchar record[0xffff];
 #endif
 
 	memset(&p, 0, sizeof (p));
@@ -494,7 +494,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 
 	pi_buffer_free(buffer);
 #else
-	p.record = (unsigned char *)record;
+	p.record = (guchar *)record;
 	p.length = pack_Memo (local->memo, p.record, 0xffff);
 #endif
 	return p;
@@ -506,7 +506,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 static void
 local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 	GSList *d_list = NULL;
 	ECalComponentText *description;
 	ECalComponentClassification classif;
@@ -537,9 +537,9 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 		struct Memo memo;
 		pi_buffer_t * record;
 #else
-		char record[0xffff];
+		gchar record[0xffff];
 #endif
-		int cat = 0;
+		gint cat = 0;
 
 #ifdef PILOT_LINK_0_12
 		record = pi_buffer_new(DLP_BUF_SIZE);
@@ -602,7 +602,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 
 static void
 local_record_from_uid (EMemoLocalRecord *local,
-		       const char *uid,
+		       const gchar *uid,
 		       EMemoConduitContext *ctxt)
 {
 	ECalComponent *comp;
@@ -648,8 +648,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 	struct Memo memo;
 	struct icaltimetype now;
 	icaltimezone *utc_zone;
-	char *txt, *txt2, *txt3;
-	int i;
+	gchar *txt, *txt2, *txt3;
+	gint i;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #endif
@@ -694,7 +694,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 		e_cal_component_set_comment_list (comp, NULL);
 		e_cal_component_set_summary(comp, NULL);
 	} else {
-		int idxToUse = -1, ntext = strlen(memo.text);
+		gint idxToUse = -1, ntext = strlen(memo.text);
 		gboolean foundNL = FALSE;
 		GSList l;
 		ECalComponentText text, sumText;
@@ -755,8 +755,8 @@ static void
 check_for_slow_setting (GnomePilotConduit *c, EMemoConduitContext *ctxt)
 {
 	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
+	gint map_count;
+	const gchar *uri;
 
 	/* If there are no objects or objects but no log */
 	map_count = g_hash_table_size (ctxt->map->pid_map);
@@ -787,9 +787,9 @@ pre_sync (GnomePilotConduit *conduit,
 {
 	GnomePilotConduitSyncAbs *abs_conduit;
 	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
+	gint len;
+	guchar *buf;
+	gchar *filename, *change_id;
 	icalcomponent *icalcomp;
 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
 #ifdef PILOT_LINK_0_12
@@ -851,7 +851,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 	for (l = ctxt->changed; l != NULL; l = l->next) {
 		ECalChange *ccc = l->data;
-		const char *uid;
+		const gchar *uid;
 
 		e_cal_component_get_uid (ccc->comp, &uid);
 		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
@@ -895,9 +895,9 @@ pre_sync (GnomePilotConduit *conduit,
 				DLP_BUF_SIZE,
 				buffer);
 #else
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
+			      (guchar *)buf, 0xffff);
 #endif
 	if (len < 0) {
 		WARN (_("Could not read pilot's Memo application block"));
@@ -934,15 +934,15 @@ post_sync (GnomePilotConduit *conduit,
 {
 	GList *changed;
 	gchar *filename, *change_id;
-	unsigned char *buf;
-	int dlpRetVal, len;
+	guchar *buf;
+	gint dlpRetVal, len;
 
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 
 	len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
 
 	dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle,
-			      (unsigned char *)buf, len);
+			      (guchar *)buf, len);
 
 	g_free (buf);
 
@@ -984,7 +984,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit,
 	      guint32 ID,
 	      EMemoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
 
@@ -999,7 +999,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit,
 		    EMemoLocalRecord *local,
 		    EMemoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_status_cleared: clearing status\n" ));
 
@@ -1015,7 +1015,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 	  EMemoConduitContext *ctxt)
 {
 	static GList *comps, *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, -1);
@@ -1075,7 +1075,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		   EMemoConduitContext *ctxt)
 {
 	static GList *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, 0);
@@ -1138,7 +1138,7 @@ compare (GnomePilotConduitSyncAbs *conduit,
 {
 	/* used by the quick compare */
 	GnomePilotRecord local_pilot;
-	int retval = 0;
+	gint retval = 0;
 
 	LOG (g_message ("compare: local=%s remote=%s...\n",
 			print_local (local), print_remote (remote)));
@@ -1166,8 +1166,8 @@ add_record (GnomePilotConduitSyncAbs *conduit,
 	    EMemoConduitContext *ctxt)
 {
 	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
+	gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1196,7 +1196,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
 		EMemoConduitContext *ctxt)
 {
 	ECalComponent *new_comp;
-	int retval = 0;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1219,7 +1219,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit,
 	       EMemoLocalRecord *local,
 	       EMemoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	g_return_val_if_fail (local != NULL, -1);
 	g_return_val_if_fail (local->comp != NULL, -1);
@@ -1241,8 +1241,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit,
 		gboolean archive,
 		EMemoConduitContext *ctxt)
 {
-	const char *uid;
-	int retval = 0;
+	const gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (local != NULL, -1);
 
@@ -1260,7 +1260,7 @@ match (GnomePilotConduitSyncAbs *conduit,
        EMemoLocalRecord **local,
        EMemoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ("match: looking for local copy of %s\n",
 			print_remote (remote)));
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 3a684e0751..1ced6acfa3 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -88,7 +88,7 @@ struct _EToDoLocalRecord {
 	struct ToDo *todo;
 };
 
-int lastDesktopUniqueID;
+gint lastDesktopUniqueID;
 
 static void
 todoconduit_destroy_record (EToDoLocalRecord *local)
@@ -361,10 +361,10 @@ e_todo_context_destroy (EToDoConduitContext *ctxt)
 }
 
 /* Debug routines */
-static char *
+static gchar *
 print_local (EToDoLocalRecord *local)
 {
-	static char buff[ 4096 ];
+	static gchar buff[ 4096 ];
 
 	if (local == NULL) {
 		sprintf (buff, "[NULL]");
@@ -388,9 +388,9 @@ print_local (EToDoLocalRecord *local)
 	return "";
 }
 
-static char *print_remote (GnomePilotRecord *remote)
+static gchar *print_remote (GnomePilotRecord *remote)
 {
-	static char buff[ 4096 ];
+	static gchar buff[ 4096 ];
 	struct ToDo todo;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
@@ -432,10 +432,10 @@ static char *print_remote (GnomePilotRecord *remote)
 	return buff;
 }
 
-static char *
-auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_data)
+static gchar *
+auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_data)
 {
-	char *password;
+	gchar *password;
 	ESource *source;
 	const gchar *auth_domain, *component_name;
 
@@ -452,9 +452,9 @@ auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_dat
 static int
 start_calendar_server (EToDoConduitContext *ctxt)
 {
-	char *str_uri = NULL;
-	char *pass_key = NULL;
-	int retval = 0;
+	gchar *str_uri = NULL;
+	gchar *pass_key = NULL;
+	gint retval = 0;
 	g_return_val_if_fail (ctxt != NULL, -2);
 
 	if (ctxt->cfg->source) {
@@ -492,7 +492,7 @@ start_calendar_server (EToDoConduitContext *ctxt)
 
 /* Utility routines */
 static icaltimezone *
-get_timezone (ECal *client, const char *tzid)
+get_timezone (ECal *client, const gchar *tzid)
 {
 	icaltimezone *timezone = NULL;
 
@@ -508,7 +508,7 @@ get_default_timezone (void)
 {
 	EConfigListener *listener;
 	icaltimezone *timezone = NULL;
-	char *location;
+	gchar *location;
 
 	listener = e_config_listener_new ();
 
@@ -527,10 +527,10 @@ get_default_timezone (void)
 	return timezone;
 }
 
-static char *
+static gchar *
 map_name (EToDoConduitContext *ctxt)
 {
-	char *filename;
+	gchar *filename;
 
 	filename = g_strdup_printf ("%s/.evolution/tasks/local/system/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
 
@@ -554,7 +554,7 @@ next_changed_item (EToDoConduitContext *ctxt, GList *changes)
 	GList *l;
 
 	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
+		const gchar *uid;
 
 		ccc = l->data;
 
@@ -567,7 +567,7 @@ next_changed_item (EToDoConduitContext *ctxt, GList *changes)
 }
 
 static void
-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
+compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const gchar *uid)
 {
 	ECalChange *ccc;
 
@@ -602,7 +602,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #else
-	static char record[0xffff];
+	static gchar record[0xffff];
 #endif
 
 	g_assert (local->comp != NULL);
@@ -635,7 +635,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 
 	pi_buffer_free(buffer);
 #else
-	p.record = (unsigned char *)record;
+	p.record = (guchar *)record;
 	p.length = pack_ToDo (local->todo, p.record, 0xffff);
 #endif
 	return p;
@@ -647,8 +647,8 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 static void
 local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoConduitContext *ctxt)
 {
-	const char *uid;
-	int *priority;
+	const gchar *uid;
+	gint *priority;
 	icalproperty_status status;
 	ECalComponentText summary;
 	GSList *d_list = NULL;
@@ -674,7 +674,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
 
 	/* Don't overwrite the category */
 	if (local->local.ID != 0) {
-		int cat = 0;
+		gint cat = 0;
 #ifdef PILOT_LINK_0_12
 		pi_buffer_t * record;
 		record = pi_buffer_new(DLP_BUF_SIZE);
@@ -683,7 +683,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
 			return;
 		}
 #else
-		char record[0xffff];
+		gchar record[0xffff];
 #endif
 
 		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
@@ -771,7 +771,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
 
 static void
 local_record_from_uid (EToDoLocalRecord *local,
-		       const char *uid,
+		       const gchar *uid,
 		       EToDoConduitContext *ctxt)
 {
 	ECalComponent *comp;
@@ -819,8 +819,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 	ECalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};
 	struct icaltimetype due, now;
 	icaltimezone *utc_zone;
-	int priority;
-	char *txt;
+	gint priority;
+	gchar *txt;
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #endif
@@ -882,20 +882,20 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 	}
 
 	if (todo.complete) {
-		int percent = 100;
+		gint percent = 100;
 
 		e_cal_component_set_completed (comp, &now);
 		e_cal_component_set_percent (comp, &percent);
 		e_cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
 	} else {
-		int *percent = NULL;
+		gint *percent = NULL;
 		icalproperty_status status;
 
 		e_cal_component_set_completed (comp, NULL);
 
 		e_cal_component_get_percent (comp, &percent);
 		if (percent == NULL || *percent == 100) {
-			int p = 0;
+			gint p = 0;
 			e_cal_component_set_percent (comp, &p);
 		}
 		if (percent != NULL)
@@ -948,8 +948,8 @@ static void
 check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
 {
 	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
+	gint map_count;
+	const gchar *uri;
 
 	/* If there are no objects or objects but no log */
 	map_count = g_hash_table_size (ctxt->map->pid_map);
@@ -980,9 +980,9 @@ pre_sync (GnomePilotConduit *conduit,
 {
 	GnomePilotConduitSyncAbs *abs_conduit;
 	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
+	gint len;
+	guchar *buf;
+	gchar *filename, *change_id;
 	icalcomponent *icalcomp;
 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
 #ifdef PILOT_LINK_0_12
@@ -1041,7 +1041,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 	for (l = ctxt->changed; l != NULL; l = l->next) {
 		ECalChange *ccc = l->data;
-		const char *uid;
+		const gchar *uid;
 
 		e_cal_component_get_uid (ccc->comp, &uid);
 		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
@@ -1084,9 +1084,9 @@ pre_sync (GnomePilotConduit *conduit,
 				DLP_BUF_SIZE,
 				buffer);
 #else
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
+			      (guchar *)buf, 0xffff);
 #endif
 	if (len < 0) {
 		WARN (_("Could not read pilot's ToDo application block"));
@@ -1121,15 +1121,15 @@ post_sync (GnomePilotConduit *conduit,
 {
 	GList *changed;
 	gchar *filename, *change_id;
-	unsigned char *buf;
-	int dlpRetVal, len;
+	guchar *buf;
+	gint dlpRetVal, len;
 
-	buf = (unsigned char*)g_malloc (0xffff);
+	buf = (guchar *)g_malloc (0xffff);
 
 	len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff);
 
 	dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle,
-			      (unsigned char *)buf, len);
+			      (guchar *)buf, len);
 
 	g_free (buf);
 
@@ -1171,7 +1171,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit,
 	      guint32 ID,
 	      EToDoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
 
@@ -1186,7 +1186,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit,
 		    EToDoLocalRecord *local,
 		    EToDoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ( "set_status_cleared: clearing status\n" ));
 
@@ -1202,7 +1202,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 	  EToDoConduitContext *ctxt)
 {
 	static GList *comps, *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, -1);
@@ -1261,7 +1261,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		   EToDoConduitContext *ctxt)
 {
 	static GList *iterator;
-	static int count;
+	static gint count;
         GList *unused;
 
 	g_return_val_if_fail (local != NULL, 0);
@@ -1323,7 +1323,7 @@ compare (GnomePilotConduitSyncAbs *conduit,
 {
 	/* used by the quick compare */
 	GnomePilotRecord local_pilot;
-	int retval = 0;
+	gint retval = 0;
 
 	LOG (g_message ("compare: local=%s remote=%s...\n",
 			print_local (local), print_remote (remote)));
@@ -1351,8 +1351,8 @@ add_record (GnomePilotConduitSyncAbs *conduit,
 	    EToDoConduitContext *ctxt)
 {
 	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
+	gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1382,7 +1382,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
 		EToDoConduitContext *ctxt)
 {
 	ECalComponent *new_comp;
-	int retval = 0;
+	gint retval = 0;
 
 	g_return_val_if_fail (remote != NULL, -1);
 
@@ -1405,7 +1405,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit,
 	       EToDoLocalRecord *local,
 	       EToDoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	g_return_val_if_fail (local != NULL, -1);
 	g_return_val_if_fail (local->comp != NULL, -1);
@@ -1427,8 +1427,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit,
 		gboolean archive,
 		EToDoConduitContext *ctxt)
 {
-	const char *uid;
-	int retval = 0;
+	const gchar *uid;
+	gint retval = 0;
 
 	g_return_val_if_fail (local != NULL, -1);
 
@@ -1446,7 +1446,7 @@ match (GnomePilotConduitSyncAbs *conduit,
        EToDoLocalRecord **local,
        EToDoConduitContext *ctxt)
 {
-	const char *uid;
+	const gchar *uid;
 
 	LOG (g_message ("match: looking for local copy of %s\n",
 			print_remote (remote)));
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;
 }
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 089bf37552..5307936b27 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -93,8 +93,8 @@ static void
 an_update_minutes_label (GtkSpinButton *sb, gpointer data)
 {
 	AlarmNotify *an;
-	char *new_label;
-	int snooze_timeout_min;
+	gchar *new_label;
+	gint snooze_timeout_min;
 
 	an = (AlarmNotify *) data;
 
@@ -108,8 +108,8 @@ static void
 an_update_hrs_label (GtkSpinButton *sb, gpointer data)
 {
 	AlarmNotify *an;
-	char *new_label;
-	int snooze_timeout_hrs;
+	gchar *new_label;
+	gint snooze_timeout_hrs;
 
 	an = (AlarmNotify *) data;
 
@@ -170,7 +170,7 @@ edit_pressed_cb (GtkButton *button, gpointer user_data)
 static void
 snooze_pressed_cb (GtkButton *button, gpointer user_data)
 {
-	int snooze_timeout;
+	gint snooze_timeout;
 	AlarmNotify *an = user_data;
 	GtkTreeIter iter;
 	GtkTreeModel *model = NULL;
@@ -253,7 +253,7 @@ notified_alarms_dialog_new (void)
 
 			G_TYPE_POINTER /* FuncInfo*/));
 
-	char *gladefile;
+	gchar *gladefile;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 				      "alarm-notify.glade",
@@ -363,8 +363,8 @@ notified_alarms_dialog_new (void)
 GtkTreeIter
 add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger,
 				time_t occur_start, time_t occur_end,
-				ECalComponentVType vtype, const char *summary,
-				const char *description, const char *location,
+				ECalComponentVType vtype, const gchar *summary,
+				const gchar *description, const gchar *location,
 				AlarmNotifyFunc func, gpointer func_data)
 {
 	GtkTreeIter iter;
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 17f9b3a61c..ae523cb1ad 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -43,7 +43,7 @@ struct _AlarmNotificationsDialog
 	GtkWidget *treeview;
 };
 
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
+typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, gint snooze_mins, gpointer data);
 
 AlarmNotificationsDialog *
 notified_alarms_dialog_new (void);
@@ -51,8 +51,8 @@ notified_alarms_dialog_new (void);
 GtkTreeIter
 add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger,
 				time_t occur_start, time_t occur_end,
-				ECalComponentVType vtype, const char *summary,
-				const char *description, const char *location,
+				ECalComponentVType vtype, const gchar *summary,
+				const gchar *description, const gchar *location,
 				AlarmNotifyFunc func, gpointer func_data);
 
 
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 4085815bce..e05c6e6571 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -81,7 +81,7 @@ typedef struct {
 static void
 process_removal_in_hash (gpointer key, gpointer value, gpointer data)
 {
-	char *uri = key;
+	gchar *uri = key;
 	ProcessRemovalsData *prd = data;
 	GSList *groups, *sources, *p, *q;
 	gboolean found = FALSE;
@@ -94,8 +94,8 @@ process_removal_in_hash (gpointer key, gpointer value, gpointer data)
 		sources = e_source_group_peek_sources (group);
 		for (q = sources; q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
-			char *source_uri;
-			const char *completion = e_source_get_property (source, "alarm");
+			gchar *source_uri;
+			const gchar *completion = e_source_get_property (source, "alarm");
 
 			source_uri = e_source_get_uri (source);
 			if (strcmp (source_uri, uri) == 0)
@@ -122,7 +122,7 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 	ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST;
 	ProcessRemovalsData prd;
 	GList *l;
-	int i;
+	gint i;
 
 	g_signal_handlers_block_by_func(source_list, list_changed_cb, data);
 
@@ -146,8 +146,8 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 		sources = e_source_group_peek_sources (group);
 		for (q = sources; q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
-			char *uri;
-			const char *completion = e_source_get_property (source, "alarm");
+			gchar *uri;
+			const gchar *completion = e_source_get_property (source, "alarm");
 
 			if (completion  && (!g_ascii_strcasecmp (completion, "false") ||
 						!g_ascii_strcasecmp (completion, "never")))
@@ -169,7 +169,7 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 	g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd);
 
 	for (l = prd.removals; l; l = l->next) {
-		d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (char *)l->data));
+		d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (gchar *)l->data));
 		alarm_notify_remove_calendar (an, source_type, l->data);
 	}
 	g_list_free (prd.removals);
@@ -206,8 +206,8 @@ load_calendars (AlarmNotify *an, ECalSourceType source_type)
 		sources = e_source_group_peek_sources (group);
 		for (q = sources; q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
-			char *uri;
-			const char *completion = e_source_get_property (source, "alarm");
+			gchar *uri;
+			const gchar *completion = e_source_get_property (source, "alarm");
 
 			if (completion  && (!g_ascii_strcasecmp (completion, "false") ||
 						!g_ascii_strcasecmp (completion, "never")))
@@ -230,7 +230,7 @@ static void
 alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass)
 {
 	AlarmNotifyPrivate *priv;
-	int i;
+	gint i;
 
 	priv = g_new0 (AlarmNotifyPrivate, 1);
 	an->priv = priv;
@@ -263,7 +263,7 @@ alarm_notify_finalize (GObject *object)
 {
 	AlarmNotify *an;
 	AlarmNotifyPrivate *priv;
-	int i;
+	gint i;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (IS_ALARM_NOTIFY (object));
@@ -343,8 +343,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 	AlarmNotifyPrivate *priv;
 	ECal *client;
 	EUri *e_uri;
-	char *str_uri;
-	char *pass_key;
+	gchar *str_uri;
+	gchar *pass_key;
 	g_return_if_fail (an != NULL);
 	g_return_if_fail (IS_ALARM_NOTIFY (an));
 
@@ -399,7 +399,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 }
 
 void
-alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri)
+alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri)
 {
 	AlarmNotifyPrivate *priv;
 	ECal *client;
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index a548716295..a6ef3a173e 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -60,7 +60,7 @@ GType alarm_notify_get_type (void);
 AlarmNotify *alarm_notify_new (void);
 
 void alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource *source, gboolean load_afterwards);
-void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri);
+void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri);
 
 ESourceList *alarm_notify_get_selected_calendars (AlarmNotify *);
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 51aad370d6..cf95c2106a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -76,8 +76,8 @@ static GList *tray_icons_list = NULL;
 
 /* Top Tray Image */
 static GtkStatusIcon *tray_icon = NULL;
-static int tray_blink_id = -1;
-static int tray_blink_countdown = 0;
+static gint tray_blink_id = -1;
+static gint tray_blink_countdown = 0;
 static AlarmNotify *an;
 
 /* Structure that stores a client we are monitoring */
@@ -520,7 +520,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 static void
 load_alarms (ClientAlarms *ca, time_t start, time_t end)
 {
-	char *str_query, *iso_start, *iso_end;
+	gchar *str_query, *iso_start, *iso_end;
 
 	d(printf("%s:%d (load_alarms) \n",__FILE__, __LINE__));
 
@@ -875,7 +875,7 @@ query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
  * compued with respect to the current time.
  */
 static void
-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
+create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, gint snooze_mins)
 {
 	QueuedAlarm *orig_qa;
 	time_t t;
@@ -905,8 +905,8 @@ static void
 edit_component (ECal *client, ECalComponent *comp)
 {
 #if 0  /* KILL-BONOBO */
-	const char *uid;
-	const char *uri;
+	const gchar *uid;
+	const gchar *uri;
 	ECalSourceType source_type;
 	CORBA_Environment ev;
 	GNOME_Evolution_Calendar_CompEditorFactory factory;
@@ -939,7 +939,7 @@ edit_component (ECal *client, ECalComponent *comp)
 		corba_type = GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT;
 	}
 
-	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
+	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (gchar *) uid, corba_type, &ev);
 
 	if (BONOBO_EX (&ev))
 		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
@@ -952,9 +952,9 @@ edit_component (ECal *client, ECalComponent *comp)
 }
 
 typedef struct {
-	char *summary;
-	char *description;
-	char *location;
+	gchar *summary;
+	gchar *description;
+	gchar *location;
 	gboolean blink_state;
 	gboolean snooze_set;
 	gint blink_id;
@@ -1011,7 +1011,7 @@ free_tray_icon_data (TrayIconData *tray_data)
 static void
 on_dialog_objs_removed_async (struct _query_msg *msg)
 {
-	const char *our_uid;
+	const gchar *our_uid;
 	GList *l;
 	TrayIconData *tray_data;
 	ECal *client;
@@ -1027,7 +1027,7 @@ on_dialog_objs_removed_async (struct _query_msg *msg)
 	g_return_if_fail (our_uid && *our_uid);
 
 	for (l = objects; l != NULL; l = l->next) {
-		const char *uid = l->data;
+		const gchar *uid = l->data;
 
 		if (!uid)
 			continue;
@@ -1199,7 +1199,7 @@ tray_list_remove_data (TrayIconData *data)
 }
 
 static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
+notify_dialog_cb (AlarmNotifyResult result, gint snooze_mins, gpointer data)
 {
 	TrayIconData *tray_data = data;
 
@@ -1439,11 +1439,11 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 {
 	QueuedAlarm *qa;
 	ECalComponent *comp;
-	const char *summary, *description, *location;
+	const gchar *summary, *description, *location;
 	TrayIconData *tray_data;
 	ECalComponentText text;
 	GSList *text_list;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
+	gchar *str, *start_str, *end_str, *alarm_str, *time_str;
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
 
@@ -1523,7 +1523,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	tray_list_add_new (tray_data);
 
 	if (g_list_length (tray_icons_list) > 1) {
-		char *tip;
+		gchar *tip;
 
 		tip =  g_strdup_printf (_("You have %d alarms"), g_list_length (tray_icons_list));
 		gtk_status_icon_set_tooltip_text (tray_icon, tip);
@@ -1561,13 +1561,13 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 {
 	QueuedAlarm *qa;
 	ECalComponent *comp;
-	const char *summary, *location;
+	const gchar *summary, *location;
 	ECalComponentText text;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
+	gchar *str, *start_str, *end_str, *alarm_str, *time_str;
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
 	NotifyNotification *n;
-	char *body;
+	gchar *body;
 
 	d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__));
 
@@ -1654,7 +1654,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 	e_cal_component_alarm_free (alarm);
 
 	if (attach && icalattach_get_is_url (attach)) {
-		const char *url;
+		const gchar *url;
 
 		url = icalattach_get_url (attach);
 
@@ -1704,11 +1704,11 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
 
 /* Performs notification of a procedure alarm */
 static gboolean
-procedure_notification_dialog (const char *cmd, const char *url)
+procedure_notification_dialog (const gchar *cmd, const gchar *url)
 {
 	GtkWidget *dialog, *label, *checkbox;
-	char *str;
-	int btn;
+	gchar *str;
+	gint btn;
 
 	d(printf("%s:%d (procedure_notification_dialog)\n",__FILE__, __LINE__));
 
@@ -1757,8 +1757,8 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
 	ECalComponentAlarm *alarm;
 	ECalComponentText description;
 	icalattach *attach;
-	const char *url;
-	char *cmd;
+	const gchar *url;
+	gchar *cmd;
 	gboolean result = TRUE;
 
 	d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__));
@@ -1791,12 +1791,12 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
 	if (description.value)
 		cmd = g_strconcat (url, " ", description.value, NULL);
 	else
-		cmd = (char *) url;
+		cmd = (gchar *) url;
 
 	if (procedure_notification_dialog (cmd, url))
 		result = g_spawn_command_line_async (cmd, NULL);
 
-	if (cmd != (char *) url)
+	if (cmd != (gchar *) url)
 		g_free (cmd);
 
 	icalattach_unref (attach);
@@ -2170,7 +2170,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 	/* Update auids in Queued Alarms*/
 	for (qa_list = cqa->queued_alarms; qa_list; qa_list = qa_list->next) {
 		QueuedAlarm *qa = qa_list->data;
-		char *check_auid = (char *) qa->instance->auid;
+		gchar *check_auid = (gchar *) qa->instance->auid;
 		ECalComponentAlarm *alarm;
 
 		alarm = e_cal_component_get_alarm (newcomp, check_auid);
@@ -2209,7 +2209,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
 	for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
 		al_inst = instance_list->data;
 		if (al_inst->trigger == qa->orig_trigger) {  /* FIXME if two or more alarm instances (audio, note) 									  for same component have same trigger */
-			g_free ((char *) qa->instance->auid);
+			g_free ((gchar *) qa->instance->auid);
 			qa->instance->auid = g_strdup (al_inst->auid);
 			break;
 		}
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index dba9099520..8f3b0aebc1 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -48,7 +48,7 @@ static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
 static gboolean
 locale_supports_12_hour_format (void)
 {
-	char s[16];
+	gchar s[16];
 	time_t t = 0;
 
 	strftime (s, sizeof s, "%p", gmtime (&t));
@@ -100,7 +100,7 @@ ensure_inited (void)
 }
 
 ESourceList *
-config_data_get_calendars (const char *key)
+config_data_get_calendars (const gchar *key)
 {
 	ESourceList *cal_sources;
 	gboolean state;
@@ -157,9 +157,9 @@ config_data_get_calendars (const char *key)
 }
 
 void
-config_data_replace_string_list (const char *key,
-				 const char *old,
-				 const char *new)
+config_data_replace_string_list (const gchar *key,
+				 const gchar *old,
+				 const gchar *new)
 {
 	GSList *source, *tmp;
 
@@ -204,7 +204,7 @@ config_data_get_conf_client (void)
 icaltimezone *
 config_data_get_timezone (void)
 {
-	char *location;
+	gchar *location;
 	icaltimezone *local_timezone;
 
 	ensure_inited ();
@@ -309,7 +309,7 @@ config_data_get_last_notification_time (void)
  * Saves a program name as "blessed"
  **/
 void
-config_data_save_blessed_program (const char *program)
+config_data_save_blessed_program (const gchar *program)
 {
 	GConfClient *client;
 	GSList *l;
@@ -333,7 +333,7 @@ config_data_save_blessed_program (const char *program)
  * Return value: TRUE if program is blessed, FALSE otherwise
  **/
 gboolean
-config_data_is_blessed_program (const char *program)
+config_data_is_blessed_program (const gchar *program)
 {
 	GConfClient *client;
 	GSList *l, *n;
@@ -346,7 +346,7 @@ config_data_is_blessed_program (const char *program)
 	while (l) {
 		n = l->next;
 		if (!found)
-			found = strcmp ((char *) l->data, program) == 0;
+			found = strcmp ((gchar *) l->data, program) == 0;
 		g_free (l->data);
 		g_slist_free_1 (l);
 		l = n;
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 63e6c7205e..19086beb56 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -38,9 +38,9 @@ gboolean      config_data_get_24_hour_format (void);
 gboolean      config_data_get_notify_with_tray (void);
 void          config_data_set_last_notification_time (time_t t);
 time_t        config_data_get_last_notification_time (void);
-void          config_data_save_blessed_program (const char *program);
-gboolean      config_data_is_blessed_program (const char *program);
-ESourceList  *config_data_get_calendars (const char *);
-void	      config_data_replace_string_list (const char *, const char *, const char *);
+void          config_data_save_blessed_program (const gchar *program);
+gboolean      config_data_is_blessed_program (const gchar *program);
+ESourceList  *config_data_get_calendars (const gchar *);
+void	      config_data_replace_string_list (const gchar *, const gchar *, const gchar *);
 
 #endif
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index a625bec0fa..887adaa1d5 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -67,7 +67,7 @@ static gint
 save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown,
 		 GnomeInteractStyle interact_style, gint fast, gpointer user_data)
 {
-	char *args[2];
+	gchar *args[2];
 
 	args[0] = g_build_filename (EVOLUTION_LIBEXECDIR,
 				    "evolution-alarm-notify"
@@ -110,7 +110,7 @@ init_session (void)
  * singleton service object.
  */
 static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, const char *component_id, void *data)
+alarm_notify_factory_fn (BonoboGenericFactory *factory, const gchar *component_id, gpointer data)
 {
 	g_return_val_if_fail (alarm_notify_service != NULL, NULL);
 
@@ -127,8 +127,8 @@ init_alarm_service (gpointer user_data)
 	return FALSE;
 }
 
-int
-main (int argc, char **argv)
+gint
+main (gint argc, gchar **argv)
 {
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 640a8f5f99..5377c8d4b2 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -33,12 +33,12 @@
 #include "util.h"
 
 /* Converts a time_t to a string, relative to the specified timezone */
-char *
+gchar *
 timet_to_str_with_zone (time_t t, icaltimezone *zone)
 {
 	struct icaltimetype itt;
 	struct tm tm;
-	char buf[256];
+	gchar buf[256];
 
 	if (t == -1)
 		return g_strdup (_("invalid time"));
@@ -51,15 +51,15 @@ timet_to_str_with_zone (time_t t, icaltimezone *zone)
 	return g_strdup (buf);
 }
 
-char *
+gchar *
 calculate_time (time_t start, time_t end)
 {
 	time_t difference = end - start;
-	char *str;
-	int   hours, minutes;
-	char *times[4];
-	char *joined;
-	int   i;
+	gchar *str;
+	gint   hours, minutes;
+	gchar *times[4];
+	gchar *joined;
+	gint   i;
 
         i = 0;
 	if (difference >= 3600) {
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
index b7b715ca9b..bb6935729a 100644
--- a/calendar/gui/alarm-notify/util.h
+++ b/calendar/gui/alarm-notify/util.h
@@ -28,6 +28,6 @@
 
 #include <libecal/e-cal-component.h>
 
-char *timet_to_str_with_zone (time_t t, icaltimezone *zone);
-char *calculate_time (time_t start, time_t end);
+gchar *timet_to_str_with_zone (time_t t, icaltimezone *zone);
+gchar *calculate_time (time_t start, time_t end);
 #endif
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 40359d14dc..350b83ed78 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -46,7 +46,7 @@
 
 typedef struct CALSearchBarItem {
 	 ESearchBarItem search;
-	 const char *image;
+	 const gchar *image;
 } CALSearchBarItem;
 
 static ESearchBarItem calendar_search_items[] = {
@@ -192,7 +192,7 @@ cal_search_bar_init (CalSearchBar *cal_search)
 static void
 free_categories (GPtrArray *categories)
 {
-	int i;
+	gint i;
 
 	for (i = 0; i < categories->len; i++) {
 		if (categories->pdata[i] == NULL)
@@ -245,14 +245,14 @@ cal_search_bar_destroy (GtkObject *object)
 
 /* Emits the "sexp_changed" signal for the calendar search bar */
 static void
-notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)
+notify_sexp_changed (CalSearchBar *cal_search, const gchar *sexp)
 {
 	g_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED], 0, sexp);
 }
 
 /* Returns the string of the currently selected category, NULL for "Unmatched" and "All
 */
-static const char *
+static const gchar *
 get_current_category (CalSearchBar *cal_search)
 {
 	CalSearchBarPrivate *priv;
@@ -282,16 +282,16 @@ get_current_category (CalSearchBar *cal_search)
 
 
 /* Returns a sexp for the selected category in the drop-down menu.  The "All"
- * option is returned as (const char *) 1, and the "Unfiled" option is returned
+ * option is returned as (const gchar *) 1, and the "Unfiled" option is returned
  * as NULL.
  */
-static char *
+static gchar *
 get_show_option_sexp (CalSearchBar *cal_search)
 {
 	CalSearchBarPrivate *priv ;
 	gint viewid ;
-	char *start, *end, *due, *ret = NULL;
-	const char *category = NULL ;
+	gchar *start, *end, *due, *ret = NULL;
+	const gchar *category = NULL ;
 	time_t start_range, end_range;
 
 	priv = cal_search->priv;
@@ -405,10 +405,10 @@ get_show_option_sexp (CalSearchBar *cal_search)
 
 /* Sets the query string to be (contains? "field" "text") */
 static void
-notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const char *view)
+notify_e_cal_view_contains (CalSearchBar *cal_search, const gchar *field, const gchar *view)
 {
-	char *text = NULL;
-	char *sexp;
+	gchar *text = NULL;
+	gchar *sexp;
 
 	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
 
@@ -437,7 +437,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const c
 static void
 notify_category_is (CalSearchBar *cal_search)
 {
-	char *sexp;
+	gchar *sexp;
 
 	sexp = get_show_option_sexp (cal_search);
 
@@ -455,9 +455,9 @@ notify_category_is (CalSearchBar *cal_search)
 static void
 regen_query (CalSearchBar *cal_search)
 {
-	int id;
-	char *show_option_sexp = NULL;
-	char *sexp = NULL;
+	gint id;
+	gchar *show_option_sexp = NULL;
+	gchar *sexp = NULL;
 	GString *out = NULL;
 	EFilterBar *efb = (EFilterBar *) cal_search;
 
@@ -518,7 +518,7 @@ regen_query (CalSearchBar *cal_search)
 static void
 regen_view_query (CalSearchBar *cal_search)
 {
-        const char *category;
+        const gchar *category;
 	notify_category_is (cal_search);
 
 	category = cal_search_bar_get_category (cal_search);
@@ -546,7 +546,7 @@ generate_viewoption_menu (CALSearchBarItem *subitems)
 
 	for (i = 0; subitems[i].search.id != -1; ++i) {
 		if (subitems[i].search.text) {
-			char *str = NULL;
+			gchar *str = NULL;
 			str = e_str_without_underscores (subitems[i].search.text);
 			menu_item = gtk_image_menu_item_new_with_label (str);
                         if (subitems[i].image) {
@@ -588,12 +588,12 @@ setup_category_options (CalSearchBar *cal_search, CALSearchBarItem *subitems, gi
 		subitems[index].image = NULL;
 
 		for (i = 0; i < priv->categories->len; i++) {
-			const char *category;
+			const gchar *category;
 
 			category = priv->categories->pdata[i] ? priv->categories->pdata [i] : "";
 
 			/* The search.text field should not be free'd */
-			subitems[i + offset].search.text = (char *) category;
+			subitems[i + offset].search.text = (gchar *) category;
 			subitems[i + offset].search.id = i + offset;
 			subitems[i + offset].image = e_categories_get_icon_file_for (category);
 		}
@@ -719,7 +719,7 @@ make_suboptions (CalSearchBar *cal_search)
 }
 
 static void
-search_menu_activated (ESearchBar *esb, int id)
+search_menu_activated (ESearchBar *esb, gint id)
 {
 	if (id == E_FILTERBAR_ADVANCED_ID)
 		e_search_bar_set_item_id (esb, id);
@@ -739,9 +739,9 @@ cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags)
 {
 	ESearchBarItem *items;
 	guint32 bit = 0x1;
-	int i, j;
-	char *xmlfile = NULL;
-	char *userfile = NULL;
+	gint i, j;
+	gchar *xmlfile = NULL;
+	gchar *userfile = NULL;
 	FilterPart *part;
 	RuleContext *search_context;
 	FilterRule  *search_rule;
@@ -831,12 +831,12 @@ cal_search_bar_new (guint32 flags)
 
 /* Used from qsort() */
 static int
-compare_categories_cb (const void *a, const void *b)
+compare_categories_cb (gconstpointer a, gconstpointer b)
 {
-	const char **ca, **cb;
+	const gchar **ca, **cb;
 
-	ca = (const char **) a;
-	cb = (const char **) b;
+	ca = (const gchar **) a;
+	cb = (const gchar **) b;
 
 	/* FIXME: should use some utf8 strcoll() thingy */
 	return strcmp (*ca, *cb);
@@ -849,7 +849,7 @@ static GPtrArray *
 sort_categories (GPtrArray *categories)
 {
 	GPtrArray *c;
-	int i;
+	gint i;
 
 	c = g_ptr_array_new ();
 	g_ptr_array_set_size (c, categories->len);
@@ -899,10 +899,10 @@ cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories)
  * Return value: Name of the selected category, or NULL if there is no
  * selected category.
  **/
-const char *
+const gchar *
 cal_search_bar_get_category (CalSearchBar *cal_search)
 {
-	const char *category;
+	const gchar *category;
 
 	category = get_current_category (cal_search);
 
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 26f3998c89..3c7304f136 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -68,8 +68,8 @@ typedef struct {
 
 	/* Notification signals */
 
-	void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp);
-	void (* category_changed) (CalSearchBar *cal_search, const char *category);
+	void (* sexp_changed) (CalSearchBar *cal_search, const gchar *sexp);
+	void (* category_changed) (CalSearchBar *cal_search, const gchar *category);
 } CalSearchBarClass;
 
 GType cal_search_bar_get_type (void);
@@ -80,7 +80,7 @@ GtkWidget *cal_search_bar_new (guint32 flags);
 
 void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);
 
-const char *cal_search_bar_get_category (CalSearchBar *cal_search);
+const gchar *cal_search_bar_get_category (CalSearchBar *cal_search);
 
 void cal_search_bar_get_time_range (CalSearchBar *cal_search, time_t *start, time_t *end);
 
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 9f00044a4b..7f7c043943 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -87,7 +87,7 @@ set_normal_cursor (GnomeCalendar *gcal)
 }
 
 static void
-show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
+show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 
@@ -97,7 +97,7 @@ show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
 }
 
 static void
-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
+show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 
@@ -107,7 +107,7 @@ show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *
 }
 
 static void
-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
+show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 
@@ -117,7 +117,7 @@ show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
 }
 
 static void
-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
+show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 
@@ -128,7 +128,7 @@ show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path
 
 
 static void
-show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
+show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 
@@ -143,7 +143,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
 	GtkWidget *dialog, *parent, *box, *label, *spin;
-	int response;
+	gint response;
 
 	gcal = GNOME_CALENDAR (data);
 
@@ -195,7 +195,7 @@ static void
 sensitize_items(BonoboUIComponent *uic, struct _sensitize_item *items, guint32 mask)
 {
 	while (items->command) {
-		char command[32];
+		gchar command[32];
 
 		if (strlen(items->command)>=21) {
 			g_warning ("items->command >= 21: %s\n", items->command);
@@ -331,7 +331,7 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 }
 
 static void
-help_debug (BonoboUIComponent *uid, void *data, const char *path)
+help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path)
 {
 	calendar_component_show_logger ((GtkWidget *) data);
 }
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index eef60cfdb6..bea2ca8d43 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -93,7 +93,7 @@ typedef struct
 
 struct _CalendarComponentPrivate {
 
-	int gconf_notify_id;
+	gint gconf_notify_id;
 
 	ESourceList *source_list;
 	ESourceList *task_source_list;
@@ -149,7 +149,7 @@ is_in_uids (GSList *uids, ESource *source)
 	GSList *l;
 
 	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
+		const gchar *uid = l->data;
 
 		if (!strcmp (uid, e_source_peek_uid (source)))
 			return TRUE;
@@ -177,7 +177,7 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp
 
 	/* Remove any that aren't there any more */
 	for (l = source_selection; l; l = l->next) {
-		char *uid = l->data;
+		gchar *uid = l->data;
 		ESource *source;
 
 		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
@@ -192,7 +192,7 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp
 
 	/* Make sure the whole selection is there */
 	for (l = uids_selected; l; l = l->next) {
-		char *uid = l->data;
+		gchar *uid = l->data;
 		ESource *source;
 
 		source = e_source_list_peek_source_by_uid (source_list, uid);
@@ -211,7 +211,7 @@ static void
 update_primary_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
 {
 	ESource *source = NULL;
-	char *uid;
+	gchar *uid;
 	ESourceList *source_list = NULL;
 
 	if (type == E_CAL_SOURCE_TYPE_TODO) {
@@ -272,15 +272,15 @@ config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfE
 
 /* Evolution::Component CORBA methods.  */
 static void
-impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
+impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev)
 {
 	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
 	CalendarComponentPrivate *priv;
 	GList *l;
 	CalendarComponentView *view = NULL;
-	char *src_uid = NULL;
-	char *uid = NULL;
-	char *rid = NULL;
+	gchar *src_uid = NULL;
+	gchar *uid = NULL;
+	gchar *rid = NULL;
 
 	priv = calendar_component->priv;
 
@@ -292,8 +292,8 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
 
 	if (!strncmp (uri, "calendar:", 9)) {
 		EUri *euri = e_uri_new (uri);
-		const char *p;
-		char *header, *content;
+		const gchar *p;
+		gchar *header, *content;
 		size_t len, clen;
 		time_t start = -1, end = -1;
 
@@ -306,7 +306,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
 				if (p[len] != '=')
 					break;
 
-				header = (char *) p;
+				header = (gchar *) p;
 				header[len] = '\0';
 				p += len + 1;
 
@@ -372,7 +372,7 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView
 {
 	CalendarComponentPrivate *priv;
 	ESource *source = NULL;
-	char *uid;
+	gchar *uid;
 	guint not;
 
 	priv = calendar_component->priv;
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 14ebc801a3..e98210fa57 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -74,7 +74,7 @@ calendar_config_remove_notification (guint id)
 gboolean
 calendar_config_locale_supports_12_hour_format (void)
 {
-	char s[16];
+	gchar s[16];
 	time_t t = 0;
 
 	calendar_config_init ();
@@ -84,7 +84,7 @@ calendar_config_locale_supports_12_hour_format (void)
 }
 
 /* Returns the string representation of a units value */
-static const char *
+static const gchar *
 units_to_string (CalUnits units)
 {
 	switch (units) {
@@ -104,7 +104,7 @@ units_to_string (CalUnits units)
 
 /* opposite function to 'units_to_string' */
 static CalUnits
-string_to_units (const char *units)
+string_to_units (const gchar *units)
 {
 	CalUnits res;
 
@@ -184,7 +184,7 @@ calendar_config_get_timezone_stored (void)
 icaltimezone *
 calendar_config_get_icaltimezone (void)
 {
-	char *location;
+	gchar *location;
 	icaltimezone *zone = NULL;
 
 	calendar_config_init ();
@@ -468,9 +468,9 @@ calendar_config_add_notification_month_scroll_by_week (GConfClientNotifyFunc fun
 
 /* Whether we show the Marcus Bains Line (current time), and in what colors. */
 void
-calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color)
+calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color)
 {
-	static char *dcolor = NULL, *tcolor = NULL;
+	static gchar *dcolor = NULL, *tcolor = NULL;
 
 	calendar_config_init ();
 
@@ -705,7 +705,7 @@ calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpo
 }
 
 /* The primary task list */
-char *
+gchar *
 calendar_config_get_primary_tasks (void)
 {
 	calendar_config_init ();
@@ -714,7 +714,7 @@ calendar_config_get_primary_tasks (void)
 }
 
 void
-calendar_config_set_primary_tasks (const char *primary_uid)
+calendar_config_set_primary_tasks (const gchar *primary_uid)
 {
 	calendar_config_init ();
 
@@ -783,7 +783,7 @@ calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpo
 }
 
 /* The primary memo list */
-char *
+gchar *
 calendar_config_get_primary_memos (void)
 {
 	calendar_config_init ();
@@ -792,7 +792,7 @@ calendar_config_get_primary_memos (void)
 }
 
 void
-calendar_config_set_primary_memos (const char *primary_uid)
+calendar_config_set_primary_memos (const gchar *primary_uid)
 {
 	calendar_config_init ();
 
@@ -936,7 +936,7 @@ calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc fun
 CalUnits
 calendar_config_get_hide_completed_tasks_units	(void)
 {
-	char *units;
+	gchar *units;
 	CalUnits cu;
 
 	calendar_config_init ();
@@ -959,7 +959,7 @@ calendar_config_get_hide_completed_tasks_units	(void)
 void
 calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
 {
-	char *units;
+	gchar *units;
 
 	calendar_config_init ();
 
@@ -1234,7 +1234,7 @@ calendar_config_set_use_default_reminder (gboolean value)
  *
  * Return value: Interval for default reminders.
  **/
-int
+gint
 calendar_config_get_default_reminder_interval (void)
 {
 	calendar_config_init ();
@@ -1250,7 +1250,7 @@ calendar_config_get_default_reminder_interval (void)
  * appointments.
  **/
 void
-calendar_config_set_default_reminder_interval (int interval)
+calendar_config_set_default_reminder_interval (gint interval)
 {
 	calendar_config_init ();
 
@@ -1268,7 +1268,7 @@ calendar_config_set_default_reminder_interval (int interval)
 CalUnits
 calendar_config_get_default_reminder_units (void)
 {
-	char *units;
+	gchar *units;
 	CalUnits cu;
 
 	calendar_config_init ();
@@ -1305,7 +1305,7 @@ calendar_config_set_default_reminder_units (CalUnits units)
  * are retrieved even when returns FALSE.
  **/
 gboolean
-calendar_config_get_ba_reminder (int *interval, CalUnits *units)
+calendar_config_get_ba_reminder (gint *interval, CalUnits *units)
 {
 	calendar_config_init ();
 
@@ -1314,7 +1314,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units)
 	}
 
 	if (units) {
-		char *str;
+		gchar *str;
 
 		str = gconf_client_get_string (config, CALENDAR_CONFIG_BA_REMINDER_UNITS, NULL);
 		*units = string_to_units (str);
@@ -1333,7 +1333,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units)
  * @units: The units of the reminder; can be NULL.
  **/
 void
-calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units)
+calendar_config_set_ba_reminder (gboolean *enabled, gint *interval, CalUnits *units)
 {
 	calendar_config_init ();
 
@@ -1355,10 +1355,10 @@ calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *uni
  * Returns the subexpression to use to filter out completed tasks according
  * to the config settings. The returned sexp should be freed.
  **/
-char*
+gchar *
 calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed)
 {
-	char *sexp = NULL;
+	gchar *sexp = NULL;
 
 	if (calendar_config_get_hide_completed_tasks ()) {
 		CalUnits units;
@@ -1375,7 +1375,7 @@ calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed)
 			else
 				sexp = g_strdup ("(is-completed?)");
 		} else {
-			char *isodate;
+			gchar *isodate;
 			icaltimezone *zone;
 			struct icaltimetype tt;
 			time_t t;
@@ -1453,10 +1453,10 @@ calendar_config_set_dir_path (const gchar *path)
 	gconf_client_set_string (config, CALENDAR_CONFIG_SAVE_DIR, path, NULL);
 }
 
-char *
+gchar *
 calendar_config_get_dir_path (void)
 {
-	char *path;
+	gchar *path;
 
 	calendar_config_init ();
 
@@ -1491,14 +1491,14 @@ calendar_config_free_day_second_zones (GSList *zones)
 
 /* keeps max 'day_second_zones_max' zones, if 'location' is already in a list, then it'll became first there */
 void
-calendar_config_set_day_second_zone (const char *location)
+calendar_config_set_day_second_zone (const gchar *location)
 {
 	calendar_config_init ();
 
 	if (location && *location) {
 		GSList *lst, *l;
 		GError *error = NULL;
-		int max_zones;
+		gint max_zones;
 
 		/* configurable max number of timezones to remember */
 		max_zones = gconf_client_get_int (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX, &error);
@@ -1516,7 +1516,7 @@ calendar_config_set_day_second_zone (const char *location)
 			if (l->data && g_str_equal (l->data, location)) {
 				if (l != lst) {
 					/* isn't first in the list */
-					char *val = l->data;
+					gchar *val = l->data;
 
 					lst = g_slist_remove (lst, val);
 					lst = g_slist_prepend (lst, val);
@@ -1545,7 +1545,7 @@ calendar_config_set_day_second_zone (const char *location)
 }
 
 /* location of the second time zone user has selected. Free with g_free. */
-char *
+gchar *
 calendar_config_get_day_second_zone (void)
 {
 	calendar_config_init ();
@@ -1559,7 +1559,7 @@ calendar_config_select_day_second_zone (void)
 	icaltimezone *zone = NULL;
 	ETimezoneDialog *tzdlg;
 	GtkWidget *dialog;
-	char *second_location;
+	gchar *second_location;
 
 	second_location = calendar_config_get_day_second_zone ();
 	if (second_location && *second_location)
@@ -1575,7 +1575,7 @@ calendar_config_select_day_second_zone (void)
 	dialog = e_timezone_dialog_get_toplevel (tzdlg);
 
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		const char *location = NULL;
+		const gchar *location = NULL;
 
 		zone = e_timezone_dialog_get_timezone (tzdlg);
 		if (zone == icaltimezone_get_utc_timezone ()) {
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 08febaf0d3..b35888f842 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -69,8 +69,8 @@ void	  calendar_config_set_calendars_selected (GSList *selected);
 guint	  calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data);
 
 /* The current timezone, e.g. "Europe/London". */
-gchar*	  calendar_config_get_timezone		(void);
-gchar*	  calendar_config_get_timezone_stored	(void);
+gchar *	  calendar_config_get_timezone		(void);
+gchar *	  calendar_config_get_timezone_stored	(void);
 icaltimezone *calendar_config_get_icaltimezone (void);
 void	  calendar_config_set_timezone		(const gchar	     *timezone);
 guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
@@ -113,7 +113,7 @@ void	  calendar_config_set_time_divisions	(gint	      divisions);
 guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data);
 
 /* Whether we show the Marcus Bains Line, and in what colors. */
-void calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color);
+void calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color);
 void calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor);
 
 /* Whether we show event end times. */
@@ -162,8 +162,8 @@ void	  calendar_config_set_tasks_selected (GSList *selected);
 guint	  calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data);
 
 /* The primary calendar */
-char     *calendar_config_get_primary_tasks (void);
-void	  calendar_config_set_primary_tasks (const char *primary_uid);
+gchar     *calendar_config_get_primary_tasks (void);
+void	  calendar_config_set_primary_tasks (const gchar *primary_uid);
 guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data);
 
 /* The pane position */
@@ -177,8 +177,8 @@ void	  calendar_config_set_memos_selected (GSList *selected);
 guint	  calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data);
 
 /* The primary calendar */
-char     *calendar_config_get_primary_memos (void);
-void	  calendar_config_set_primary_memos (const char *primary_uid);
+gchar     *calendar_config_get_primary_memos (void);
+void	  calendar_config_set_primary_memos (const gchar *primary_uid);
 guint	  calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data);
 
 /* Colors for the task list */
@@ -201,7 +201,7 @@ gint	  calendar_config_get_hide_completed_tasks_value(void);
 void	  calendar_config_set_hide_completed_tasks_value(gint		value);
 guint	  calendar_config_add_notification_hide_completed_tasks_value (GConfClientNotifyFunc func, gpointer data);
 
-char *	  calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed);
+gchar *	  calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed);
 
 /* Confirmation options */
 gboolean  calendar_config_get_confirm_delete (void);
@@ -214,8 +214,8 @@ void      calendar_config_set_confirm_purge (gboolean confirm);
 gboolean calendar_config_get_use_default_reminder (void);
 void     calendar_config_set_use_default_reminder (gboolean value);
 
-int      calendar_config_get_default_reminder_interval (void);
-void     calendar_config_set_default_reminder_interval (int interval);
+gint      calendar_config_get_default_reminder_interval (void);
+void     calendar_config_set_default_reminder_interval (gint interval);
 
 CalUnits calendar_config_get_default_reminder_units (void);
 void     calendar_config_set_default_reminder_units (CalUnits units);
@@ -233,19 +233,19 @@ guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc
    supports 12-hour time format. */
 gboolean  calendar_config_locale_supports_12_hour_format(void);
 
-void	  calendar_config_set_dir_path (const char *);
-char *	  calendar_config_get_dir_path (void);
+void	  calendar_config_set_dir_path (const gchar *);
+gchar *	  calendar_config_get_dir_path (void);
 
 GSList *calendar_config_get_day_second_zones (void);
 void    calendar_config_free_day_second_zones (GSList *zones);
-void    calendar_config_set_day_second_zone (const char *location);
-char *  calendar_config_get_day_second_zone (void);
+void    calendar_config_set_day_second_zone (const gchar *location);
+gchar *  calendar_config_get_day_second_zone (void);
 void    calendar_config_select_day_second_zone (void);
 guint   calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data);
 
 /* Birthdays & Anniversaries reminder settings */
-gboolean calendar_config_get_ba_reminder (int *interval, CalUnits *units);
-void calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units);
+gboolean calendar_config_get_ba_reminder (gint *interval, CalUnits *units);
+void calendar_config_set_ba_reminder (gboolean *enabled, gint *interval, CalUnits *units);
 
 /* Scroll in a month view by a week, not by a month */
 gboolean calendar_config_get_month_scroll_by_week (void);
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index 9eec42fb13..34e8344a88 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -43,9 +43,9 @@ struct _CalendarViewFactoryPrivate {
 
 static void calendar_view_factory_finalize (GObject *object);
 
-static const char *calendar_view_factory_get_title (GalViewFactory *factory);
-static const char *calendar_view_factory_get_type_code (GalViewFactory *factory);
-static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name);
+static const gchar *calendar_view_factory_get_title (GalViewFactory *factory);
+static const gchar *calendar_view_factory_get_type_code (GalViewFactory *factory);
+static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const gchar *name);
 
 G_DEFINE_TYPE (CalendarViewFactory, calendar_view_factory, GAL_VIEW_FACTORY_TYPE)
 
@@ -99,7 +99,7 @@ calendar_view_factory_finalize (GObject *object)
 
 
 /* get_title method for the calendar view factory */
-static const char *
+static const gchar *
 calendar_view_factory_get_title (GalViewFactory *factory)
 {
 	CalendarViewFactory *cal_view_factory;
@@ -127,7 +127,7 @@ calendar_view_factory_get_title (GalViewFactory *factory)
 }
 
 /* get_type_code method for the calendar view factory */
-static const char *
+static const gchar *
 calendar_view_factory_get_type_code (GalViewFactory *factory)
 {
 	CalendarViewFactory *cal_view_factory;
@@ -156,7 +156,7 @@ calendar_view_factory_get_type_code (GalViewFactory *factory)
 
 /* new_view method for the calendar view factory */
 static GalView *
-calendar_view_factory_new_view (GalViewFactory *factory, const char *name)
+calendar_view_factory_new_view (GalViewFactory *factory, const gchar *name)
 {
 	CalendarViewFactory *cal_view_factory;
 	CalendarViewFactoryPrivate *priv;
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index 5415affdf2..b316771ca1 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -36,18 +36,18 @@ struct _CalendarViewPrivate {
 	GnomeCalendarViewType view_type;
 
 	/* Title of the view */
-	char *title;
+	gchar *title;
 };
 
 
 
 static void calendar_view_finalize (GObject *object);
 
-static void calendar_view_load (GalView *view, const char *filename);
-static void calendar_view_save (GalView *view, const char *filename);
-static const char *calendar_view_get_title (GalView *view);
-static void calendar_view_set_title (GalView *view, const char *title);
-static const char *calendar_view_get_type_code (GalView *view);
+static void calendar_view_load (GalView *view, const gchar *filename);
+static void calendar_view_save (GalView *view, const gchar *filename);
+static const gchar *calendar_view_get_title (GalView *view);
+static void calendar_view_set_title (GalView *view, const gchar *title);
+static const gchar *calendar_view_get_type_code (GalView *view);
 static GalView *calendar_view_clone (GalView *view);
 
 G_DEFINE_TYPE (CalendarView, calendar_view, GAL_VIEW_TYPE)
@@ -114,20 +114,20 @@ calendar_view_finalize (GObject *object)
 
 /* load method of the calendar view */
 static void
-calendar_view_load (GalView *view, const char *filename)
+calendar_view_load (GalView *view, const gchar *filename)
 {
 	/* nothing */
 }
 
 /* save method of the calendar view */
 static void
-calendar_view_save (GalView *view, const char *filename)
+calendar_view_save (GalView *view, const gchar *filename)
 {
 	/* nothing */
 }
 
 /* get_title method of the calendar view */
-static const char *
+static const gchar *
 calendar_view_get_title (GalView *view)
 {
 	CalendarView *cal_view;
@@ -136,12 +136,12 @@ calendar_view_get_title (GalView *view)
 	cal_view = CALENDAR_VIEW (view);
 	priv = cal_view->priv;
 
-	return (const char *) priv->title;
+	return (const gchar *) priv->title;
 }
 
 /* set_title method of the calendar view */
 static void
-calendar_view_set_title (GalView *view, const char *title)
+calendar_view_set_title (GalView *view, const gchar *title)
 {
 	CalendarView *cal_view;
 	CalendarViewPrivate *priv;
@@ -156,7 +156,7 @@ calendar_view_set_title (GalView *view, const char *title)
 }
 
 /* get_type_code method for the calendar view */
-static const char *
+static const gchar *
 calendar_view_get_type_code (GalView *view)
 {
 	CalendarView *cal_view;
@@ -219,7 +219,7 @@ calendar_view_clone (GalView *view)
 CalendarView *
 calendar_view_construct (CalendarView *cal_view,
 			 GnomeCalendarViewType view_type,
-			 const char *title)
+			 const gchar *title)
 {
 	CalendarViewPrivate *priv;
 
@@ -245,7 +245,7 @@ calendar_view_construct (CalendarView *cal_view,
  * Return value: A newly-created calendar view.
  **/
 CalendarView *
-calendar_view_new (GnomeCalendarViewType view_type, const char *title)
+calendar_view_new (GnomeCalendarViewType view_type, const gchar *title)
 {
 	CalendarView *cal_view;
 
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index 51e3235c34..a3c4a54012 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -57,10 +57,10 @@ GType calendar_view_get_type (void);
 
 CalendarView *calendar_view_construct (CalendarView *cal_view,
 				       GnomeCalendarViewType view_type,
-				       const char *title);
+				       const gchar *title);
 
 CalendarView *calendar_view_new (GnomeCalendarViewType view_type,
-				 const char *title);
+				 const gchar *title);
 
 GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view);
 
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 153dc089ec..49b43900d5 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -70,7 +70,7 @@ cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone)
 
 /* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
 static gboolean
-e_cal_component_compare_tzid (const char *tzid1, const char *tzid2)
+e_cal_component_compare_tzid (const gchar *tzid1, const gchar *tzid2)
 {
 	gboolean retval = TRUE;
 
@@ -103,10 +103,10 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp,
 				       icaltimezone *zone)
 {
 	ECalComponentDateTime start_datetime, end_datetime;
-	const char *tzid;
+	const gchar *tzid;
 	gboolean retval = FALSE;
 	icaltimezone *start_zone, *end_zone;
-	int offset1, offset2;
+	gint offset1, offset2;
 
 	tzid = icaltimezone_get_tzid (zone);
 
@@ -211,8 +211,8 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp,
 gboolean
 cal_comp_is_on_server (ECalComponent *comp, ECal *client)
 {
-	const char *uid;
-	char *rid = NULL;
+	const gchar *uid;
+	gchar *rid = NULL;
 	icalcomponent *icalcomp;
 	GError *error = NULL;
 
@@ -287,7 +287,7 @@ cal_comp_event_new_with_defaults (ECal *client)
 {
 	icalcomponent *icalcomp;
 	ECalComponent *comp;
-	int interval;
+	gint interval;
 	CalUnits units;
 	ECalComponentAlarm *alarm;
 	icalproperty *icalprop;
@@ -446,11 +446,11 @@ cal_comp_util_get_n_icons (ECalComponent *comp)
 
 	e_cal_component_get_categories_list (comp, &categories_list);
 	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
+		gchar *category;
 		GdkPixmap *pixmap = NULL;
 		GdkBitmap *mask = NULL;
 
-		category = (char *) elem->data;
+		category = (gchar *) elem->data;
 		if (e_categories_config_get_icon_for (category, &pixmap, &mask)) {
 			num_icons++;
 			g_object_unref (pixmap);
@@ -488,7 +488,7 @@ cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list)
 		const guint8 *c = p->data;
 
 		if (c)
-			g_byte_array_append (array, c, strlen ((const char *) c) + 1);
+			g_byte_array_append (array, c, strlen ((const gchar *) c) + 1);
 	}
 
 	gtk_selection_data_set (data, data->target, 8, array->data, array->len);
@@ -509,17 +509,17 @@ GSList *
 cal_comp_selection_get_string_list (GtkSelectionData *data)
 {
 	/* format is "str1\0str2\0...strN\0" */
-	char *inptr, *inend;
+	gchar *inptr, *inend;
 	GSList *list;
 
 	g_return_val_if_fail (data != NULL, NULL);
 
 	list = NULL;
-	inptr = (char *)data->data;
-	inend = (char *)(data->data + data->length);
+	inptr = (gchar *)data->data;
+	inend = (gchar *)(data->data + data->length);
 
 	while (inptr < inend) {
-		char *start = inptr;
+		gchar *start = inptr;
 
 		while (inptr < inend && *inptr)
 			inptr++;
@@ -533,7 +533,7 @@ cal_comp_selection_get_string_list (GtkSelectionData *data)
 }
 
 static void
-datetime_to_zone (ECal *client, ECalComponentDateTime *date, const char *tzid)
+datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid)
 {
 	icaltimezone *from, *to;
 
@@ -612,8 +612,8 @@ cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalCo
 static gboolean
 update_single_object (ECal *client, icalcomponent *icalcomp, gboolean fail_on_modify)
 {
-	const char *uid;
-	char *tmp;
+	const gchar *uid;
+	gchar *tmp;
 	icalcomponent *tmp_icalcomp;
 	gboolean res;
 
@@ -688,10 +688,10 @@ update_objects (ECal *client, icalcomponent *icalcomp)
  * @return Whether was the operation successful.
  **/
 gboolean
-cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list)
+cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const gchar *source_uid, ESourceList *source_list)
 {
-	const char * uid;
-	char *old_uid = NULL;
+	const gchar * uid;
+	gchar *old_uid = NULL;
 	icalcomponent *tmp_icalcomp = NULL;
 	GError *error = NULL;
 	gboolean success = FALSE;
@@ -703,7 +703,7 @@ cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDr
 
 	/* FIXME deal with GDK_ACTION_ASK */
 	if (action == GDK_ACTION_COPY) {
-		char *tmp;
+		gchar *tmp;
 
 		old_uid = g_strdup (icalcomponent_get_uid (comp));
 		tmp = e_cal_component_gen_uid ();
@@ -804,7 +804,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 	icalcomponent *icalcomp = NULL;
 	ECalComponentRange rid;
        	ECalComponentDateTime sdt;
-	const char *uid;
+	const gchar *uid;
 
 	/* Get the master component */
 	e_cal_component_get_uid (comp, &uid);
@@ -822,7 +822,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 
 	if (rid.datetime.value && sdt.value && icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0) {
 		ECalComponentDateTime msdt, medt, edt;
-		int *sequence;
+		gint *sequence;
 
 		e_cal_component_get_dtstart (master, &msdt);
 		e_cal_component_get_dtend (master, &medt);
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index 3faf9f49a8..f6090543a5 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -57,7 +57,7 @@ GSList *cal_comp_selection_get_string_list (GtkSelectionData *data);
 void cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
 void cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
 
-gboolean cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list);
+gboolean cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const gchar *source_uid, ESourceList *source_list);
 void comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client);
 
 #endif
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);
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index d60fab913e..32e5b4214a 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -380,11 +380,11 @@ e_alarm_list_get_path (GtkTreeModel *tree_model,
 }
 
 /* Builds a string for the duration of the alarm.  If the duration is zero, returns NULL. */
-static char *
+static gchar *
 get_alarm_duration_string (struct icaldurationtype *duration)
 {
 	GString *string = g_string_new (NULL);
-	char *ret;
+	gchar *ret;
 	gboolean have_something;
 
 	have_something = FALSE;
@@ -429,12 +429,12 @@ get_alarm_duration_string (struct icaldurationtype *duration)
 	}
 }
 
-static char *
+static gchar *
 get_alarm_string (ECalComponentAlarm *alarm)
 {
 	ECalComponentAlarmAction action;
 	ECalComponentAlarmTrigger trigger;
-	char *base, *str = NULL, *dur;
+	gchar *base, *str = NULL, *dur;
 
 	e_cal_component_alarm_get_action (alarm, &action);
 	e_cal_component_alarm_get_trigger (alarm, &trigger);
@@ -516,7 +516,7 @@ get_alarm_string (ECalComponentAlarm *alarm)
 		struct icaltimetype itt;
 		icaltimezone *utc_zone, *current_zone;
 		struct tm tm;
-		char buf[256];
+		gchar buf[256];
 
 		/* Absolute triggers come in UTC, so convert them to the local timezone */
 
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index a34fb77f7a..4340f9cdd8 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -59,7 +59,7 @@ cal_component_preview_on_url (GtkHTML *html,
                               const gchar *url)
 {
 #if 0
-	char *msg;
+	gchar *msg;
 	ECalComponentPreview *preview = data;
 
 	if (url && *url) {
@@ -72,7 +72,7 @@ cal_component_preview_on_url (GtkHTML *html,
 }
 
 /* Converts a time_t to a string, relative to the specified timezone */
-static char *
+static gchar *
 timet_to_str_with_zone (ECalComponentDateTime *dt,
                         ECal *ecal,
                         icaltimezone *default_zone)
@@ -80,7 +80,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
 	struct icaltimetype itt;
 	icaltimezone *zone;
         struct tm tm;
-        char buf[256];
+        gchar buf[256];
 
 	if (dt->tzid) {
 		/* If we can't find the zone, we'll guess its "local" */
@@ -118,8 +118,8 @@ cal_component_preview_write_html (GtkHTMLStream *stream,
 	icalcomponent *icalcomp;
 	icalproperty *icalprop;
 	icalproperty_status status;
-	const char *location;
-	int *priority_value;
+	const gchar *location;
+	gint *priority_value;
 
 	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
 
@@ -265,7 +265,7 @@ cal_component_preview_write_html (GtkHTMLStream *stream,
 		gtk_html_stream_printf (stream, "<TD><TT>");
 
 		for (node = list; node != NULL; node = node->next) {
-			char *html;
+			gchar *html;
 
 			text = * (ECalComponentText *) node->data;
 			html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0);
@@ -282,7 +282,7 @@ cal_component_preview_write_html (GtkHTMLStream *stream,
 	}
 
 	/* URL */
-	e_cal_component_get_url (comp, (const char **) &str);
+	e_cal_component_get_url (comp, (const gchar **) &str);
 	if (str) {
 		gtk_html_stream_printf (stream, "<TR><TD VALIGN=\"TOP\" ALIGN=\"RIGHT\"><B>%s</B></TD>", _("Web Page:"));
 		gtk_html_stream_printf (stream, "<TD><A HREF=\"%s\">%s</A></TD></TR>", str, str);
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 0397636d3e..053c3c8266 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -62,7 +62,7 @@ struct _ECalComponentPreviewClass {
 	GtkHTMLClass parent_class;
 
 	/* Notification signals */
-	void (* selection_changed) (ECalComponentPreview *preview, int n_selected);
+	void (* selection_changed) (ECalComponentPreview *preview, gint n_selected);
 };
 
 
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index fb1d6c28e7..33b6bc9c46 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -137,7 +137,7 @@ e_cal_config_get_type (void)
 }
 
 ECalConfig *
-e_cal_config_new (int type, const char *menuid)
+e_cal_config_new (gint type, const gchar *menuid)
 {
 	ECalConfig *ecp = g_object_new (e_cal_config_get_type(), NULL);
 	e_config_construct (&ecp->config, type, menuid);
@@ -180,7 +180,7 @@ static const EConfigHookTargetMap ecph_targets[] = {
 static void
 ecph_class_init (EPluginHookClass *klass)
 {
-	int i;
+	gint i;
 
 	klass->id = "org.gnome.evolution.calendar.config:1.0";
 
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 15ad617a3d..f9876e7adf 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -69,7 +69,7 @@ struct _ECalConfigTargetPrefs {
 typedef struct _EConfigItem ECalConfigItem;
 
 GType e_cal_config_get_type (void);
-ECalConfig *e_cal_config_new (int type, const char *menuid);
+ECalConfig *e_cal_config_new (gint type, const gchar *menuid);
 
 ECalConfigTargetSource *e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source);
 ECalConfigTargetPrefs *e_cal_config_target_new_prefs (ECalConfig *ecp, struct _GConfClient *gconf);
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index d84a9f968b..a05711a7f4 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -105,7 +105,7 @@ e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, gui
 
 /* ********************************************************************** */
 
-static void *eceh_parent_class;
+static gpointer eceh_parent_class;
 
 static const EEventHookTargetMask eceh_module_masks[] = {
 	{ "migration", E_CAL_EVENT_MODULE_MIGRATION },
@@ -126,7 +126,7 @@ eceh_finalize (GObject *o)
 static void
 eceh_class_init (EPluginHookClass *klass)
 {
-	int i;
+	gint i;
 
 	((GObjectClass *)klass)->finalize = eceh_finalize;
 	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.events:1.0";
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index a3ece9d66f..fc3e85ba34 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -242,9 +242,9 @@ setup_e_table (ECalListView *cal_list_view)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Public"));
-	strings = g_list_append (strings, (char*) _("Private"));
-	strings = g_list_append (strings, (char*) _("Confidential"));
+	strings = g_list_append (strings, (gchar *) _("Public"));
+	strings = g_list_append (strings, (gchar *) _("Private"));
+	strings = g_list_append (strings, (gchar *) _("Confidential"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
index b1f5ed91ca..30d287ff6b 100644
--- a/calendar/gui/e-cal-menu.c
+++ b/calendar/gui/e-cal-menu.c
@@ -33,7 +33,7 @@
 #include "gui/e-cal-model.h"
 #include "itip-utils.h"
 
-static void ecalm_standard_menu_factory(EMenu *emp, void *data);
+static void ecalm_standard_menu_factory(EMenu *emp, gpointer data);
 
 static GObjectClass *ecalm_parent;
 
@@ -55,7 +55,7 @@ ecalm_target_free(EMenu *ep, EMenuTarget *t)
 	switch (t->type) {
 	case E_CAL_MENU_TARGET_SELECT: {
 		ECalMenuTargetSelect *s = (ECalMenuTargetSelect *)t;
-		int i;
+		gint i;
 
 		for (i=0;i<s->events->len;i++)
 			e_cal_model_free_component_data(s->events->pdata[i]);
@@ -97,7 +97,7 @@ e_cal_menu_get_type(void)
 	return type;
 }
 
-ECalMenu *e_cal_menu_new(const char *menuid)
+ECalMenu *e_cal_menu_new(const gchar *menuid)
 {
 	ECalMenu *emp = g_object_new(e_cal_menu_get_type(), NULL);
 
@@ -194,7 +194,7 @@ e_cal_menu_target_new_select(ECalMenu *eabp, struct _ECalModel *model, GPtrArray
 }
 
 static void
-ecalm_standard_menu_factory(EMenu *emp, void *data)
+ecalm_standard_menu_factory(EMenu *emp, gpointer data)
 {
 	/* noop */
 }
@@ -227,7 +227,7 @@ ecalm_standard_menu_factory(EMenu *emp, void *data)
 
 */
 
-static void *ecalph_parent_class;
+static gpointer ecalph_parent_class;
 #define ecalph ((ECalMenuHook *)eph)
 
 static const EMenuHookTargetMask ecalph_select_masks[] = {
@@ -262,7 +262,7 @@ ecalph_finalise(GObject *o)
 static void
 ecalph_class_init(EPluginHookClass *klass)
 {
-	int i;
+	gint i;
 
 	((GObjectClass *)klass)->finalize = ecalph_finalise;
 	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.bonobomenu:1.0";
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index 5dda63f227..f1d9f4b729 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -100,7 +100,7 @@ struct _ECalMenuClass {
 
 GType e_cal_menu_get_type(void);
 
-ECalMenu *e_cal_menu_new(const char *menuid);
+ECalMenu *e_cal_menu_new(const gchar *menuid);
 
 ECalMenuTargetSelect *e_cal_menu_target_new_select(ECalMenu *emp, struct _ECalModel *model, GPtrArray *events);
 
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index dac641ab4c..25bb9364d3 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -40,15 +40,15 @@ struct _ECalModelCalendarPrivate {
 };
 
 static void e_cal_model_calendar_finalize (GObject *object);
-static int ecmc_column_count (ETableModel *etm);
-static void *ecmc_value_at (ETableModel *etm, int col, int row);
-static void ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecmc_is_cell_editable (ETableModel *etm, int col, int row);
-static void *ecmc_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecmc_free_value (ETableModel *etm, int col, void *value);
-static void *ecmc_initialize_value (ETableModel *etm, int col);
-static gboolean ecmc_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecmc_value_to_string (ETableModel *etm, int col, const void *value);
+static gint ecmc_column_count (ETableModel *etm);
+static gpointer ecmc_value_at (ETableModel *etm, gint col, gint row);
+static void ecmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value);
+static gboolean ecmc_is_cell_editable (ETableModel *etm, gint col, gint row);
+static gpointer ecmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value);
+static void ecmc_free_value (ETableModel *etm, gint col, gpointer value);
+static gpointer ecmc_initialize_value (ETableModel *etm, gint col);
+static gboolean ecmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value);
+static gchar *ecmc_value_to_string (ETableModel *etm, gint col, gconstpointer value);
 
 static void ecmc_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
@@ -160,19 +160,19 @@ get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data)
 	return comp_data->dtend;
 }
 
-static void *
+static gpointer
 get_location (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_LOCATION_PROPERTY);
 	if (prop)
-		return (void *) icalproperty_get_location (prop);
+		return (gpointer) icalproperty_get_location (prop);
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
-static void *
+static gpointer
 get_transparency (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -193,8 +193,8 @@ get_transparency (ECalModelComponent *comp_data)
 	return NULL;
 }
 
-static void *
-ecmc_value_at (ETableModel *etm, int col, int row)
+static gpointer
+ecmc_value_at (ETableModel *etm, gint col, gint row)
 {
 	ECalModelComponent *comp_data;
 	ECalModelCalendar *model = (ECalModelCalendar *) etm;
@@ -209,7 +209,7 @@ ecmc_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return (void *) "";
+		return (gpointer) "";
 
 	switch (col) {
 	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
@@ -220,16 +220,16 @@ ecmc_value_at (ETableModel *etm, int col, int row)
 		return get_transparency (comp_data);
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static void
-set_dtend (ECalModelComponent *comp_data, const void *value)
+set_dtend (ECalModelComponent *comp_data, gconstpointer value)
 {
 	ECellDateEditValue *dv = (ECellDateEditValue *) value;
 	icalproperty *prop;
 	icalparameter *param;
-	const char *tzid;
+	const gchar *tzid;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY);
 	if (prop)
@@ -265,9 +265,9 @@ set_dtend (ECalModelComponent *comp_data, const void *value)
 	/* If the TZID is set to "UTC", we don't want to save the TZID. */
 	if (tzid && strcmp (tzid, "UTC")) {
 		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
+			icalparameter_set_tzid (param, (gchar *) tzid);
 		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
+			param = icalparameter_new_tzid ((gchar *) tzid);
 			icalproperty_add_parameter (prop, param);
 		}
 	} else if (param) {
@@ -276,7 +276,7 @@ set_dtend (ECalModelComponent *comp_data, const void *value)
 }
 
 static void
-set_location (ECalModelComponent *comp_data, const void *value)
+set_location (ECalModelComponent *comp_data, gconstpointer value)
 {
 	icalproperty *prop;
 
@@ -289,16 +289,16 @@ set_location (ECalModelComponent *comp_data, const void *value)
 		}
 	} else {
 		if (prop)
-			icalproperty_set_location (prop, (const char *) value);
+			icalproperty_set_location (prop, (const gchar *) value);
 		else {
-			prop = icalproperty_new_location ((const char *) value);
+			prop = icalproperty_new_location ((const gchar *) value);
 			icalcomponent_add_property (comp_data->icalcomp, prop);
 		}
 	}
 }
 
 static void
-set_transparency (ECalModelComponent *comp_data, const void *value)
+set_transparency (ECalModelComponent *comp_data, gconstpointer value)
 {
 	icalproperty *prop;
 
@@ -335,7 +335,7 @@ set_transparency (ECalModelComponent *comp_data, const void *value)
 }
 
 static void
-ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
+ecmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
 	ECalModelComponent *comp_data;
 	CalObjModType mod = CALOBJ_MOD_ALL;
@@ -391,7 +391,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
 			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (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 (comp, &uid);
 				if (e_cal_get_object (comp_data->client, uid, NULL, &icalcomp, NULL) && icalcomp) {
@@ -420,7 +420,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
 }
 
 static gboolean
-ecmc_is_cell_editable (ETableModel *etm, int col, int row)
+ecmc_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
 	ECalModelCalendar *model = (ECalModelCalendar *) etm;
 
@@ -444,8 +444,8 @@ ecmc_is_cell_editable (ETableModel *etm, int col, int row)
 	return FALSE;
 }
 
-static void *
-ecmc_duplicate_value (ETableModel *etm, int col, const void *value)
+static gpointer
+ecmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
 
@@ -473,7 +473,7 @@ ecmc_duplicate_value (ETableModel *etm, int col, const void *value)
 }
 
 static void
-ecmc_free_value (ETableModel *etm, int col, void *value)
+ecmc_free_value (ETableModel *etm, gint col, gpointer value)
 {
 	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST);
 
@@ -492,8 +492,8 @@ ecmc_free_value (ETableModel *etm, int col, void *value)
 	}
 }
 
-static void *
-ecmc_initialize_value (ETableModel *etm, int col)
+static gpointer
+ecmc_initialize_value (ETableModel *etm, gint col)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
 
@@ -512,7 +512,7 @@ ecmc_initialize_value (ETableModel *etm, int col)
 }
 
 static gboolean
-ecmc_value_is_empty (ETableModel *etm, int col, const void *value)
+ecmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, TRUE);
 
@@ -530,8 +530,8 @@ ecmc_value_is_empty (ETableModel *etm, int col, const void *value)
 	return TRUE;
 }
 
-static char *
-ecmc_value_to_string (ETableModel *etm, int col, const void *value)
+static gchar *
+ecmc_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, g_strdup (""));
 
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 815d8d7ee6..7f05fbee47 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -36,20 +36,20 @@
 #define d(x) (x)
 
 struct _ECalModelMemosPrivate {
-	int dummy;
+	gint dummy;
 };
 
 static void e_cal_model_memos_finalize (GObject *object);
 
-static int ecmm_column_count (ETableModel *etm);
-static void *ecmm_value_at (ETableModel *etm, int col, int row);
-static void ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecmm_is_cell_editable (ETableModel *etm, int col, int row);
-static void *ecmm_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecmm_free_value (ETableModel *etm, int col, void *value);
-static void *ecmm_initialize_value (ETableModel *etm, int col);
-static gboolean ecmm_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecmm_value_to_string (ETableModel *etm, int col, const void *value);
+static gint ecmm_column_count (ETableModel *etm);
+static gpointer ecmm_value_at (ETableModel *etm, gint col, gint row);
+static void ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value);
+static gboolean ecmm_is_cell_editable (ETableModel *etm, gint col, gint row);
+static gpointer ecmm_duplicate_value (ETableModel *etm, gint col, gconstpointer value);
+static void ecmm_free_value (ETableModel *etm, gint col, gpointer value);
+static gpointer ecmm_initialize_value (ETableModel *etm, gint col);
+static gboolean ecmm_value_is_empty (ETableModel *etm, gint col, gconstpointer value);
+static gchar *ecmm_value_to_string (ETableModel *etm, gint col, gconstpointer value);
 
 static void ecmm_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
@@ -114,8 +114,8 @@ ecmm_column_count (ETableModel *etm)
 	return E_CAL_MODEL_MEMOS_FIELD_LAST;
 }
 
-static void *
-ecmm_value_at (ETableModel *etm, int col, int row)
+static gpointer
+ecmm_value_at (ETableModel *etm, gint col, gint row)
 {
 	ECalModelComponent *comp_data;
 	ECalModelMemos *model = (ECalModelMemos *) etm;
@@ -130,14 +130,14 @@ ecmm_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return (void *) "";
+		return (gpointer) "";
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 
 static void
-ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value)
+ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
 	ECalModelComponent *comp_data;
 	ECalModelMemos *model = (ECalModelMemos *) etm;
@@ -166,7 +166,7 @@ ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value)
 }
 
 static gboolean
-ecmm_is_cell_editable (ETableModel *etm, int col, int row)
+ecmm_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
 	ECalModelMemos *model = (ECalModelMemos *) etm;
 	gboolean retval = FALSE;
@@ -184,8 +184,8 @@ ecmm_is_cell_editable (ETableModel *etm, int col, int row)
 	return retval;
 }
 
-static void *
-ecmm_duplicate_value (ETableModel *etm, int col, const void *value)
+static gpointer
+ecmm_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, NULL);
 
@@ -196,7 +196,7 @@ ecmm_duplicate_value (ETableModel *etm, int col, const void *value)
 }
 
 static void
-ecmm_free_value (ETableModel *etm, int col, void *value)
+ecmm_free_value (ETableModel *etm, gint col, gpointer value)
 {
 	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST);
 
@@ -206,8 +206,8 @@ ecmm_free_value (ETableModel *etm, int col, void *value)
 	}
 }
 
-static void *
-ecmm_initialize_value (ETableModel *etm, int col)
+static gpointer
+ecmm_initialize_value (ETableModel *etm, gint col)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, NULL);
 
@@ -218,7 +218,7 @@ ecmm_initialize_value (ETableModel *etm, int col)
 }
 
 static gboolean
-ecmm_value_is_empty (ETableModel *etm, int col, const void *value)
+ecmm_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, TRUE);
 
@@ -228,8 +228,8 @@ ecmm_value_is_empty (ETableModel *etm, int col, const void *value)
 	return TRUE;
 }
 
-static char *
-ecmm_value_to_string (ETableModel *etm, int col, const void *value)
+static gchar *
+ecmm_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, g_strdup (""));
 
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index d66555a636..cc1ff58f67 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -42,17 +42,17 @@ struct _ECalModelTasksPrivate {
 
 static void e_cal_model_tasks_finalize (GObject *object);
 
-static int ecmt_column_count (ETableModel *etm);
-static void *ecmt_value_at (ETableModel *etm, int col, int row);
-static void ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecmt_is_cell_editable (ETableModel *etm, int col, int row);
-static void *ecmt_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecmt_free_value (ETableModel *etm, int col, void *value);
-static void *ecmt_initialize_value (ETableModel *etm, int col);
-static gboolean ecmt_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecmt_value_to_string (ETableModel *etm, int col, const void *value);
-
-static const char *ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
+static gint ecmt_column_count (ETableModel *etm);
+static gpointer ecmt_value_at (ETableModel *etm, gint col, gint row);
+static void ecmt_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value);
+static gboolean ecmt_is_cell_editable (ETableModel *etm, gint col, gint row);
+static gpointer ecmt_duplicate_value (ETableModel *etm, gint col, gconstpointer value);
+static void ecmt_free_value (ETableModel *etm, gint col, gpointer value);
+static gpointer ecmt_initialize_value (ETableModel *etm, gint col);
+static gboolean ecmt_value_is_empty (ETableModel *etm, gint col, gconstpointer value);
+static gchar *ecmt_value_to_string (ETableModel *etm, gint col, gconstpointer value);
+
+static const gchar *ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
 static void ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
 static void commit_component_changes (ECalModelComponent *comp_data);
@@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data)
 	return comp_data->due;
 }
 
-static void *
+static gpointer
 get_geo (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data)
 		return buf;
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static int
@@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data)
 	return 0;
 }
 
-static void *
+static gpointer
 get_priority (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -331,7 +331,7 @@ get_priority (ECalModelComponent *comp_data)
 	if (prop)
 		return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static gboolean
@@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data)
 	return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED;
 }
 
-static void *
+static gpointer
 get_status (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -353,33 +353,33 @@ get_status (ECalModelComponent *comp_data)
 	if (prop) {
 		switch (icalproperty_get_status (prop)) {
 		case ICAL_STATUS_NONE:
-			return (void *) "";
+			return (gpointer) "";
 		case ICAL_STATUS_NEEDSACTION:
-			return (void *) _("Not Started");
+			return (gpointer) _("Not Started");
 		case ICAL_STATUS_INPROCESS:
-			return (void *) _("In Progress");
+			return (gpointer) _("In Progress");
 		case ICAL_STATUS_COMPLETED:
-			return (void *) _("Completed");
+			return (gpointer) _("Completed");
 		case ICAL_STATUS_CANCELLED:
-			return (void *) _("Canceled");
+			return (gpointer) _("Canceled");
 		default:
-			return (void *) "";
+			return (gpointer) "";
 		}
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
-static void *
+static gpointer
 get_url (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
 	if (prop)
-		return (void *) icalproperty_get_url (prop);
+		return (gpointer) icalproperty_get_url (prop);
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static gboolean
@@ -431,7 +431,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 		/* Third, are we overdue as of right now? */
 		due_tt = icalproperty_get_due (prop);
 		if (due_tt.is_date) {
-			int cmp;
+			gint cmp;
 
 			now_tt = icaltime_current_time_with_zone (e_cal_model_get_timezone (E_CAL_MODEL (model)));
 			cmp = icaltime_compare_date_only (due_tt, now_tt);
@@ -444,7 +444,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 				return E_CAL_MODEL_TASKS_DUE_FUTURE;
 		} else {
 			icalparameter *param;
-			const char *tzid;
+			const gchar *tzid;
 
 			if(!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER)))
 				return E_CAL_MODEL_TASKS_DUE_FUTURE;
@@ -483,8 +483,8 @@ is_overdue (ECalModelTasks *model, ECalModelComponent *comp_data)
 	return FALSE;
 }
 
-static void *
-ecmt_value_at (ETableModel *etm, int col, int row)
+static gpointer
+ecmt_value_at (ETableModel *etm, gint col, gint row)
 {
 	ECalModelComponent *comp_data;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
@@ -499,7 +499,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return (void *) "";
+		return (gpointer) "";
 
 	switch (col) {
 	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
@@ -524,11 +524,11 @@ ecmt_value_at (ETableModel *etm, int col, int row)
 		return get_url (comp_data);
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static void
-set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, const void *value)
+set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, gconstpointer value)
 {
 	ECellDateEditValue *dv = (ECellDateEditValue *) value;
 
@@ -553,7 +553,7 @@ set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, const void
 }
 
 static void
-set_complete (ECalModelComponent *comp_data, const void *value)
+set_complete (ECalModelComponent *comp_data, gconstpointer value)
 {
 	gint state = GPOINTER_TO_INT (value);
 
@@ -564,12 +564,12 @@ set_complete (ECalModelComponent *comp_data, const void *value)
 }
 
 static void
-set_due (ECalModelComponent *comp_data, const void *value)
+set_due (ECalModelComponent *comp_data, gconstpointer value)
 {
 	ECellDateEditValue *dv = (ECellDateEditValue *) value;
 	icalproperty *prop;
 	icalparameter *param;
-	const char *tzid;
+	const gchar *tzid;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DUE_PROPERTY);
 	if (prop)
@@ -605,9 +605,9 @@ set_due (ECalModelComponent *comp_data, const void *value)
 	/* If the TZID is set to "UTC", we don't want to save the TZID. */
 	if (tzid && strcmp (tzid, "UTC")) {
 		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
+			icalparameter_set_tzid (param, (gchar *) tzid);
 		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
+			param = icalparameter_new_tzid ((gchar *) tzid);
 			icalproperty_add_parameter (prop, param);
 		}
 	} else if (param) {
@@ -630,10 +630,10 @@ show_geo_warning (void)
 }
 
 static void
-set_geo (ECalModelComponent *comp_data, const char *value)
+set_geo (ECalModelComponent *comp_data, const gchar *value)
 {
 	double latitude, longitude;
-	int matched;
+	gint matched;
 	struct icalgeotype geo;
 	icalproperty *prop;
 
@@ -662,7 +662,7 @@ set_geo (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_status (ECalModelComponent *comp_data, const char *value)
+set_status (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty_status status;
 	icalproperty *prop;
@@ -716,7 +716,7 @@ set_status (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_percent (ECalModelComponent *comp_data, const void *value)
+set_percent (ECalModelComponent *comp_data, gconstpointer value)
 {
 	icalproperty *prop;
 	gint percent = GPOINTER_TO_INT (value);
@@ -758,10 +758,10 @@ set_percent (ECalModelComponent *comp_data, const void *value)
 }
 
 static void
-set_priority (ECalModelComponent *comp_data, const char *value)
+set_priority (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
-	int priority;
+	gint priority;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY);
 
@@ -780,7 +780,7 @@ set_priority (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_url (ECalModelComponent *comp_data, const char *value)
+set_url (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
 
@@ -802,7 +802,7 @@ set_url (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value)
+ecmt_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
 	ECalModelComponent *comp_data;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
@@ -852,7 +852,7 @@ ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value)
 }
 
 static gboolean
-ecmt_is_cell_editable (ETableModel *etm, int col, int row)
+ecmt_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
@@ -882,8 +882,8 @@ ecmt_is_cell_editable (ETableModel *etm, int col, int row)
 	return FALSE;
 }
 
-static void *
-ecmt_duplicate_value (ETableModel *etm, int col, const void *value)
+static gpointer
+ecmt_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL);
 
@@ -912,14 +912,14 @@ ecmt_duplicate_value (ETableModel *etm, int col, const void *value)
 	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
 	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
 	case E_CAL_MODEL_TASKS_FIELD_OVERDUE :
-		return (void *) value;
+		return (gpointer) value;
 	}
 
 	return NULL;
 }
 
 static void
-ecmt_free_value (ETableModel *etm, int col, void *value)
+ecmt_free_value (ETableModel *etm, gint col, gpointer value)
 {
 	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST);
 
@@ -945,8 +945,8 @@ ecmt_free_value (ETableModel *etm, int col, void *value)
 	}
 }
 
-static void *
-ecmt_initialize_value (ETableModel *etm, int col)
+static gpointer
+ecmt_initialize_value (ETableModel *etm, gint col)
 {
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
@@ -975,7 +975,7 @@ ecmt_initialize_value (ETableModel *etm, int col)
 }
 
 static gboolean
-ecmt_value_is_empty (ETableModel *etm, int col, const void *value)
+ecmt_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
@@ -1004,8 +1004,8 @@ ecmt_value_is_empty (ETableModel *etm, int col, const void *value)
 	return TRUE;
 }
 
-static char *
-ecmt_value_to_string (ETableModel *etm, int col, const void *value)
+static gchar *
+ecmt_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
@@ -1039,7 +1039,7 @@ ecmt_value_to_string (ETableModel *etm, int col, const void *value)
 
 /* ECalModel class methods */
 
-static const char *
+static const gchar *
 ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
 {
 	static gchar color_spec[16];
@@ -1077,7 +1077,7 @@ static void
 ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 				ETableModel *source_model, gint row)
 {
-	void *value;
+	gpointer value;
 
 	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
 	g_return_if_fail (comp_data != NULL);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index f88418b6a8..d99efd6cb3 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -90,19 +90,19 @@ struct _ECalModelPrivate {
 static void e_cal_model_dispose (GObject *object);
 static void e_cal_model_finalize (GObject *object);
 
-static int ecm_column_count (ETableModel *etm);
-static int ecm_row_count (ETableModel *etm);
-static void *ecm_value_at (ETableModel *etm, int col, int row);
-static void ecm_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean ecm_is_cell_editable (ETableModel *etm, int col, int row);
-static void ecm_append_row (ETableModel *etm, ETableModel *source, int row);
-static void *ecm_duplicate_value (ETableModel *etm, int col, const void *value);
-static void ecm_free_value (ETableModel *etm, int col, void *value);
-static void *ecm_initialize_value (ETableModel *etm, int col);
-static gboolean ecm_value_is_empty (ETableModel *etm, int col, const void *value);
-static char *ecm_value_to_string (ETableModel *etm, int col, const void *value);
-
-static const char *ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
+static gint ecm_column_count (ETableModel *etm);
+static gint ecm_row_count (ETableModel *etm);
+static gpointer ecm_value_at (ETableModel *etm, gint col, gint row);
+static void ecm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value);
+static gboolean ecm_is_cell_editable (ETableModel *etm, gint col, gint row);
+static void ecm_append_row (ETableModel *etm, ETableModel *source, gint row);
+static gpointer ecm_duplicate_value (ETableModel *etm, gint col, gconstpointer value);
+static void ecm_free_value (ETableModel *etm, gint col, gpointer value);
+static gpointer ecm_initialize_value (ETableModel *etm, gint col);
+static gboolean ecm_value_is_empty (ETableModel *etm, gint col, gconstpointer value);
+static gchar *ecm_value_to_string (ETableModel *etm, gint col, gconstpointer value);
+
+static const gchar *ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data);
 
 static ECalModelClient *add_new_client (ECalModel *model, ECal *client, gboolean do_query);
 static ECalModelClient *find_client_data (ECalModel *model, ECal *client);
@@ -317,19 +317,19 @@ ecm_row_count (ETableModel *etm)
 	return priv->objects->len;
 }
 
-static void *
+static gpointer
 get_categories (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY);
 	if (prop)
-		return (void *) icalproperty_get_categories (prop);
+		return (gpointer) icalproperty_get_categories (prop);
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
-static char *
+static gchar *
 get_classification (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -355,7 +355,7 @@ get_classification (ECalModelComponent *comp_data)
 	}
 }
 
-static const char *
+static const gchar *
 get_color (ECalModel *model, ECalModelComponent *comp_data)
 {
 	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
@@ -363,7 +363,7 @@ get_color (ECalModel *model, ECalModelComponent *comp_data)
 	return e_cal_model_get_color_for_component (model, comp_data);
 }
 
-static void *
+static gpointer
 get_description (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -384,7 +384,7 @@ get_description (ECalModelComponent *comp_data)
 		return str->str;
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static ECellDateEditValue*
@@ -472,26 +472,26 @@ get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalprop
 	return res;
 }
 
-static void *
+static gpointer
 get_summary (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
 	if (prop)
-		return (void *) icalproperty_get_summary (prop);
+		return (gpointer) icalproperty_get_summary (prop);
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
-static char *
+static gchar *
 get_uid (ECalModelComponent *comp_data)
 {
-	return (char *) icalcomponent_get_uid (comp_data->icalcomp);
+	return (gchar *) icalcomponent_get_uid (comp_data->icalcomp);
 }
 
-static void *
-ecm_value_at (ETableModel *etm, int col, int row)
+static gpointer
+ecm_value_at (ETableModel *etm, gint col, gint row)
 {
 	ECalModelPrivate *priv;
 	ECalModelComponent *comp_data;
@@ -514,17 +514,17 @@ ecm_value_at (ETableModel *etm, int col, int row)
 	case E_CAL_MODEL_FIELD_CLASSIFICATION :
 		return get_classification (comp_data);
 	case E_CAL_MODEL_FIELD_COLOR :
-		return (void *) get_color (model, comp_data);
+		return (gpointer) get_color (model, comp_data);
 	case E_CAL_MODEL_FIELD_COMPONENT :
 		return comp_data->icalcomp;
 	case E_CAL_MODEL_FIELD_DESCRIPTION :
 		return get_description (comp_data);
 	case E_CAL_MODEL_FIELD_DTSTART :
-		return (void *) get_dtstart (model, comp_data);
+		return (gpointer) get_dtstart (model, comp_data);
 	case E_CAL_MODEL_FIELD_CREATED :
-		return (void *) get_datetime_from_utc (model, comp_data, ICAL_CREATED_PROPERTY, icalproperty_get_created, &comp_data->created);
+		return (gpointer) get_datetime_from_utc (model, comp_data, ICAL_CREATED_PROPERTY, icalproperty_get_created, &comp_data->created);
 	case E_CAL_MODEL_FIELD_LASTMODIFIED :
-		return (void *) get_datetime_from_utc (model, comp_data, ICAL_LASTMODIFIED_PROPERTY, icalproperty_get_lastmodified, &comp_data->lastmodified);
+		return (gpointer) get_datetime_from_utc (model, comp_data, ICAL_LASTMODIFIED_PROPERTY, icalproperty_get_lastmodified, &comp_data->lastmodified);
 	case E_CAL_MODEL_FIELD_HAS_ALARMS :
 		return GINT_TO_POINTER ((icalcomponent_get_first_component (comp_data->icalcomp,
 									    ICAL_VALARM_COMPONENT) != NULL));
@@ -552,7 +552,7 @@ ecm_value_at (ETableModel *etm, int col, int row)
 				e_cal_component_get_attendee_list (comp, &attendees);
 				for (sl = attendees; sl != NULL; sl = sl->next) {
 					ECalComponentAttendee *ca = sl->data;
-					const char *text;
+					const gchar *text;
 
 					text = itip_strip_mailto (ca->value);
 					if (e_account_list_find (priv->accounts, E_ACCOUNT_FIND_ID_ADDRESS, text) != NULL) {
@@ -579,11 +579,11 @@ ecm_value_at (ETableModel *etm, int col, int row)
 		return get_uid (comp_data);
 	}
 
-	return (void *) "";
+	return (gpointer) "";
 }
 
 static void
-set_categories (ECalModelComponent *comp_data, const char *value)
+set_categories (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
 
@@ -603,7 +603,7 @@ set_categories (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_classification (ECalModelComponent *comp_data, const char *value)
+set_classification (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
 
@@ -634,7 +634,7 @@ set_classification (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_description (ECalModelComponent *comp_data, const char *value)
+set_description (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
 
@@ -660,12 +660,12 @@ set_description (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value)
+set_dtstart (ECalModel *model, ECalModelComponent *comp_data, gconstpointer value)
 {
 	ECellDateEditValue *dv = (ECellDateEditValue *) value;
 	icalproperty *prop;
 	icalparameter *param;
-	const char *tzid;
+	const gchar *tzid;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
 	if (prop)
@@ -701,9 +701,9 @@ set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value)
 	/* If the TZID is set to "UTC", we don't want to save the TZID. */
 	if (tzid && strcmp (tzid, "UTC")) {
 		if (param) {
-			icalparameter_set_tzid (param, (char *) tzid);
+			icalparameter_set_tzid (param, (gchar *) tzid);
 		} else {
-			param = icalparameter_new_tzid ((char *) tzid);
+			param = icalparameter_new_tzid ((gchar *) tzid);
 			icalproperty_add_parameter (prop, param);
 		}
 	} else if (param) {
@@ -712,7 +712,7 @@ set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value)
 }
 
 static void
-set_summary (ECalModelComponent *comp_data, const char *value)
+set_summary (ECalModelComponent *comp_data, const gchar *value)
 {
 	icalproperty *prop;
 
@@ -734,7 +734,7 @@ set_summary (ECalModelComponent *comp_data, const char *value)
 }
 
 static void
-ecm_set_value_at (ETableModel *etm, int col, int row, const void *value)
+ecm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
 	ECalModelPrivate *priv;
 	ECalModelComponent *comp_data;
@@ -785,7 +785,7 @@ ecm_set_value_at (ETableModel *etm, int col, int row, const void *value)
  * @return Whether row is editable or not.
  **/
 gboolean
-e_cal_model_test_row_editable (ECalModel *model, int row)
+e_cal_model_test_row_editable (ECalModel *model, gint row)
 {
 	gboolean readonly;
 	ECal *cal = NULL;
@@ -812,7 +812,7 @@ e_cal_model_test_row_editable (ECalModel *model, int row)
 }
 
 static gboolean
-ecm_is_cell_editable (ETableModel *etm, int col, int row)
+ecm_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
 	ECalModelPrivate *priv;
 	ECalModel *model = (ECalModel *) etm;
@@ -840,7 +840,7 @@ ecm_is_cell_editable (ETableModel *etm, int col, int row)
 }
 
 static void
-ecm_append_row (ETableModel *etm, ETableModel *source, int row)
+ecm_append_row (ETableModel *etm, ETableModel *source, gint row)
 {
 	ECalModelClass *model_class;
 	ECalModelComponent comp_data;
@@ -901,8 +901,8 @@ ecm_append_row (ETableModel *etm, ETableModel *source, int row)
 	g_signal_emit (G_OBJECT (model), signals[ROW_APPENDED], 0);
 }
 
-static void *
-ecm_duplicate_value (ETableModel *etm, int col, const void *value)
+static gpointer
+ecm_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, NULL);
 
@@ -915,7 +915,7 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value)
 	case E_CAL_MODEL_FIELD_HAS_ALARMS :
 	case E_CAL_MODEL_FIELD_ICON :
 	case E_CAL_MODEL_FIELD_COLOR :
-		return (void *) value;
+		return (gpointer) value;
 	case E_CAL_MODEL_FIELD_COMPONENT :
 		return icalcomponent_new_clone ((icalcomponent *) value);
 	case E_CAL_MODEL_FIELD_DTSTART :
@@ -937,7 +937,7 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value)
 }
 
 static void
-ecm_free_value (ETableModel *etm, int col, void *value)
+ecm_free_value (ETableModel *etm, gint col, gpointer value)
 {
 	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST);
 
@@ -966,8 +966,8 @@ ecm_free_value (ETableModel *etm, int col, void *value)
 	}
 }
 
-static void *
-ecm_initialize_value (ETableModel *etm, int col)
+static gpointer
+ecm_initialize_value (ETableModel *etm, gint col)
 {
 	ECalModelPrivate *priv;
 	ECalModel *model = (ECalModel *) etm;
@@ -998,7 +998,7 @@ ecm_initialize_value (ETableModel *etm, int col)
 }
 
 static gboolean
-ecm_value_is_empty (ETableModel *etm, int col, const void *value)
+ecm_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
 	ECalModelPrivate *priv;
 	ECalModel *model = (ECalModel *) etm;
@@ -1038,8 +1038,8 @@ ecm_value_is_empty (ETableModel *etm, int col, const void *value)
 	return TRUE;
 }
 
-static char *
-ecm_value_to_string (ETableModel *etm, int col, const void *value)
+static gchar *
+ecm_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, g_strdup (""));
 
@@ -1077,7 +1077,7 @@ typedef struct {
 	GList *uris;
 } AssignedColorData;
 
-static const char *
+static const gchar *
 ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
 {
 	ESource *source;
@@ -1115,7 +1115,7 @@ ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
 		}
 
 		for (l = assigned_colors[i].uris; l != NULL; l = l->next) {
-			if (!strcmp ((const char *) l->data,
+			if (!strcmp ((const gchar *) l->data,
 				     e_cal_get_uri (comp_data->client)))
 			{
 				return assigned_colors[i].color;
@@ -1341,7 +1341,7 @@ e_cal_model_get_client_list (ECalModel *model)
  * @uri: Uri for the client to get.
  */
 ECal *
-e_cal_model_get_client_for_uri (ECalModel *model, const char *uri)
+e_cal_model_get_client_for_uri (ECalModel *model, const gchar *uri)
 {
 	GList *l;
 
@@ -1385,8 +1385,8 @@ search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalCompone
 		ECalModelComponent *comp_data = g_ptr_array_index (priv->objects, i);
 
 		if (comp_data) {
-			const char *uid;
-			char *rid = NULL;
+			const gchar *uid;
+			gchar *rid = NULL;
 			struct icaltimetype icalrid;
 			gboolean has_rid = (id->rid && *id->rid);
 
@@ -1518,7 +1518,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 		/* remove the components if they are already present and re-add them */
 		while ((comp_data = search_by_id_and_client (priv, client,
 							      id))) {
-			int pos;
+			gint pos;
 			GSList *list = NULL;
 
 			pos = get_position_in_array (priv->objects, comp_data);
@@ -1579,7 +1579,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 		if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
 			list = g_list_prepend (list, l->data);
 		else {
-			int pos;
+			gint pos;
 			ECalModelComponent *comp_data;
 			ECalComponentId *id;
 			ECalComponent *comp = e_cal_component_new ();
@@ -1660,7 +1660,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 	for (l = ids; l; l = l->next) {
 		ECalModelComponent *comp_data = NULL;
 		ECalComponentId *id = l->data;
-		int pos;
+		gint pos;
 
 		/* make sure we remove all objects with this UID */
 		while ((comp_data = search_by_id_and_client (priv, e_cal_view_get_client (query), id))) {
@@ -1687,7 +1687,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 }
 
 static void
-e_cal_view_progress_cb (ECalView *query, const char *message, int percent, gpointer user_data)
+e_cal_view_progress_cb (ECalView *query, const gchar *message, gint percent, gpointer user_data)
 {
 	ECalModel *model = (ECalModel *) user_data;
 	ECal *client = e_cal_view_get_client (query);
@@ -1861,7 +1861,7 @@ e_cal_model_add_client (ECalModel *model, ECal *client)
 static void
 remove_client_objects (ECalModel *model, ECalModelClient *client_data)
 {
-	int i;
+	gint i;
 
 	/* remove all objects belonging to this client */
 	for (i = model->priv->objects->len; i > 0; i--) {
@@ -1981,7 +1981,7 @@ redo_queries (ECalModel *model)
 	ECalModelPrivate *priv;
 	GList *l;
 	GSList *slist;
-	int len;
+	gint len;
 
 	priv = model->priv;
 
@@ -1989,7 +1989,7 @@ redo_queries (ECalModel *model)
 		g_free (priv->full_sexp);
 
 	if (priv->start != -1 && priv->end != -1) {
-		char *iso_start, *iso_end;
+		gchar *iso_start, *iso_end;
 
 		iso_start = isodate_from_time_t (priv->start);
 		iso_end = isodate_from_time_t (priv->end);
@@ -2068,7 +2068,7 @@ e_cal_model_set_time_range (ECalModel *model, time_t start, time_t end)
 	redo_queries (model);
 }
 
-const char *
+const gchar *
 e_cal_model_get_search_query (ECalModel *model)
 {
 	ECalModelPrivate *priv;
@@ -2085,7 +2085,7 @@ e_cal_model_get_search_query (ECalModel *model)
  * e_cal_model_set_query
  */
 void
-e_cal_model_set_search_query (ECalModel *model, const char *sexp)
+e_cal_model_set_search_query (ECalModel *model, const gchar *sexp)
 {
 	ECalModelPrivate *priv;
 
@@ -2108,7 +2108,7 @@ e_cal_model_set_search_query (ECalModel *model, const char *sexp)
  * e_cal_model_set_query
  */
 void
-e_cal_model_set_search_query_with_time_range (ECalModel *model, const char *sexp, time_t start, time_t end)
+e_cal_model_set_search_query_with_time_range (ECalModel *model, const gchar *sexp, time_t start, time_t end)
 {
 	ECalModelPrivate *priv;
 	gboolean do_query = FALSE;
@@ -2178,7 +2178,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model)
 
 	/* make sure the component has an UID */
 	if (!icalcomponent_get_uid (icalcomp)) {
-		char *uid;
+		gchar *uid;
 
 		uid = e_cal_component_gen_uid ();
 		icalcomponent_set_uid (icalcomp, uid);
@@ -2268,14 +2268,14 @@ e_cal_model_get_component_for_uid  (ECalModel *model, const ECalComponentId *id)
 /**
  * e_cal_model_date_value_to_string
  */
-gchar*
-e_cal_model_date_value_to_string (ECalModel *model, const void *value)
+gchar *
+e_cal_model_date_value_to_string (ECalModel *model, gconstpointer value)
 {
 	ECalModelPrivate *priv;
 	ECellDateEditValue *dv = (ECellDateEditValue *) value;
 	struct icaltimetype tt;
 	struct tm tmp_tm;
-	char buffer[64];
+	gchar buffer[64];
 
 	g_return_val_if_fail (E_IS_CAL_MODEL (model), g_strdup (""));
 
@@ -2320,7 +2320,7 @@ copy_ecdv (ECellDateEditValue *ecdv)
 
 
 struct _ECalModelComponentPrivate {
-	char nouse;
+	gchar nouse;
 };
 
 static void e_cal_model_component_finalize (GObject *object);
@@ -2517,7 +2517,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon
 			param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
 
 			if (param) {
-				const char *tzid = NULL;
+				const gchar *tzid = NULL;
 				icaltimezone *st_zone = NULL;
 
 				tzid = icalparameter_get_tzid (param);
@@ -2541,7 +2541,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon
 			param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
 
 			if (param) {
-				const char *tzid = NULL;
+				const gchar *tzid = NULL;
 				icaltimezone *end_zone = NULL;
 
 				tzid = icalparameter_get_tzid (param);
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 4b266b6a5e..2c470840c8 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -121,7 +121,7 @@ typedef struct {
 	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
 	void (* row_appended) (ECalModel *model);
 	void (* comps_deleted) (ECalModel *model, gpointer list);
-	void (* cal_view_progress) (ECalModel *model, const char *message, int progress, ECalSourceType type);
+	void (* cal_view_progress) (ECalModel *model, const gchar *message, gint progress, ECalSourceType type);
 	void (* cal_view_done) (ECalModel *model, ECalendarStatus status, ECalSourceType type);
 } ECalModelClass;
 
@@ -148,7 +148,7 @@ void                e_cal_model_set_default_client             (ECalModel
 								ECal                *client);
 GList              *e_cal_model_get_client_list                (ECalModel           *model);
 ECal               *e_cal_model_get_client_for_uri             (ECalModel           *model,
-								const char          *uri);
+								const gchar          *uri);
 void                e_cal_model_add_client                     (ECalModel           *model,
 								ECal                *client);
 void                e_cal_model_remove_client                  (ECalModel           *model,
@@ -160,7 +160,7 @@ void                e_cal_model_get_time_range                 (ECalModel
 void                e_cal_model_set_time_range                 (ECalModel           *model,
 								time_t               start,
 								time_t               end);
-const char         *e_cal_model_get_search_query               (ECalModel           *model);
+const gchar         *e_cal_model_get_search_query               (ECalModel           *model);
 void                e_cal_model_set_search_query               (ECalModel           *model,
 								const gchar         *sexp);
 icalcomponent      *e_cal_model_create_component_with_defaults (ECalModel           *model);
@@ -186,9 +186,9 @@ void                e_cal_model_generate_instances             (ECalModel
 								gpointer             cb_data);
 GPtrArray * e_cal_model_get_object_array (ECalModel *model);
 void e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezone *zone);
-void e_cal_model_set_search_query_with_time_range (ECalModel *model, const char *sexp, time_t start, time_t end);
+void e_cal_model_set_search_query_with_time_range (ECalModel *model, const gchar *sexp, time_t start, time_t end);
 
-gboolean e_cal_model_test_row_editable (ECalModel *model, int row);
+gboolean e_cal_model_test_row_editable (ECalModel *model, gint row);
 
 void e_cal_model_set_default_time_func (ECalModel *model, ECalModelDefaultTimeFunc func, gpointer user_data);
 
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 76dcb94e19..ef94eb8ab2 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -67,7 +67,7 @@ ecalp_target_free(EPopup *ep, EPopupTarget *t)
 	switch (t->type) {
 	case E_CAL_POPUP_TARGET_SELECT: {
 		ECalPopupTargetSelect *s = (ECalPopupTargetSelect *)t;
-		int i;
+		gint i;
 
 		for (i=0;i<s->events->len;i++)
 			e_cal_model_free_component_data(s->events->pdata[i]);
@@ -114,7 +114,7 @@ e_cal_popup_get_type(void)
 	return type;
 }
 
-ECalPopup *e_cal_popup_new(const char *menuid)
+ECalPopup *e_cal_popup_new(const gchar *menuid)
 {
 	ECalPopup *eabp = g_object_new(e_cal_popup_get_type(), NULL);
 
@@ -124,7 +124,7 @@ ECalPopup *e_cal_popup_new(const char *menuid)
 }
 
 static icalproperty *
-get_attendee_prop (icalcomponent *icalcomp, const char *address)
+get_attendee_prop (icalcomponent *icalcomp, const gchar *address)
 {
 
 	icalproperty *prop;
@@ -135,7 +135,7 @@ get_attendee_prop (icalcomponent *icalcomp, const char *address)
 	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 gchar *attendee = icalproperty_get_attendee (prop);
 
 		if (g_str_equal (itip_strip_mailto (attendee), address)) {
 			return prop;
@@ -145,11 +145,11 @@ get_attendee_prop (icalcomponent *icalcomp, const char *address)
 }
 
 static gboolean
-is_delegated (icalcomponent *icalcomp, char *user_email)
+is_delegated (icalcomponent *icalcomp, gchar *user_email)
 {
 	icalproperty *prop;
 	icalparameter *param;
-	const char *delto = NULL;
+	const gchar *delto = NULL;
 
 	prop = get_attendee_prop (icalcomp, user_email);
 
@@ -163,7 +163,7 @@ is_delegated (icalcomponent *icalcomp, char *user_email)
 	prop = get_attendee_prop (icalcomp, itip_strip_mailto (delto));
 
 	if (prop) {
-		const char *delfrom = NULL;
+		const gchar *delfrom = NULL;
 		icalparameter_partstat status = ICAL_PARTSTAT_NONE;
 
 		param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
@@ -181,7 +181,7 @@ is_delegated (icalcomponent *icalcomp, char *user_email)
 }
 
 static gboolean
-needs_to_accept (icalcomponent *icalcomp, char *user_email)
+needs_to_accept (icalcomponent *icalcomp, gchar *user_email)
 {
 	icalproperty *prop;
 	icalparameter *param;
@@ -233,7 +233,7 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 	} else {
 		ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[0];
 		ECalComponent *comp;
-		char *user_email = NULL;
+		gchar *user_email = NULL;
 
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
@@ -243,7 +243,7 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 		if (t->events->len == 1)
 			mask &= ~E_CAL_POPUP_SELECT_ONE;
 		else {
-			int i=0;
+			gint i=0;
 
 			mask &= ~E_CAL_POPUP_SELECT_MANY;
 			/* Now check for any incomplete tasks and set the flags*/
@@ -334,11 +334,11 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
 {
 	ECalPopupTargetSource *t = e_popup_target_new(&eabp->popup, E_CAL_POPUP_TARGET_SOURCE, sizeof(*t));
 	guint32 mask = ~0;
-	const char *relative_uri;
-	char *uri;
+	const gchar *relative_uri;
+	gchar *uri;
 	ESource *source;
-	const char *offline = NULL;
-	const char *delete = NULL;
+	const gchar *offline = NULL;
+	const gchar *delete = NULL;
 
 	/* TODO: this is duplicated for addressbook too */
 
@@ -410,7 +410,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
 
 */
 
-static void *ecalph_parent_class;
+static gpointer ecalph_parent_class;
 #define ecalph ((ECalPopupHook *)eph)
 
 static const EPopupHookTargetMask ecalph_select_masks[] = {
@@ -473,7 +473,7 @@ ecalph_finalise(GObject *o)
 static void
 ecalph_class_init(EPluginHookClass *klass)
 {
-	int i;
+	gint i;
 
 	((GObjectClass *)klass)->finalize = ecalph_finalise;
 	((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.popup:1.0";
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 5c68b4829b..9887c66366 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -191,7 +191,7 @@ struct _ECalPopupClass {
 
 GType e_cal_popup_get_type(void);
 
-ECalPopup *e_cal_popup_new(const char *menuid);
+ECalPopup *e_cal_popup_new(const gchar *menuid);
 
 ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events);
 ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector);
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 6e99cf58eb..885f9afb90 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -103,7 +103,7 @@ static GdkAtom clipboard_atom;
 
 /* The icons to represent the task. */
 #define E_CALENDAR_MODEL_NUM_ICONS	4
-static const char* icon_names[E_CALENDAR_MODEL_NUM_ICONS] = {
+static const gchar * icon_names[E_CALENDAR_MODEL_NUM_ICONS] = {
 	"stock_task", "stock_task-recurring", "stock_task-assigned", "stock_task-assigned-to"
 };
 static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { NULL };
@@ -177,8 +177,8 @@ static gint
 calendar_table_percent_compare_cb (gconstpointer a,
                                    gconstpointer b)
 {
-	int percent1 = GPOINTER_TO_INT (a);
-	int percent2 = GPOINTER_TO_INT (b);
+	gint percent1 = GPOINTER_TO_INT (a);
+	gint percent2 = GPOINTER_TO_INT (b);
 
 	return (percent1 < percent2) ? -1 : (percent1 > percent2);
 }
@@ -187,10 +187,10 @@ static gint
 calendar_table_priority_compare_cb (gconstpointer a,
                                     gconstpointer b)
 {
-	int priority1, priority2;
+	gint priority1, priority2;
 
-	priority1 = e_cal_util_priority_from_string ((const char*) a);
-	priority2 = e_cal_util_priority_from_string ((const char*) b);
+	priority1 = e_cal_util_priority_from_string ((const gchar *) a);
+	priority2 = e_cal_util_priority_from_string ((const gchar *) b);
 
 	/* We change undefined priorities so they appear after 'Low'. */
 	if (priority1 <= 0)
@@ -278,13 +278,13 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 {
 	ECalModel *model;
 	ECalModelComponent *comp_data;
-	int row = -1, col = -1;
+	gint row = -1, col = -1;
 	GtkWidget *box, *l, *w;
 	GtkStyle *style = gtk_widget_get_default_style ();
-	char *tmp;
-	const char *str;
+	gchar *tmp;
+	const gchar *str;
 	GString *tmp2;
-	char buff[1001];
+	gchar buff[1001];
 	gboolean free_text = FALSE;
 	ECalComponent *new_comp;
 	ECalComponentOrganizer organizer;
@@ -292,7 +292,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 	icalcomponent *clone;
 	icaltimezone *zone, *default_zone;
 	GSList *desc, *p;
-	int len;
+	gint len;
 	ETable *etable;
 	ESelectionModel *esm;
 	struct tm tmp_tm;
@@ -329,7 +329,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 		comp_data->client, comp_data->icalcomp, &free_text);
 	if (!(str && *str)) {
 		if (free_text)
-			g_free ((char *)str);
+			g_free ((gchar *)str);
 		free_text = FALSE;
 		str = _("* No Summary *");
 	}
@@ -348,7 +348,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 	g_free (tmp);
 
 	if (free_text)
-		g_free ((char *)str);
+		g_free ((gchar *)str);
 	free_text = FALSE;
 
 	w = gtk_event_box_new ();
@@ -361,7 +361,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
-		char *ptr ;
+		gchar *ptr ;
 		ptr = strchr( organizer.value, ':');
 
 		if (ptr) {
@@ -678,9 +678,9 @@ calendar_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Public"));
-	strings = g_list_append (strings, (char*) _("Private"));
-	strings = g_list_append (strings, (char*) _("Confidential"));
+	strings = g_list_append (strings, (gchar *) _("Public"));
+	strings = g_list_append (strings, (gchar *) _("Private"));
+	strings = g_list_append (strings, (gchar *) _("Confidential"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
@@ -700,10 +700,10 @@ calendar_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("High"));
-	strings = g_list_append (strings, (char*) _("Normal"));
-	strings = g_list_append (strings, (char*) _("Low"));
-	strings = g_list_append (strings, (char*) _("Undefined"));
+	strings = g_list_append (strings, (gchar *) _("High"));
+	strings = g_list_append (strings, (gchar *) _("Normal"));
+	strings = g_list_append (strings, (gchar *) _("Low"));
+	strings = g_list_append (strings, (gchar *) _("Undefined"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
@@ -722,17 +722,17 @@ calendar_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("0%"));
-	strings = g_list_append (strings, (char*) _("10%"));
-	strings = g_list_append (strings, (char*) _("20%"));
-	strings = g_list_append (strings, (char*) _("30%"));
-	strings = g_list_append (strings, (char*) _("40%"));
-	strings = g_list_append (strings, (char*) _("50%"));
-	strings = g_list_append (strings, (char*) _("60%"));
-	strings = g_list_append (strings, (char*) _("70%"));
-	strings = g_list_append (strings, (char*) _("80%"));
-	strings = g_list_append (strings, (char*) _("90%"));
-	strings = g_list_append (strings, (char*) _("100%"));
+	strings = g_list_append (strings, (gchar *) _("0%"));
+	strings = g_list_append (strings, (gchar *) _("10%"));
+	strings = g_list_append (strings, (gchar *) _("20%"));
+	strings = g_list_append (strings, (gchar *) _("30%"));
+	strings = g_list_append (strings, (gchar *) _("40%"));
+	strings = g_list_append (strings, (gchar *) _("50%"));
+	strings = g_list_append (strings, (gchar *) _("60%"));
+	strings = g_list_append (strings, (gchar *) _("70%"));
+	strings = g_list_append (strings, (gchar *) _("80%"));
+	strings = g_list_append (strings, (gchar *) _("90%"));
+	strings = g_list_append (strings, (gchar *) _("100%"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
@@ -752,8 +752,8 @@ calendar_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Free"));
-	strings = g_list_append (strings, (char*) _("Busy"));
+	strings = g_list_append (strings, (gchar *) _("Free"));
+	strings = g_list_append (strings, (gchar *) _("Busy"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
@@ -773,10 +773,10 @@ calendar_table_constructed (GObject *object)
 	g_object_unref (cell);
 
 	strings = NULL;
-	strings = g_list_append (strings, (char*) _("Not Started"));
-	strings = g_list_append (strings, (char*) _("In Progress"));
-	strings = g_list_append (strings, (char*) _("Completed"));
-	strings = g_list_append (strings, (char*) _("Canceled"));
+	strings = g_list_append (strings, (gchar *) _("Not Started"));
+	strings = g_list_append (strings, (gchar *) _("In Progress"));
+	strings = g_list_append (strings, (gchar *) _("Completed"));
+	strings = g_list_append (strings, (gchar *) _("Canceled"));
 	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
 					  strings);
 
@@ -1017,12 +1017,12 @@ e_calendar_table_get_table (ECalendarTable *cal_table)
 }
 
 /* Used from e_table_selected_row_foreach(); puts the selected row number in an
- * int pointed to by the closure data.
+ * gint pointed to by the closure data.
  */
 static void
-get_selected_row_cb (int model_row, gpointer data)
+get_selected_row_cb (gint model_row, gpointer data)
 {
-	int *row;
+	gint *row;
 
 	row = data;
 	*row = model_row;
@@ -1037,7 +1037,7 @@ get_selected_comp (ECalendarTable *cal_table)
 {
 	ECalModel *model;
 	ETable *etable;
-	int row;
+	gint row;
 
 	model = e_calendar_table_get_model (cal_table);
 	etable = e_calendar_table_get_table (cal_table);
@@ -1060,7 +1060,7 @@ struct get_selected_uids_closure {
 
 /* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
 static void
-add_uid_cb (int model_row, gpointer data)
+add_uid_cb (gint model_row, gpointer data)
 {
 	struct get_selected_uids_closure *closure = data;
 	ECalModelComponent *comp_data;
@@ -1099,7 +1099,7 @@ delete_selected_components (ECalendarTable *cal_table)
 	g_slist_free (objs);
 }
 static void
-add_retract_data (ECalComponent *comp, const char *retract_comment)
+add_retract_data (ECalComponent *comp, const gchar *retract_comment)
 {
 	icalcomponent *icalcomp = NULL;
 	icalproperty *icalprop = NULL;
@@ -1117,8 +1117,8 @@ static gboolean
 check_for_retract (ECalComponent *comp, ECal *client)
 {
 	ECalComponentOrganizer org;
-	char *email = NULL;
-	const char *strip = NULL;
+	gchar *email = NULL;
+	const gchar *strip = NULL;
 	gboolean ret_val = FALSE;
 
 	if (!(e_cal_component_has_attendees (comp) &&
@@ -1146,7 +1146,7 @@ void
 e_calendar_table_delete_selected (ECalendarTable *cal_table)
 {
 	ETable *etable;
-	int n_selected;
+	gint n_selected;
 	ECalModelComponent *comp_data;
 	ECalComponent *comp = NULL;
 	gboolean  delete = FALSE;
@@ -1174,7 +1174,7 @@ e_calendar_table_delete_selected (ECalendarTable *cal_table)
 	}
 
 	if ((n_selected == 1) && comp && check_for_retract (comp, comp_data->client)) {
-		char *retract_comment = NULL;
+		gchar *retract_comment = NULL;
 		gboolean retract = FALSE;
 
 		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table), &retract);
@@ -1275,7 +1275,7 @@ clipboard_get_calendar_cb (GtkClipboard *clipboard,
 
 /* callback for e_table_selected_row_foreach */
 static void
-copy_row_cb (int model_row, gpointer data)
+copy_row_cb (gint model_row, gpointer data)
 {
 	ECalendarTable *cal_table;
 	ECalModelComponent *comp_data;
@@ -1317,7 +1317,7 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
 {
 	ETable *etable;
 	GtkClipboard *clipboard;
-	char *comp_str;
+	gchar *comp_str;
 
 	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
 
@@ -1346,7 +1346,7 @@ static void
 clipboard_get_calendar_data (ECalendarTable *cal_table, const gchar *text)
 {
 	icalcomponent *icalcomp;
-	char *uid;
+	gchar *uid;
 	ECalComponent *comp;
 	ECalModel *model;
 	ECal *client;
@@ -1412,7 +1412,7 @@ clipboard_get_calendar_data (ECalendarTable *cal_table, const gchar *text)
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomp);
 		uid = e_cal_component_gen_uid ();
-		e_cal_component_set_uid (comp, (const char *) uid);
+		e_cal_component_set_uid (comp, (const gchar *) uid);
 		free (uid);
 
 		e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL);
@@ -1476,11 +1476,11 @@ e_calendar_table_paste_clipboard (ECalendarTable *cal_table)
 }
 
 static void
-hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPtrArray *comp_objects)
+hide_completed_rows (ECalModel *model, GList *clients_list, gchar *hide_sexp, GPtrArray *comp_objects)
 {
 	GList *l, *m, *objects;
 	ECal *client;
-	int pos;
+	gint pos;
 
 	for (l = clients_list; l != NULL; l = l->next) {
 		client = l->data;
@@ -1520,7 +1520,7 @@ hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPt
 }
 
 static void
-show_completed_rows (ECalModel *model, GList *clients_list, char *show_sexp, GPtrArray *comp_objects)
+show_completed_rows (ECalModel *model, GList *clients_list, gchar *show_sexp, GPtrArray *comp_objects)
 {
 	GList *l, *m, *objects;
 	ECal *client;
@@ -1629,7 +1629,7 @@ e_calendar_table_process_completed_tasks (ECalendarTable *table, GList *clients_
 {
 	ECalModel *model;
 	static GMutex *mutex = NULL;
-	char *hide_sexp, *show_sexp;
+	gchar *hide_sexp, *show_sexp;
 	GPtrArray *comp_objects = NULL;
 
 	if (!mutex)
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 975052ba17..900984093f 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -67,7 +67,7 @@ struct _ECalendarViewPrivate {
 	ECalModel *model;
 
 	/* The default category */
-	char *default_category;
+	gchar *default_category;
 };
 
 static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
@@ -264,7 +264,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 	struct icaltimetype itime, old_dtstart, old_dtend;
 	time_t tt_start, tt_end, new_dtstart = 0;
 	struct icaldurationtype ic_dur, ic_oneday;
-	char *uid;
+	gchar *uid;
 	gint start_offset, end_offset;
 	gboolean all_day_event = FALSE;
 	GnomeCalendarViewType view_type;
@@ -301,7 +301,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 		} else if (icaldurationtype_as_int (ic_dur) >= 60*60*24
 				&& !in_top_canvas) {
 			/* copy & paste from top canvas to main canvas */
-			int time_divisions;
+			gint time_divisions;
 
 			time_divisions = calendar_config_get_time_divisions ();
 			ic_dur = icaldurationtype_from_int (time_divisions * 60);
@@ -477,11 +477,11 @@ e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone)
 		       old_zone, zone);
 }
 
-const char *
+const gchar *
 e_calendar_view_get_default_category (ECalendarView *cal_view)
 {
 	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-	return (const char *) cal_view->priv->default_category;
+	return (const gchar *) cal_view->priv->default_category;
 }
 
 /**
@@ -493,7 +493,7 @@ e_calendar_view_get_default_category (ECalendarView *cal_view)
  * components from the given calendar view.
  */
 void
-e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category)
+e_calendar_view_set_default_category (ECalendarView *cal_view, const gchar *category)
 {
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
@@ -596,7 +596,7 @@ void
 e_calendar_view_cut_clipboard (ECalendarView *cal_view)
 {
 	GList *selected, *l;
-	const char *uid;
+	const gchar *uid;
 
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
@@ -628,7 +628,7 @@ e_calendar_view_cut_clipboard (ECalendarView *cal_view)
 
 		e_cal_component_get_uid (comp, &uid);
 		if (e_cal_component_is_instance (comp)) {
-			char *rid = NULL;
+			gchar *rid = NULL;
 			icalcomponent *icalcomp;
 
 			/* when cutting detached instances, only cut that instance */
@@ -694,7 +694,7 @@ add_related_timezones (icalcomponent *des_icalcomp, icalcomponent *src_icalcomp,
 		ICAL_DTEND_PROPERTY,
 		ICAL_NO_PROPERTY
 	};
-	int i;
+	gint i;
 
 	g_return_if_fail (des_icalcomp != NULL);
 	g_return_if_fail (src_icalcomp != NULL);
@@ -707,7 +707,7 @@ add_related_timezones (icalcomponent *des_icalcomp, icalcomponent *src_icalcomp,
 			icalparameter *par = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
 
 			if (par) {
-				const char *tzid = icalparameter_get_tzid (par);
+				const gchar *tzid = icalparameter_get_tzid (par);
 
 				if (tzid) {
 					GError *error = NULL;
@@ -809,7 +809,7 @@ clipboard_get_calendar_data (ECalendarView *cal_view, const gchar *text)
 	if (!text || !*text)
 		return;
 
-	icalcomp = icalparser_parse_string ((const char *) text);
+	icalcomp = icalparser_parse_string ((const gchar *) text);
 	if (!icalcomp)
 		return;
 
@@ -922,7 +922,7 @@ e_calendar_view_paste_clipboard (ECalendarView *cal_view)
 }
 
 static void
-add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod)
+add_retract_data (ECalComponent *comp, const gchar *retract_comment, CalObjModType mod)
 {
 	icalcomponent *icalcomp = NULL;
 	icalproperty *icalprop = NULL;
@@ -947,8 +947,8 @@ static gboolean
 check_for_retract (ECalComponent *comp, ECal *client)
 {
 	ECalComponentOrganizer org;
-	char *email = NULL;
-	const char *strip = NULL;
+	gchar *email = NULL;
+	const gchar *strip = NULL;
 	gboolean ret_val = FALSE;
 
 	if (!(e_cal_component_has_attendees (comp) &&
@@ -984,7 +984,7 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 
 	/*FIXME Retract should be moved to Groupwise features plugin */
 	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
+		gchar *retract_comment = NULL;
 		gboolean retract = FALSE;
 
 		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract);
@@ -1015,8 +1015,8 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
 
 	if (delete) {
-		const char *uid;
-		char *rid = NULL;
+		const gchar *uid;
+		gchar *rid = NULL;
 
 		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
@@ -1101,7 +1101,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 
 	/*FIXME Retract should be moved to Groupwise features plugin */
 	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
+		gchar *retract_comment = NULL;
 		gboolean retract = FALSE;
 
 		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract);
@@ -1130,8 +1130,8 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
 
 	if (delete) {
-		const char *uid;
-		char *rid = NULL;
+		const gchar *uid;
+		gchar *rid = NULL;
 		ECalComponentDateTime dt;
 		icaltimezone *zone = NULL;
 		gboolean is_instance = FALSE;
@@ -1199,7 +1199,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 }
 
 static void
-on_new_appointment (EPopup *ep, EPopupItem *pitem, void *data)
+on_new_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1207,7 +1207,7 @@ on_new_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_new_event (EPopup *ep, EPopupItem *pitem, void *data)
+on_new_event (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1215,7 +1215,7 @@ on_new_event (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+on_new_meeting (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1223,7 +1223,7 @@ on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
+on_new_task (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 #if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
@@ -1235,7 +1235,7 @@ on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_goto_date (EPopup *ep, EPopupItem *pitem, void *data)
+on_goto_date (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1243,7 +1243,7 @@ on_goto_date (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_goto_today (EPopup *ep, EPopupItem *pitem, void *data)
+on_goto_today (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 #if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
@@ -1253,7 +1253,7 @@ on_goto_today (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data)
+on_edit_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1272,7 +1272,7 @@ on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_print (EPopup *ep, EPopupItem *pitem, void *data)
+on_print (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 #if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
@@ -1282,12 +1282,12 @@ on_print (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
+on_save_as (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
-	char *filename;
-	char *ical_string;
+	gchar *filename;
+	gchar *ical_string;
 	ECalendarViewEvent *event;
 
 	selected = e_calendar_view_get_selected_events (cal_view);
@@ -1312,7 +1312,7 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_print_event (EPopup *ep, EPopupItem *pitem, void *data)
+on_print_event (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1336,8 +1336,8 @@ on_print_event (EPopup *ep, EPopupItem *pitem, void *data)
 static void
 transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_item)
 {
-	const char *uid;
-	char *new_uid;
+	const gchar *uid;
+	gchar *new_uid;
 	icalcomponent *orig_icalcomp;
 	icalproperty *icalprop;
 
@@ -1400,7 +1400,7 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 	/* remove the item from the source calendar */
 	if (remove_item) {
 		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
-			char *rid = NULL;
+			gchar *rid = NULL;
 			struct icaltimetype recur_id = icalcomponent_get_recurrenceid (event->comp_data->icalcomp);
 
 			if (!icaltime_is_null_time (recur_id))
@@ -1460,7 +1460,7 @@ transfer_selected_items (ECalendarView *cal_view, gboolean remove_item)
 }
 
 static void
-on_copy_to (EPopup *ep, EPopupItem *pitem, void *data)
+on_copy_to (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1468,7 +1468,7 @@ on_copy_to (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_move_to (EPopup *ep, EPopupItem *pitem, void *data)
+on_move_to (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1476,7 +1476,7 @@ on_move_to (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+on_meeting (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1495,7 +1495,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 {
 	icalproperty *prop;
 	icalparameter *param;
-	char *address = NULL;
+	gchar *address = NULL;
 	ECalComponent *comp;
 	gboolean found = FALSE;
 
@@ -1508,7 +1508,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 	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 gchar *attendee = icalproperty_get_attendee (prop);
 
 		if (!g_ascii_strcasecmp (itip_strip_mailto (attendee), address)) {
 			param = icalparameter_new_role (ICAL_ROLE_NONPARTICIPANT);
@@ -1525,9 +1525,9 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 
 	/* We couldn find the attendee in the component, so add a new attendee */
 	if (!found) {
-		char *temp = g_strdup_printf ("MAILTO:%s", address);
+		gchar *temp = g_strdup_printf ("MAILTO:%s", address);
 
-		prop = icalproperty_new_attendee ((const char *) temp);
+		prop = icalproperty_new_attendee ((const gchar *) temp);
 		icalcomponent_add_property (icalcomp, prop);
 
 		param = icalparameter_new_partstat (ICAL_PARTSTAT_DELEGATED);
@@ -1551,7 +1551,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 }
 
 static void
-on_delegate (EPopup *ep, EPopupItem *pitem, void *data)
+on_delegate (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1575,7 +1575,7 @@ on_delegate (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_forward (EPopup *ep, EPopupItem *pitem, void *data)
+on_forward (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1595,7 +1595,7 @@ on_forward (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_reply (EPopup *ep, EPopupItem *pitem, void *data)
+on_reply (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1616,7 +1616,7 @@ on_reply (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_reply_all (EPopup *ep, EPopupItem *pitem, void *data)
+on_reply_all (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
@@ -1637,7 +1637,7 @@ on_reply_all (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_delete_appointment (EPopup *ep, EPopupItem *pitem, void *data)
+on_delete_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1645,7 +1645,7 @@ on_delete_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
+on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 	ECalendarViewEvent *event;
@@ -1654,7 +1654,7 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 	struct icaltimetype itt;
 	GList *selected;
 	ECal *client;
-	char *new_uid;
+	gchar *new_uid;
 	ECalComponentId *id = NULL;
 
 	selected = e_calendar_view_get_selected_events (cal_view);
@@ -1723,7 +1723,7 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_delete_occurrence (EPopup *ep, EPopupItem *pitem, void *data)
+on_delete_occurrence (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1731,7 +1731,7 @@ on_delete_occurrence (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_cut (EPopup *ep, EPopupItem *pitem, void *data)
+on_cut (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1739,7 +1739,7 @@ on_cut (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_copy (EPopup *ep, EPopupItem *pitem, void *data)
+on_copy (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1747,7 +1747,7 @@ on_copy (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_paste (EPopup *ep, EPopupItem *pitem, void *data)
+on_paste (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
 
@@ -1961,8 +1961,8 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day,
 	/* time in this cases; dtstart should be a midnight in this case */
 	if (do_rounding || (!all_day && (dtend - dtstart) == (60 * 60 * 24))) {
 		struct tm local = *localtime (&now);
-		int time_div = calendar_config_get_time_divisions ();
-		int hours, mins;
+		gint time_div = calendar_config_get_time_divisions ();
+		gint hours, mins;
 
 		if (!time_div) /* Possible if your gconf values aren't so nice */
 			time_div = 30;
@@ -2010,7 +2010,7 @@ CompEditor *
 e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags)
 {
 	CompEditor *ce;
-	const char *uid;
+	const gchar *uid;
 	ECalComponent *comp;
 	EShell *shell;
 
@@ -2091,7 +2091,7 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (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 (comp, &uid);
 				if (e_cal_get_object (client, uid, NULL, &icalcomp, NULL) && icalcomp) {
@@ -2129,10 +2129,10 @@ tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarView *view)
 	return FALSE;
 }
 
-static char *
+static gchar *
 get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
 {
-        char buffer[1000];
+        gchar buffer[1000];
         struct tm tmp_tm;
 
 	tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone);
@@ -2145,7 +2145,7 @@ get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
 }
 
 void
-e_calendar_view_move_tip (GtkWidget *widget, int x, int y)
+e_calendar_view_move_tip (GtkWidget *widget, gint x, gint y)
 {
   GtkRequisition requisition;
   gint w, h;
@@ -2187,13 +2187,13 @@ e_calendar_view_move_tip (GtkWidget *widget, int x, int y)
  * The information is like "Status: Accepted: X   Declined: Y  ...".
  * Free returned pointer with g_free.
  **/
-char *
+gchar *
 e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
 {
 	struct _values {
 		icalparameter_partstat status;
-		const char *caption;
-		int count;
+		const gchar *caption;
+		gint count;
 	} values[] = {
 		{ ICAL_PARTSTAT_ACCEPTED,    N_("Accepted"),     0 },
 		{ ICAL_PARTSTAT_DECLINED,    N_("Declined"),     0 },
@@ -2206,8 +2206,8 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
 
 	GSList *attendees = NULL, *a;
 	gboolean have = FALSE;
-	char *res = NULL;
-	int i;
+	gchar *res = NULL;
+	gint i;
 
 	if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user_ex (comp, client, TRUE))
 		return NULL;
@@ -2273,8 +2273,8 @@ gboolean
 e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 {
 	GtkWidget *label, *box, *hbox, *ebox, *frame;
-	const char *str;
-	char *tmp, *tmp1, *tmp2;
+	const gchar *str;
+	gchar *tmp, *tmp1, *tmp2;
 	ECalComponentOrganizer organiser;
 	ECalComponentDateTime dtstart, dtend;
 	icalcomponent *clone_comp;
@@ -2318,7 +2318,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	gtk_label_set_markup ((GtkLabel *)label, tmp);
 
 	if (free_text) {
-		g_free ((char*)str);
+		g_free ((gchar *)str);
 		str = NULL;
 	}
 
@@ -2334,7 +2334,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 
 	e_cal_component_get_organizer (newcomp, &organiser);
 	if (organiser.cn) {
-		char *ptr ;
+		gchar *ptr ;
 		ptr = strchr(organiser.value, ':');
 
 		if (ptr) {
@@ -2462,7 +2462,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category)
 	for (property = icalcomponent_get_first_property (icalcomp, ICAL_CATEGORIES_PROPERTY);
 	     property != NULL;
 	     property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) {
-		char *value = icalproperty_get_value_as_string_r (property);
+		gchar *value = icalproperty_get_value_as_string_r (property);
 
 		if (value && strcmp (category, value) == 0){
 			g_free (value);
@@ -2565,7 +2565,7 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
 }
 
 static void
-error_response(GtkWidget *widget, gint response, void *data)
+error_response(GtkWidget *widget, gint response, gpointer data)
 {
 	if (response == GTK_RESPONSE_DELETE_EVENT)
 		gtk_widget_destroy(widget);
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 45a9573f04..bed87f618a 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -89,10 +89,10 @@ struct _ECalendarView {
 };
 
 typedef struct {
-	ECalendarViewEvent * (* get_view_event) (ECalendarView *view, int day, int event_num);
+	ECalendarViewEvent * (* get_view_event) (ECalendarView *view, gint day, gint event_num);
 	ECalendarView *cal_view;
-	int day;
-	int event_num;
+	gint day;
+	gint event_num;
 } ECalendarViewEventData;
 
 struct _ECalendarViewClass {
@@ -124,12 +124,12 @@ ECalModel     *e_calendar_view_get_model (ECalendarView *cal_view);
 void           e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model);
 icaltimezone  *e_calendar_view_get_timezone (ECalendarView *cal_view);
 void           e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone);
-const char    *e_calendar_view_get_default_category (ECalendarView *cal_view);
-void           e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category);
+const gchar    *e_calendar_view_get_default_category (ECalendarView *cal_view);
+void           e_calendar_view_set_default_category (ECalendarView *cal_view, const gchar *category);
 gboolean       e_calendar_view_get_use_24_hour_format (ECalendarView *view);
 void           e_calendar_view_set_use_24_hour_format (ECalendarView *view, gboolean use_24_hour);
 
-void           e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, int percent);
+void           e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, gint percent);
 
 GList         *e_calendar_view_get_selected_events (ECalendarView *cal_view);
 gboolean       e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
@@ -174,10 +174,10 @@ void e_calendar_utils_show_info_silent(struct _GtkWidget *widget);
 
 gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
 
-void           e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
+void           e_calendar_view_move_tip (GtkWidget *widget, gint x, gint y);
 
 const gchar *e_calendar_view_get_icalcomponent_summary (ECal *ecal, icalcomponent *icalcomp, gboolean *free_text);
-char *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client);
+gchar *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client);
 
 void           draw_curved_rectangle (cairo_t *cr,
                                       double x0,
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
index eb6c27420b..5b04791412 100644
--- a/calendar/gui/e-cell-date-edit-config.c
+++ b/calendar/gui/e-cell-date-edit-config.c
@@ -205,7 +205,7 @@ twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gp
 static void
 set_range (ECellDateEdit *cell)
 {
-	int start_hour, end_hour;
+	gint start_hour, end_hour;
 
 	start_hour = calendar_config_get_day_start_hour ();
 	end_hour = calendar_config_get_day_end_hour ();
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 8a43c628fc..efe251aa0f 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -59,13 +59,13 @@ e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
 }
 
 
-static char *
-ecd_get_text (ECellText *cell, ETableModel *model, int col, int row)
+static gchar *
+ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
 	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
 	ECellDateEditValue *dv = e_table_model_value_at (model, col, row);
 	struct tm tmp_tm;
-	char buffer[64];
+	gchar buffer[64];
 
 	if (!dv)
 		return g_strdup ("");
@@ -84,7 +84,7 @@ ecd_get_text (ECellText *cell, ETableModel *model, int col, int row)
 
 
 static void
-ecd_free_text (ECellText *cell, char *text)
+ecd_free_text (ECellText *cell, gchar *text)
 {
 	g_free (text);
 }
@@ -95,7 +95,7 @@ static void
 show_date_warning (ECellDateEditText *ecd)
 {
 	GtkWidget *dialog;
-	char buffer[64], *format;
+	gchar buffer[64], *format;
 	time_t t;
 	struct tm *tmp_tm;
 
@@ -125,8 +125,8 @@ show_date_warning (ECellDateEditText *ecd)
 
 
 static void
-ecd_set_value (ECellText *cell, ETableModel *model, int col, int row,
-	       const char *text)
+ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
+	       const gchar *text)
 {
 	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);
 	ETimeParseStatus status;
@@ -206,7 +206,7 @@ e_cell_date_edit_text_init (ECellDateEditText *ecd)
  * Returns: an ECell object that can be used to render dates.
  */
 ECell *
-e_cell_date_edit_text_new (const char *fontname,
+e_cell_date_edit_text_new (const gchar *fontname,
 			   GtkJustification justify)
 {
 	ECellDateEditText *ecd = g_object_new (e_cell_date_edit_text_get_type (), NULL);
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index c353ecd278..0f557afade 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -56,7 +56,7 @@ typedef struct {
 } ECellDateEditTextClass;
 
 GType      e_cell_date_edit_text_get_type (void);
-ECell     *e_cell_date_edit_text_new      (const char *fontname,
+ECell     *e_cell_date_edit_text_new      (const gchar *fontname,
 					   GtkJustification justify);
 
 
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
index a4bed100b9..cdbffd4ee4 100644
--- a/calendar/gui/e-comp-editor-registry.c
+++ b/calendar/gui/e-comp-editor-registry.c
@@ -34,7 +34,7 @@ struct _ECompEditorRegistryData
 {
 	ECompEditorRegistry *registry;
 	CompEditor *editor;
-	char *uid;
+	gchar *uid;
 };
 
 typedef struct _ECompEditorRegistryData ECompEditorRegistryData;
@@ -120,7 +120,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole
 	ECompEditorRegistryPrivate *priv;
 	ECompEditorRegistryData *rdata;
 	ECalComponent *comp;
-	const char *uid;
+	const gchar *uid;
 
 	g_return_if_fail (reg != NULL);
 	g_return_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg));
@@ -145,7 +145,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole
 }
 
 CompEditor *
-e_comp_editor_registry_find (ECompEditorRegistry *reg, const char *uid)
+e_comp_editor_registry_find (ECompEditorRegistry *reg, const gchar *uid)
 {
 	ECompEditorRegistryPrivate *priv;
 	ECompEditorRegistryData *rdata;
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 5c2b4c4bc8..0b45a53cbc 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -64,7 +64,7 @@ void        e_comp_editor_registry_add       (ECompEditorRegistry *reg,
 					      CompEditor          *editor,
 					      gboolean             remote);
 CompEditor *e_comp_editor_registry_find      (ECompEditorRegistry *reg,
-					      const char          *uid);
+					      const gchar          *uid);
 gboolean    e_comp_editor_registry_close_all (ECompEditorRegistry *reg);
 
 G_END_DECLS
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
index f93f2cf746..bead58f5d2 100644
--- a/calendar/gui/e-date-edit-config.c
+++ b/calendar/gui/e-date-edit-config.c
@@ -146,7 +146,7 @@ e_date_edit_config_get_edit (EDateEditConfig *edit_config)
 static void
 set_week_start (EDateEdit *date_edit)
 {
-	int week_start_day;
+	gint week_start_day;
 
 	week_start_day = calendar_config_get_week_start_day ();
 
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index 2aaab0df4d..bf75f5ff04 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -398,10 +398,10 @@ e_date_time_list_get_path (GtkTreeModel *tree_model,
 }
 
 /* Builds a static string out of an exception date */
-static char *
+static gchar *
 get_exception_string (ECalComponentDateTime *dt)
 {
-	static char buf [256];
+	static gchar buf [256];
 	struct tm tmp_tm;
 
 	tmp_tm.tm_year  = dt->value->year - 1900;
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index edd02bb7ee..682c99e6b7 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -146,7 +146,7 @@ e_day_view_config_get_view (EDayViewConfig *view_config)
 static void
 set_week_start (EDayView *day_view)
 {
-	int week_start_day;
+	gint week_start_day;
 
 	week_start_day = calendar_config_get_week_start_day ();
 
@@ -215,7 +215,7 @@ working_days_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin
 static void
 set_day_start_hour (EDayView *day_view)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 
 	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
 
@@ -238,7 +238,7 @@ day_start_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpo
 static void
 set_day_start_minute (EDayView *day_view)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 
 	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
 
@@ -261,7 +261,7 @@ day_start_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, g
 static void
 set_day_end_hour (EDayView *day_view)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 
 	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
 
@@ -285,7 +285,7 @@ day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin
 static void
 set_day_end_minute (EDayView *day_view)
 {
-	int start_hour, start_minute, end_hour, end_minute;
+	gint start_hour, start_minute, end_hour, end_minute;
 
 	e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute);
 
@@ -308,7 +308,7 @@ day_end_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpo
 static void
 set_time_divisions (EDayView *day_view)
 {
-	int time_divisions;
+	gint time_divisions;
 
 	time_divisions = calendar_config_get_time_divisions ();
 
@@ -330,7 +330,7 @@ static void
 set_marcus_bains (EDayView *day_view)
 {
 	gboolean show_marcus_bains_line;
-	const char *dayview_color, *timebar_color;
+	const gchar *dayview_color, *timebar_color;
 
 	calendar_config_get_marcus_bains (&show_marcus_bains_line, &dayview_color, &timebar_color);
 
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 86b723903f..c8449c0854 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -44,38 +44,38 @@ static void e_day_view_main_item_set_property (GObject *object,
 					       GParamSpec *pspec);
 static void e_day_view_main_item_update (GnomeCanvasItem *item,
 					 double *affine,
-					 ArtSVP *clip_path, int flags);
+					 ArtSVP *clip_path, gint flags);
 static void e_day_view_main_item_draw (GnomeCanvasItem *item,
 				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
+				       gint x, gint y,
+				       gint width, gint height);
 static double e_day_view_main_item_point (GnomeCanvasItem *item,
 					  double x, double y,
-					  int cx, int cy,
+					  gint cx, gint cy,
 					  GnomeCanvasItem **actual_item);
 static gint e_day_view_main_item_event (GnomeCanvasItem *item,
 					GdkEvent *event);
 
 static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 							    GdkDrawable *drawable,
-							    int x,
-							    int y,
-							    int width,
-							    int height);
+							    gint x,
+							    gint y,
+							    gint width,
+							    gint height);
 static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 						       GdkDrawable *drawable,
-						       int x, int y,
-						       int width, int height,
+						       gint x, gint y,
+						       gint width, gint height,
 						       gint day);
 static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
 						  GdkDrawable *drawable,
-						  int x, int y,
-						  int width, int height,
+						  gint x, gint y,
+						  gint width, gint height,
 						  gint day);
 static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 						 GdkDrawable *drawable,
-						 int x, int y,
-						 int width, int height,
+						 gint x, gint y,
+						 gint width, gint height,
 						 gint day, gint event_num);
 
 /* The arguments we take */
@@ -148,7 +148,7 @@ static void
 e_day_view_main_item_update (GnomeCanvasItem *item,
 			    double *affine,
 			    ArtSVP *clip_path,
-			    int flags)
+			    gint flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_day_view_main_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_main_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -166,7 +166,7 @@ e_day_view_main_item_update (GnomeCanvasItem *item,
  */
 static void
 e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
-			   int x, int y, int width, int height)
+			   gint x, gint y, gint width, gint height)
 {
 	EDayViewMainItem *dvmitem;
 	EDayView *day_view;
@@ -362,7 +362,7 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 	if (e_day_view_get_show_marcus_bains (day_view)) {
 		icaltimezone *zone;
 		struct icaltimetype time_now, day_start;
-		int marcus_bains_y;
+		gint marcus_bains_y;
 		GdkColor mb_color;
 
 		cairo_save (cr);
@@ -404,8 +404,8 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 static void
 e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 					   GdkDrawable *drawable,
-					   int x, int y,
-					   int width, int height,
+					   gint x, gint y,
+					   gint width, gint height,
 					   gint day)
 {
 	EDayView *day_view;
@@ -485,8 +485,8 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 static void
 e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 						GdkDrawable *drawable,
-						int x, int y,
-						int width, int height)
+						gint x, gint y,
+						gint width, gint height)
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
@@ -574,7 +574,7 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 static void
 e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
 				      GdkDrawable *drawable,
-				      int x, int y, int width, int height,
+				      gint x, gint y, gint width, gint height,
 				      gint day)
 {
 	EDayView *day_view;
@@ -593,7 +593,7 @@ e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
 static void
 e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				     GdkDrawable *drawable,
-				     int x, int y, int width, int height,
+				     gint x, gint y, gint width, gint height,
 				     gint day, gint event_num)
 {
 	EDayView *day_view;
@@ -627,8 +627,8 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	gint offset, interval;
 	const gchar *start_suffix;
 	const gchar *end_suffix;
-	char *text = NULL;
-	int scroll_flag = 0;
+	gchar *text = NULL;
+	gint scroll_flag = 0;
 	gint row_y;
 	GConfClient *gconf;
 
@@ -1176,11 +1176,11 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 
 			/* draw categories icons */
 			for (elem = categories_list; elem; elem = elem->next) {
-				char *category;
+				gchar *category;
 				GdkPixmap *pixmap = NULL;
 				GdkBitmap *mask = NULL;
 
-				category = (char *) elem->data;
+				category = (gchar *) elem->data;
 				if (!e_categories_config_get_icon_for (category, &pixmap, &mask))
 					continue;
 
@@ -1317,7 +1317,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
    This is needed so that we get button/motion events. */
 static double
 e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
+			    gint cx, gint cy,
 			    GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index f6ded1ec94..4cbfadd9da 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -65,14 +65,14 @@ static void e_day_view_time_item_finalize (GObject *object);
 
 static void e_day_view_time_item_update (GnomeCanvasItem *item,
 					 double *affine,
-					 ArtSVP *clip_path, int flags);
+					 ArtSVP *clip_path, gint flags);
 static void e_day_view_time_item_draw (GnomeCanvasItem *item,
 				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
+				       gint x, gint y,
+				       gint width, gint height);
 static double e_day_view_time_item_point (GnomeCanvasItem *item,
 					  double x, double y,
-					  int cx, int cy,
+					  gint cx, gint cy,
 					  GnomeCanvasItem **actual_item);
 static gint e_day_view_time_item_event (GnomeCanvasItem *item,
 					GdkEvent *event);
@@ -131,7 +131,7 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
 static void
 e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
 {
-	char *last;
+	gchar *last;
 
 	dvtmitem->dragging_selection = FALSE;
 	dvtmitem->second_zone = NULL;
@@ -185,7 +185,7 @@ static void
 e_day_view_time_item_update (GnomeCanvasItem *item,
 			    double *affine,
 			    ArtSVP *clip_path,
-			    int flags)
+			    gint flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -358,7 +358,7 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 		/* shift time with a difference between local time and the other timezone */
 		icaltimezone *cal_zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
 		struct icaltimetype tt;
-		int diff;
+		gint diff;
 		struct tm mn;
 
 		tt = icaltime_today ();
@@ -416,7 +416,7 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 	/* Draw the Marcus Bains Line first, so it appears under other elements. */
 	if (e_day_view_get_show_marcus_bains (day_view)) {
 		struct icaltimetype time_now;
-		int marcus_bains_y;
+		gint marcus_bains_y;
 
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE]);
@@ -645,7 +645,7 @@ e_day_view_time_item_increment_time	(gint	*hour,
 
 static double
 e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
+			    gint cx, gint cy,
 			    GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
@@ -691,7 +691,7 @@ static void
 edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
 	EDayViewTimeItem *dvtmitem = user_data;
-	char *location;
+	gchar *location;
 
 	g_return_if_fail (user_data != NULL);
 	g_return_if_fail (E_IS_DAY_VIEW_TIME_ITEM (dvtmitem));
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index dd91133243..de9a542ef6 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -687,11 +687,11 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 	/* draw categories icons */
 	e_cal_component_get_categories_list (comp, &categories_list);
 	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
-		const char *file;
+		gchar *category;
+		const gchar *file;
 		GdkPixbuf *pixbuf;
 
-		category = (char *) elem->data;
+		category = (gchar *) elem->data;
 		file = e_categories_get_icon_file_for (category);
 		if (!file)
 			continue;
@@ -800,7 +800,7 @@ e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
    This is needed so that we get button/motion events. */
 static double
 e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
+			   gint cx, gint cy,
 			   GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 0d7aa97ca5..435fadac6d 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -305,7 +305,7 @@ static void e_day_view_foreach_event_with_uid (EDayView *day_view,
 static void e_day_view_free_events (EDayView *day_view);
 static void e_day_view_free_event_array (EDayView *day_view,
 					 GArray *array);
-static int e_day_view_add_event (ECalComponent *comp,
+static gint e_day_view_add_event (ECalComponent *comp,
 				 time_t	  start,
 				 time_t	  end,
 				 gpointer data);
@@ -510,8 +510,8 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
 static void
 process_component (EDayView *day_view, ECalModelComponent *comp_data)
 {
-	const char *uid;
-	char *rid = NULL;
+	const gchar *uid;
+	gchar *rid = NULL;
 	ECalComponent *comp;
 	AddEventData add_event_data;
 
@@ -544,13 +544,13 @@ process_component (EDayView *day_view, ECalModelComponent *comp_data)
 }
 
 static void
-update_row (EDayView *day_view, int row)
+update_row (EDayView *day_view, gint row)
 {
 	ECalModelComponent *comp_data;
 	ECalModel *model;
 	gint day, event_num;
-	const char *uid = NULL;
-	char *rid = NULL;
+	const gchar *uid = NULL;
+	gchar *rid = NULL;
 
 	e_day_view_stop_editing_event (day_view);
 
@@ -580,7 +580,7 @@ update_row (EDayView *day_view, int row)
 }
 
 static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
+model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data)
 {
 	EDayView *day_view = E_DAY_VIEW (user_data);
 
@@ -592,7 +592,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
 }
 
 static void
-model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
+model_cell_changed_cb (ETableModel *etm, gint col, gint row, gpointer user_data)
 {
 	EDayView *day_view = E_DAY_VIEW (user_data);
 
@@ -604,11 +604,11 @@ model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
 }
 
 static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data)
+model_rows_inserted_cb (ETableModel *etm, gint row, gint count, gpointer user_data)
 {
 	EDayView *day_view = E_DAY_VIEW (user_data);
 	ECalModel *model;
-	int i;
+	gint i;
 
 	if (!E_CALENDAR_VIEW (day_view)->in_focus) {
 		return;
@@ -649,8 +649,8 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 	for (l = list; l != NULL; l = g_slist_next (l)) {
 		ECalModelComponent *comp_data = l->data;
 		gint day, event_num;
-		const char *uid = NULL;
-		char *rid = NULL;
+		const gchar *uid = NULL;
+		gchar *rid = NULL;
 
 		uid = icalcomponent_get_uid (comp_data->icalcomp);
 		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
@@ -1528,12 +1528,12 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 {
 	/* An array of dates, one for each month in the year 2000. They must
 	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
+	static const gint days[12] = { 23, 20, 19, 23, 21, 18,
 				      23, 20, 17, 22, 19, 24 };
 	gfloat width, offset;
 	gint day, max_width;
 	struct tm date_tm;
-	char buffer[128];
+	gchar buffer[128];
 	PangoContext *pango_context;
 	PangoLayout *layout;
 	gint pango_width;
@@ -1714,7 +1714,7 @@ e_day_view_foreach_event_with_uid (EDayView *day_view,
 {
 	EDayViewEvent *event;
 	gint day, event_num;
-	const char *u;
+	const gchar *u;
 
 	for (day = 0; day < day_view->days_shown; day++) {
 		for (event_num = day_view->events[day]->len - 1;
@@ -1841,7 +1841,7 @@ e_day_view_update_event_label (EDayView *day_view,
 	EDayViewEvent *event;
 	gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE;
 	const gchar *summary;
-	char *text;
+	gchar *text;
 	gint interval;
 
 	event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
@@ -1851,7 +1851,7 @@ e_day_view_update_event_label (EDayView *day_view,
 		return;
 
 	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char *) summary : (char *) "";
+	text = summary ? (gchar *) summary : (gchar *) "";
 
 	if (day_view->editing_event_day == day
 	    && day_view->editing_event_num == event_num)
@@ -1909,7 +1909,7 @@ e_day_view_update_long_event_label (EDayView *day_view,
 			       NULL);
 
 	if (free_text)
-		g_free ((gchar*)summary);
+		g_free ((gchar *)summary);
 
 	if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp))
@@ -1974,8 +1974,8 @@ e_day_view_find_event_from_uid (EDayView *day_view,
 {
 	EDayViewEvent *event;
 	gint day, event_num;
-	const char *u;
-	char *r = NULL;
+	const gchar *u;
+	gchar *r = NULL;
 
 	if (!uid)
 		return FALSE;
@@ -2297,7 +2297,7 @@ e_day_view_recalc_day_starts (EDayView *day_view,
 			      time_t start_time)
 {
 	gint day;
-	char *str;
+	gchar *str;
 	struct icaltimetype tt;
 	GDate dt;
 
@@ -2580,8 +2580,8 @@ e_day_view_update_marcus_bains		(EDayView *day_view)
 void
 e_day_view_set_marcus_bains		(EDayView       *day_view,
 					 gboolean        show_line,
-					 const char 	*dayview_color,
-					 const char     *timebar_color)
+					 const gchar 	*dayview_color,
+					 const gchar     *timebar_color)
 {
 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
 
@@ -3972,7 +3972,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 	ECal *client;
 	CalObjModType mod = CALOBJ_MOD_ALL;
 	GtkWindow *toplevel;
-	int is_date;
+	gint is_date;
 
 	event_num = day_view->resize_event_num;
 	event = &g_array_index (day_view->long_events, EDayViewEvent,
@@ -4801,8 +4801,8 @@ e_day_view_ensure_events_sorted (EDayView *day_view)
 
 
 gint
-e_day_view_event_sort_func (const void *arg1,
-			    const void *arg2)
+e_day_view_event_sort_func (gconstpointer arg1,
+			    gconstpointer arg2)
 {
 	EDayViewEvent *event1, *event2;
 
@@ -4833,7 +4833,7 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view, GdkEventKey *key
 	time_t dtstart, dtend;
 	ECalComponentDateTime start_dt, end_dt;
 	struct icaltimetype start_tt, end_tt;
-        const char *uid;
+        const gchar *uid;
 	AddEventData add_event_data;
 	gboolean read_only = TRUE;
 
@@ -5750,7 +5750,7 @@ e_day_view_start_editing_event (EDayView *day_view,
                         ((EText *)(event->canvas_item))->need_im_reset = TRUE;
                 }
                 else {
-			char *initial_text;
+			gchar *initial_text;
 
 			initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string);
 			gnome_canvas_item_set (event->canvas_item,
@@ -5796,7 +5796,7 @@ e_day_view_stop_editing_event (EDayView *day_view)
 static void
 cancel_editing (EDayView *day_view)
 {
-	int day, event_num;
+	gint day, event_num;
 	EDayViewEvent *event;
 	const gchar *summary;
 
@@ -5822,7 +5822,7 @@ cancel_editing (EDayView *day_view)
 }
 
 static EDayViewEvent *
-tooltip_get_view_event (EDayView *day_view, int day, int event_num)
+tooltip_get_view_event (EDayView *day_view, gint day, gint event_num)
 {
 	EDayViewEvent *pevent;
 
@@ -5841,8 +5841,8 @@ static void
 tooltip_destroy (EDayView *day_view, GnomeCanvasItem *item)
 {
 	EDayViewEvent *pevent;
-	int event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
-	int day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+	gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
+	gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
 
 	pevent = tooltip_get_view_event (day_view, day, event_num);
 	if (pevent) {
@@ -5961,7 +5961,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 										  &day, &row,
 										  &event_num);
 			} else {
-				int tmp;
+				gint tmp;
 
 				pos = e_day_view_convert_position_in_top_canvas (day_view,
 										 event_x, event_y,
@@ -6000,8 +6000,8 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 	case GDK_MOTION_NOTIFY:
 		{
 			EDayViewEvent *pevent;
-			int event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
-			int day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+			gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
+			gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
 
 			pevent = tooltip_get_view_event (day_view, day, event_num);
 
@@ -6350,7 +6350,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 	on_server = cal_comp_is_on_server (comp, client);
 
 	if (string_is_empty (text) && !on_server) {
-		const char *uid;
+		const gchar *uid;
 
 		e_cal_component_get_uid (comp, &uid);
 
@@ -7389,7 +7389,7 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 
 	if (info == TARGET_CALENDAR_EVENT || info == TARGET_VCALENDAR) {
 		/* we will pass an icalcalendar component for both types */
-		char *comp_str;
+		gchar *comp_str;
 		icalcomponent *vcal;
 
 		vcal = e_cal_util_new_top_level ();
@@ -7399,15 +7399,15 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 		comp_str = icalcomponent_as_ical_string_r (vcal);
 		if (comp_str) {
 			ESource *source = e_cal_get_source (event->comp_data->client);
-			const char *source_uid = e_source_peek_uid (source);
-			char *tmp;
+			const gchar *source_uid = e_source_peek_uid (source);
+			gchar *tmp;
 
 			if (!source_uid)
 				source_uid = "";
 
 			tmp = g_strconcat (source_uid, "\n", comp_str, NULL);
 			gtk_selection_data_set (selection_data, selection_data->target,
-						8, (unsigned char *)tmp, strlen (tmp));
+						8, (guchar *)tmp, strlen (tmp));
 
 			g_free (tmp);
 		}
@@ -7579,7 +7579,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 		&& !drag_from_same_window) {
 		/* We are dragging between different window */
 
-		char *comp_str;
+		gchar *comp_str;
 		icalcomponent *icalcomp;
 		icalcomponent_kind kind;
 		time_t dtstart;
@@ -7591,8 +7591,8 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE)
 			goto error;
 
-		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
+		comp_str = (gchar *) data->data;
+		icalcomp = icalparser_parse_string ((const gchar *) comp_str);
 		if (!icalcomp)
 			goto error;
 
@@ -7785,7 +7785,7 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 		&& !drag_from_same_window) {
 		/* We are dragging between different window */
 
-		char *comp_str;
+		gchar *comp_str;
 		icalcomponent *icalcomp;
 		icalcomponent_kind kind;
 		time_t dtstart;
@@ -7797,8 +7797,8 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 		if (pos == E_CALENDAR_VIEW_POS_OUTSIDE)
 			goto error;
 
-		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
+		comp_str = (gchar *) data->data;
+		icalcomp = icalparser_parse_string ((const gchar *) comp_str);
 		if (!icalcomp)
 			goto error;
 
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index d22201e3f3..8fde1e9ad7 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -299,8 +299,8 @@ struct _EDayView
 
 	/* Whether we show the Marcus Bains Line in the main canvas and time canvas. */
 	gboolean show_marcus_bains_line;
-	char *marcus_bains_day_view_color;
-	char *marcus_bains_time_bar_color;
+	gchar *marcus_bains_day_view_color;
+	gchar *marcus_bains_time_bar_color;
 
 	/* Whether we use show event end times in the main canvas. */
 	gboolean show_event_end_times;
@@ -530,8 +530,8 @@ void	   e_day_view_set_working_day		(EDayView	*day_view,
 gboolean   e_day_view_get_show_marcus_bains	(EDayView	*day_view);
 void       e_day_view_set_marcus_bains		(EDayView       *day_view,
 						 gboolean        show_line,
-						 const char 	*dayview_color,
-						 const char     *timebar_color);
+						 const gchar 	*dayview_color,
+						 const gchar     *timebar_color);
 
 /* Whether we display event end times in the main canvas. */
 gboolean   e_day_view_get_show_event_end_times	(EDayView	*day_view);
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 501a3f37a9..ae45ee54d2 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -61,7 +61,7 @@ struct _EItipControlPrivate {
 	ECal *current_ecal;
 	ECalSourceType type;
 
-	char action;
+	gchar action;
 	gboolean rsvp;
 
 	/* Use the gpointer variants for weak pointers. */
@@ -78,7 +78,7 @@ struct _EItipControlPrivate {
 		gpointer pointer;
 	} vbox;
 
-	char *vcalendar;
+	gchar *vcalendar;
 	ECalComponent *comp;
 	icalcomponent *main_comp;
 	icalcomponent *ical_comp;
@@ -86,8 +86,8 @@ struct _EItipControlPrivate {
 	icalcompiter iter;
 	icalproperty_method method;
 
-	int current;
-	int total;
+	gint current;
+	gint total;
 
 	gchar *calendar_uid;
 
@@ -200,10 +200,10 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type,
 }
 
 static ECal *
-start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceType type)
+start_calendar_server_by_uid (EItipControl *itip, const gchar *uid, ECalSourceType type)
 {
 	EItipControlPrivate *priv;
-	int i;
+	gint i;
 
 	priv = itip->priv;
 
@@ -220,8 +220,8 @@ start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceTyp
 
 typedef struct {
 	EItipControl *itip;
-	char *uid;
-	int count;
+	gchar *uid;
+	gint count;
 	gboolean show_selector;
 } EItipControlFindData;
 
@@ -281,7 +281,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		if (fd->show_selector && !priv->current_ecal && priv->vbox.widget) {
 			GtkWidget *escb;
 			const gchar *property_name;
-			char *uid;
+			gchar *uid;
 
 			switch (priv->type) {
 			case E_CAL_SOURCE_TYPE_EVENT:
@@ -333,7 +333,7 @@ find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector)
 	EItipControlPrivate *priv;
 	EItipControlFindData *fd = NULL;
 	GSList *groups, *l;
-	const char *uid;
+	const gchar *uid;
 
 	priv = itip->priv;
 
@@ -367,7 +367,7 @@ find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector)
 }
 
 static void
-cleanup_ecal (void *data)
+cleanup_ecal (gpointer data)
 {
 	ECal *ecal = data;
 
@@ -394,7 +394,7 @@ e_itip_control_init (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	GtkWidget *scrolled_window;
-	int i;
+	gint i;
 
 	priv = g_new0 (EItipControlPrivate, 1);
 	itip->priv = priv;
@@ -498,7 +498,7 @@ e_itip_control_destroy (GtkObject *obj)
 	priv = itip->priv;
 
 	if (priv) {
-		int i;
+		gint i;
 
 		clean_up (itip);
 
@@ -534,7 +534,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 {
 	EItipControlPrivate *priv;
 	icalproperty *prop;
-	char *my_alt_address = NULL;
+	gchar *my_alt_address = NULL;
 
 	priv = itip->priv;
 
@@ -543,8 +543,8 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) {
 		icalvalue *value;
 		icalparameter *param;
-		const char *attendee, *name;
-		char *attendee_clean, *name_clean;
+		const gchar *attendee, *name;
+		gchar *attendee_clean, *name_clean;
 		EIterator *it;
 
 		value = icalproperty_get_value (prop);
@@ -568,7 +568,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 		}
 
 		if (priv->delegator_address) {
-			char *delegator_clean;
+			gchar *delegator_clean;
 
 			delegator_clean = g_strdup (itip_strip_mailto (attendee));
 			delegator_clean = g_strstrip (delegator_clean);
@@ -626,7 +626,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 }
 
 static icalproperty *
-find_attendee (icalcomponent *ical_comp, const char *address)
+find_attendee (icalcomponent *ical_comp, const gchar *address)
 {
 	icalproperty *prop;
 
@@ -637,8 +637,8 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 	     prop != NULL;
 	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) {
 		icalvalue *value;
-		const char *attendee;
-		char *text;
+		const gchar *attendee;
+		gchar *text;
 
 		value = icalproperty_get_value (prop);
 		if (!value)
@@ -661,14 +661,14 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 static void
 write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
                    GString *buffer,
-		   const char *stext, const char *etext,
+		   const gchar *stext, const gchar *etext,
 		   gboolean just_date)
 {
 	EItipControlPrivate *priv;
 	struct tm tmp_tm;
-	char time_buf[64];
+	gchar time_buf[64];
 	icaltimezone *zone = NULL;
-	const char *display_name;
+	const gchar *display_name;
 
 	priv = itip->priv;
 
@@ -720,8 +720,8 @@ write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
 		g_string_append (buffer, etext);
 }
 
-static const char *
-nth (int n)
+static const gchar *
+nth (gint n)
 {
 	if (n == -1)
 		return "last";
@@ -731,7 +731,7 @@ nth (int n)
 		return e_cal_recur_nth[n];
 }
 
-static const char *dayname[] = {
+static const gchar *dayname[] = {
 	N_("Sunday"),
 	N_("Monday"),
 	N_("Tuesday"),
@@ -741,8 +741,8 @@ static const char *dayname[] = {
 	N_("Saturday")
 };
 
-static const char *
-get_dayname (struct icalrecurrencetype *r, int i)
+static const gchar *
+get_dayname (struct icalrecurrencetype *r, gint i)
 {
 	enum icalrecurrencetype_weekday day;
 
@@ -758,7 +758,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
 {
 	GSList *rrules;
 	struct icalrecurrencetype *r;
-	int i;
+	gint i;
 
 	g_string_append_len (buffer, "<b>Recurring:</b> ", 18);
 
@@ -824,7 +824,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
 				buffer, _("The %s day of "),
 				nth (r->by_month_day[0]));
 		} else {
-			int pos;
+			gint pos;
 
 			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
 			   accept BYDAY=2TU. So we now use the same as Outlook
@@ -1044,7 +1044,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 	ECalComponentOrganizer organizer;
 	ECalComponentAttendee *attendee;
 	GSList *attendees, *l = NULL;
-	const char *string;
+	const gchar *string;
 	gchar *html;
 	const gchar *const_html;
 	gchar *filename;
@@ -1246,37 +1246,37 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 }
 
 
-static char*
+static gchar *
 get_publish_options (void)
 {
 	return g_strdup_printf ("<object classid=\"itip:publish_options\"></object>");
 }
 
-static char*
+static gchar *
 get_request_options (void)
 {
 	return g_strdup_printf ("<object classid=\"itip:request_options\"></object>");
 }
 
-static char*
+static gchar *
 get_request_fb_options (void)
 {
 	return g_strdup_printf ("<object classid=\"itip:freebusy_options\"></object>");
 }
 
-static char*
+static gchar *
 get_reply_options (void)
 {
 	return g_strdup_printf ("<object classid=\"itip:reply_options\"></object>");
 }
 
-static char*
+static gchar *
 get_refresh_options (void)
 {
 	return g_strdup_printf ("<object classid=\"itip:refresh_options\"></object>");
 }
 
-static char*
+static gchar *
 get_cancel_options (gboolean found, icalcomponent_kind kind)
 {
 	if (!found) {
@@ -1301,7 +1301,7 @@ get_real_item (EItipControl *itip)
 	ECalComponent *comp;
 	icalcomponent *icalcomp;
 	gboolean found = FALSE;
-	const char *uid;
+	const gchar *uid;
 
 	priv = itip->priv;
 
@@ -1329,7 +1329,7 @@ adjust_item (EItipControl *itip, ECalComponent *comp)
 	real_comp = get_real_item (itip);
 	if (real_comp != NULL) {
 		ECalComponentText text;
-		const char *string;
+		const gchar *string;
 		GSList *l;
 
 		e_cal_component_get_summary (real_comp, &text);
@@ -1353,7 +1353,7 @@ show_current_event (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	const gchar *itip_title, *itip_desc;
-	char *options;
+	gchar *options;
 	gboolean show_selector = FALSE;
 
 	priv = itip->priv;
@@ -1429,7 +1429,7 @@ show_current_todo (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	const gchar *itip_title, *itip_desc;
-	char *options;
+	gchar *options;
 	gboolean show_selector = FALSE;
 
 	priv = itip->priv;
@@ -1506,7 +1506,7 @@ show_current_freebusy (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	const gchar *itip_title, *itip_desc;
-	char *options;
+	gchar *options;
 
 	priv = itip->priv;
 
@@ -1576,7 +1576,7 @@ show_current (EItipControl *itip)
 	/* Determine any delegate sections */
 	prop = icalcomponent_get_first_property (priv->ical_comp, ICAL_X_PROPERTY);
 	while (prop) {
-		const char *x_name, *x_val;
+		const gchar *x_name, *x_val;
 
 		x_name = icalproperty_get_x_name (prop);
 		x_val = icalproperty_get_x (prop);
@@ -1614,7 +1614,7 @@ show_current (EItipControl *itip)
 	/* Add default reminder if the config says so */
 	if (calendar_config_get_use_default_reminder ()) {
 		ECalComponentAlarm *acomp;
-		int interval;
+		gint interval;
 		CalUnits units;
 		ECalComponentAlarmTrigger trigger;
 
@@ -1889,7 +1889,7 @@ e_itip_control_get_calendar_uid (EItipControl *itip)
 
 
 static gboolean
-change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status)
+change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status)
 {
 	icalproperty *prop;
 
@@ -1939,7 +1939,7 @@ update_item (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	struct icaltimetype stamp;
-	char *str;
+	gchar *str;
 	icalproperty *prop;
 	icalcomponent *clone;
 	GtkWidget *dialog;
@@ -1994,7 +1994,7 @@ update_attendee_status (EItipControl *itip)
 	EItipControlPrivate *priv;
 	ECalComponent *comp = NULL;
 	icalcomponent *icalcomp = NULL;
-	const char *uid;
+	const gchar *uid;
 	GtkWidget *dialog;
 	GError *error = NULL;
 
@@ -2183,8 +2183,8 @@ send_freebusy (EItipControl *itip)
 
 static void
 url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
-{	unsigned char buffer[4096];
-	int len, fd;
+{	guchar buffer[4096];
+	gint len, fd;
 
 	if ((fd = g_open (url, O_RDONLY|O_BINARY, 0)) == -1) {
 		g_warning ("%s", g_strerror (errno));
@@ -2192,7 +2192,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint
 	}
 
        	while ((len = read (fd, buffer, 4096)) > 0) {
-		gtk_html_write (html, handle, (char *)buffer, len);
+		gtk_html_write (html, handle, (gchar *)buffer, len);
 	}
 
 	if (len < 0) {
@@ -2248,7 +2248,7 @@ option_activated_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-add_option (EItipControl *itip, GtkWidget *combo, const char *text, char action)
+add_option (EItipControl *itip, GtkWidget *combo, const gchar *text, gchar action)
 {
 	GtkTreeIter iter;
 	GtkListStore *store;
@@ -2291,7 +2291,7 @@ static void
 insert_label (GtkWidget *hbox)
 {
 	GtkWidget *label;
-	char *text;
+	gchar *text;
 
 	text = g_strdup_printf ("<b>%s</b>", _("Choose an action:"));
 	label = gtk_label_new (NULL);
@@ -2579,7 +2579,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data)
 		icalcomponent *ical_comp;
 		icalproperty *prop;
 		icalvalue *value;
-		const char *attendee;
+		const gchar *attendee;
 		GSList *l, *list = NULL;
 
 		comp = e_cal_component_clone (priv->comp);
@@ -2596,7 +2596,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data)
 		     prop != NULL;
 		     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
 		{
-			char *text;
+			gchar *text;
 
 			value = icalproperty_get_value (prop);
 			if (!value)
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 0b5e147407..52d5860e29 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -669,8 +669,8 @@ compare_times (EMeetingTime *time1,
 }
 
 static gint
-compare_period_starts (const void *arg1,
-		       const void *arg2)
+compare_period_starts (gconstpointer arg1,
+		       gconstpointer arg2)
 {
 	EMeetingFreeBusyPeriod *period1, *period2;
 
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index c903c97c23..8567aa07fa 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -122,7 +122,7 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass)
 
 
 static void
-add_section (ENameSelector *name_selector, const char *name)
+add_section (ENameSelector *name_selector, const gchar *name)
 {
 	ENameSelectorModel *name_selector_model;
 
@@ -160,11 +160,11 @@ get_type_strings (void)
 {
 	GList *strings = NULL;
 
-	strings = g_list_append (strings, (char*) _("Individual"));
-        strings = g_list_append (strings, (char*) _("Group"));
-        strings = g_list_append (strings, (char*) _("Resource"));
-        strings = g_list_append (strings, (char*) _("Room"));
-        strings = g_list_append (strings, (char*) _("Unknown"));
+	strings = g_list_append (strings, (gchar *) _("Individual"));
+        strings = g_list_append (strings, (gchar *) _("Group"));
+        strings = g_list_append (strings, (gchar *) _("Resource"));
+        strings = g_list_append (strings, (gchar *) _("Room"));
+        strings = g_list_append (strings, (gchar *) _("Unknown"));
 
 	return strings;
 }
@@ -174,11 +174,11 @@ get_role_strings (void)
 {
 	GList *strings = NULL;
 
-	strings = g_list_append (strings, (char*) _("Chair"));
-	strings = g_list_append (strings, (char*) _("Required Participant"));
-	strings = g_list_append (strings, (char*) _("Optional Participant"));
-	strings = g_list_append (strings, (char*) _("Non-Participant"));
-	strings = g_list_append (strings, (char*) _("Unknown"));
+	strings = g_list_append (strings, (gchar *) _("Chair"));
+	strings = g_list_append (strings, (gchar *) _("Required Participant"));
+	strings = g_list_append (strings, (gchar *) _("Optional Participant"));
+	strings = g_list_append (strings, (gchar *) _("Non-Participant"));
+	strings = g_list_append (strings, (gchar *) _("Unknown"));
 
 	return strings;
 }
@@ -188,8 +188,8 @@ get_rsvp_strings (void)
 {
 	GList *strings = NULL;
 
-	strings = g_list_append (strings, (char*) _("Yes"));
-	strings = g_list_append (strings, (char*) _("No"));
+	strings = g_list_append (strings, (gchar *) _("Yes"));
+	strings = g_list_append (strings, (gchar *) _("No"));
 
 	return strings;
 }
@@ -199,11 +199,11 @@ get_status_strings (void)
 {
 	GList *strings = NULL;
 
-	strings = g_list_append (strings, (char*) _("Needs Action"));
-	strings = g_list_append (strings, (char*) _("Accepted"));
-	strings = g_list_append (strings, (char*) _("Declined"));
-	strings = g_list_append (strings, (char*) _("Tentative"));
-	strings = g_list_append (strings, (char*) _("Delegated"));
+	strings = g_list_append (strings, (gchar *) _("Needs Action"));
+	strings = g_list_append (strings, (gchar *) _("Accepted"));
+	strings = g_list_append (strings, (gchar *) _("Declined"));
+	strings = g_list_append (strings, (gchar *) _("Tentative"));
+	strings = g_list_append (strings, (gchar *) _("Delegated"));
 
 	return strings;
 }
@@ -213,7 +213,7 @@ value_edited (GtkTreeView *view, gint col, const gchar *path, const gchar *text)
 {
 	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
 	GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
-	int row = gtk_tree_path_get_indices (treepath)[0];
+	gint row = gtk_tree_path_get_indices (treepath)[0];
 
 	e_meeting_store_set_value (model, row, col, text);
 	gtk_tree_path_free (treepath);
@@ -264,7 +264,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 	GList             *destinations, *l;
 	EDestinationStore *destination_store;
 	ENameSelectorModel *name_selector_model;
-	const char *madd = NULL;
+	const gchar *madd = NULL;
 	EMeetingListViewPrivate *priv;
 	guint i = 1;
 
@@ -278,7 +278,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 	madd = itip_strip_mailto (e_meeting_attendee_get_address (ma));
 
 	for (l = destinations; l; l = g_list_next (l)) {
-		const char *attendee = NULL;
+		const gchar *attendee = NULL;
 		EDestination *des = l->data;
 
 
@@ -354,7 +354,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 {
 	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
 	GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
-	int row = gtk_tree_path_get_indices (treepath)[0];
+	gint row = gtk_tree_path_get_indices (treepath)[0];
 	EMeetingAttendee *existing_attendee;
 	gboolean removed = FALSE, address_changed = FALSE;
 
@@ -365,7 +365,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 		GList *l, *m;
 
 		for (l = addresses, m = names; l && m; l = l->next, m = m->next) {
-			char *name = m->data, *email = l->data;
+			gchar *name = m->data, *email = l->data;
 
 			if (!((name && *name) || (email && *email)))
 					continue;
@@ -374,7 +374,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 				continue;
 
 			attendee = e_meeting_store_add_attendee_with_defaults (model);
-			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *)l->data));
+			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *)l->data));
 			e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
 			if (existing_attendee) {
 				/* FIXME Should we copy anything else? */
@@ -395,8 +395,8 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 		}
 
 	} else if (g_list_length (addresses) == 1) {
-		char *name = names->data, *email = addresses->data;
-		int existing_row;
+		gchar *name = names->data, *email = addresses->data;
+		gint existing_row;
 
 		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){
 			if (existing_attendee) {
@@ -430,7 +430,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 		}
 	} else {
 		if (existing_attendee) {
-			const char *address = e_meeting_attendee_get_address (existing_attendee);
+			const gchar *address = e_meeting_attendee_get_address (existing_attendee);
 
 			if (!(address && *address)) {
 				removed = TRUE;
@@ -456,7 +456,7 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view)
 	EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view));
 	GtkTreePath *path;
 	EMeetingAttendee *existing_attendee;
-	int row;
+	gint row;
 
 	/* This is for newly added attendees when the editing is cancelled */
 	gtk_tree_view_get_cursor (view, &path, NULL);
@@ -534,7 +534,7 @@ build_table (EMeetingListView *lview)
 	EMeetingListViewPrivate *priv;
 	GHashTable *edit_table;
 	GtkTreeViewColumn *col;
-	int pos;
+	gint pos;
 
 	priv = lview->priv;
 	edit_table = priv->renderers;
@@ -618,7 +618,7 @@ static void
 change_edit_cols_for_user (gpointer key, gpointer value, gpointer user_data)
 {
        GtkCellRenderer *renderer = (GtkCellRenderer *) value;
-       int key_val = GPOINTER_TO_INT (key);
+       gint key_val = GPOINTER_TO_INT (key);
        switch (key_val)
        {
                case E_MEETING_STORE_ATTENDEE_COL:
@@ -652,7 +652,7 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 {
        EMeetingAttendee *existing_attendee;
        EMeetingListViewPrivate *priv;
-       int row;
+       gint row;
        EMeetingAttendeeEditLevel el;
        gint  edit_level;
        GtkTreeModel *model;
@@ -776,7 +776,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 				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 (view->priv->name_selector);
 				c_store = dialog->name_selector_model->contact_store;
@@ -793,11 +793,11 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 				if (book) {
 					GList *contacts;
 					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)) {
@@ -829,8 +829,8 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 		for (l = list_dests; l; l = l->next) {
 			EDestination *dest = l->data;
 			EContact *contact;
-			const char *name, *attendee = NULL;
-			char *attr = NULL, *fburi = NULL;
+			const gchar *name, *attendee = NULL;
+			gchar *attr = NULL, *fburi = NULL;
 
 			name = e_destination_get_name (dest);
 
@@ -907,7 +907,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
 	ENameSelectorModel *name_selector_model;
 	EMeetingStore *store;
 	const GPtrArray *attendees;
-	int i;
+	gint i;
 	GSList 		  *la = NULL, *l;
 
 	name_selector_model = e_name_selector_peek_model (view->priv->name_selector);
@@ -936,8 +936,8 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
 	/* remove the deleted attendees from name selector */
 	for (l = la; l != NULL; l = l->next) {
 		EMeetingAttendee *ma = NULL;
-		const char *email = l->data;
-		int i;
+		const gchar *email = l->data;
+		gint i;
 
 		ma = e_meeting_store_find_attendee (store, email, &i);
 
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 5e6270976a..e843bee2f5 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -46,7 +46,7 @@ struct _EMeetingStorePrivate {
 	ECal *client;
 	icaltimezone *zone;
 
-	char *fb_uri;
+	gchar *fb_uri;
 
 	GPtrArray *refresh_queue;
 	GHashTable *refresh_data;
@@ -69,7 +69,7 @@ struct _EMeetingStoreQueueData {
 	EMeetingTime start;
 	EMeetingTime end;
 
-	char buffer[BUF_SIZE];
+	gchar buffer[BUF_SIZE];
 	GString *string;
 
 	GPtrArray *call_backs;
@@ -80,7 +80,7 @@ struct _EMeetingStoreQueueData {
 static GObjectClass *parent_class = NULL;
 
 static icalparameter_cutype
-text_to_type (const char *type)
+text_to_type (const gchar *type)
 {
 	if (!e_util_utf8_strcasecmp (type, _("Individual")))
 		return ICAL_CUTYPE_INDIVIDUAL;
@@ -94,7 +94,7 @@ text_to_type (const char *type)
 		return ICAL_CUTYPE_NONE;
 }
 
-static char *
+static gchar *
 type_to_text (icalparameter_cutype type)
 {
 	switch (type) {
@@ -115,7 +115,7 @@ type_to_text (icalparameter_cutype type)
 }
 
 static icalparameter_role
-text_to_role (const char *role)
+text_to_role (const gchar *role)
 {
 	if (!e_util_utf8_strcasecmp (role, _("Chair")))
 		return ICAL_ROLE_CHAIR;
@@ -129,7 +129,7 @@ text_to_role (const char *role)
 		return ICAL_ROLE_NONE;
 }
 
-static char *
+static gchar *
 role_to_text (icalparameter_role role)
 {
 	switch (role) {
@@ -147,7 +147,7 @@ role_to_text (icalparameter_role role)
 }
 
 static gboolean
-text_to_boolean (const char *role)
+text_to_boolean (const gchar *role)
 {
 	if (!e_util_utf8_strcasecmp (role, _("Yes")))
 		return TRUE;
@@ -155,7 +155,7 @@ text_to_boolean (const char *role)
 		return FALSE;
 }
 
-static char *
+static gchar *
 boolean_to_text (gboolean b)
 {
 	if (b)
@@ -165,7 +165,7 @@ boolean_to_text (gboolean b)
 }
 
 static icalparameter_partstat
-text_to_partstat (const char *partstat)
+text_to_partstat (const gchar *partstat)
 {
 	if (!e_util_utf8_strcasecmp (partstat, _("Needs Action")))
 		return ICAL_PARTSTAT_NEEDSACTION;
@@ -185,7 +185,7 @@ text_to_partstat (const char *partstat)
 		return ICAL_PARTSTAT_NONE;
 }
 
-static char *
+static gchar *
 partstat_to_text (icalparameter_partstat partstat)
 {
 	switch (partstat) {
@@ -226,7 +226,7 @@ get_n_columns (GtkTreeModel *model)
 }
 
 static GType
-get_column_type (GtkTreeModel *model, int col)
+get_column_type (GtkTreeModel *model, gint col)
 {
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), G_TYPE_INVALID);
 
@@ -253,7 +253,7 @@ get_column_type (GtkTreeModel *model, int col)
 static gboolean
 get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
 {
-	int row;
+	gint row;
 
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
 	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
@@ -272,7 +272,7 @@ get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
 static GtkTreePath *
 get_path (GtkTreeModel *model, GtkTreeIter *iter)
 {
-	int row;
+	gint row;
 	GtkTreePath *result;
 
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), NULL);
@@ -288,12 +288,12 @@ get_path (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static void
-get_value (GtkTreeModel *model, GtkTreeIter *iter, int col, GValue *value)
+get_value (GtkTreeModel *model, GtkTreeIter *iter, gint col, GValue *value)
 {
 	EMeetingStore *store;
 	EMeetingAttendee *attendee;
 	const gchar *cn;
-	int row;
+	gint row;
 
 	g_return_if_fail (E_IS_MEETING_STORE (model));
 	g_return_if_fail (col >= 0 && col < E_MEETING_STORE_COLUMN_COUNT);
@@ -365,7 +365,7 @@ get_value (GtkTreeModel *model, GtkTreeIter *iter, int col, GValue *value)
 static gboolean
 iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 {
-	int row;
+	gint row;
 
 	g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE);
 	g_return_val_if_fail (iter->stamp == E_MEETING_STORE (model)->priv->stamp, FALSE);
@@ -414,7 +414,7 @@ iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static gboolean
-iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent, int n)
+iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent, gint n)
 {
 	EMeetingStore *store;
 
@@ -455,15 +455,15 @@ ems_tree_model_init (GtkTreeModelIface *iface)
 }
 
 void
-e_meeting_store_set_value (EMeetingStore *store, int row, int col, const gchar *val)
+e_meeting_store_set_value (EMeetingStore *store, gint row, gint col, const gchar *val)
 {
 	icalparameter_cutype type;
 	EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, row);
 
 	switch (col) {
 	case E_MEETING_STORE_ADDRESS_COL:
-		if (val != NULL && *((char *)val))
-			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *) val));
+		if (val != NULL && *((gchar *)val))
+			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *) val));
 		break;
 	case E_MEETING_STORE_MEMBER_COL:
 		e_meeting_attendee_set_member (attendee, g_strdup (val));
@@ -528,7 +528,7 @@ ems_finalize (GObject *obj)
 {
 	EMeetingStore *store = E_MEETING_STORE (obj);
 	EMeetingStorePrivate *priv;
-	int i;
+	gint i;
 
 	priv = store->priv;
 
@@ -729,7 +729,7 @@ EMeetingAttendee *
 e_meeting_store_add_attendee_with_defaults (EMeetingStore *store)
 {
 	EMeetingAttendee *attendee;
-	char *str;
+	gchar *str;
 
 	attendee = E_MEETING_ATTENDEE (e_meeting_attendee_new ());
 
@@ -808,7 +808,7 @@ EMeetingAttendee *
 e_meeting_store_find_attendee (EMeetingStore *store, const gchar *address, gint *row)
 {
 	EMeetingAttendee *attendee;
-	int i;
+	gint i;
 
 	if (address == NULL)
 		return NULL;
@@ -882,7 +882,7 @@ find_zone (icalproperty *ip, icalcomponent *tz_top_level)
 {
 	icalparameter *param;
 	icalcomponent *sub_comp;
-	const char *tzid;
+	const gchar *tzid;
 	icalcompiter iter;
 
 	if (tz_top_level == NULL)
@@ -897,7 +897,7 @@ find_zone (icalproperty *ip, icalcomponent *tz_top_level)
 	while ((sub_comp = icalcompiter_deref (&iter)) != NULL) {
 		icalcomponent *clone;
 		icalproperty *prop;
-		const char *tz_tzid;
+		const gchar *tz_tzid;
 
 		prop = icalcomponent_get_first_property (sub_comp, ICAL_TZID_PROPERTY);
 		tz_tzid = icalproperty_get_tzid (prop);
@@ -921,7 +921,7 @@ static void
 process_callbacks (EMeetingStoreQueueData *qdata)
 {
 	EMeetingStore *store;
-	int i;
+	gint i;
 
 	store = qdata->store;
 
@@ -1046,7 +1046,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
 }
 
 static void
-process_free_busy (EMeetingStoreQueueData *qdata, char *text)
+process_free_busy (EMeetingStoreQueueData *qdata, gchar *text)
 {
  	EMeetingStore *store = qdata->store;
  	EMeetingStorePrivate *priv;
@@ -1112,7 +1112,7 @@ replace_string (gchar *string, const gchar *from_value, gchar *to_value)
 	return replaced;
 }
 
-static void start_async_read (const char *uri, gpointer data);
+static void start_async_read (const gchar *uri, gpointer data);
 
 typedef struct {
 	ECal *client;
@@ -1120,8 +1120,8 @@ typedef struct {
 	time_t endt;
 	GList *users;
 	GList *fb_data;
-	char *fb_uri;
-	char *email;
+	gchar *fb_uri;
+	gchar *email;
 	EMeetingAttendee *attendee;
 	EMeetingStoreQueueData *qdata;
 	EMeetingStore *store;
@@ -1136,7 +1136,7 @@ freebusy_async (gpointer data)
 	FreeBusyAsyncData *fbd = data;
 	EMeetingAttendee *attendee = fbd->attendee;
 	gchar *default_fb_uri = NULL;
-       	char *fburi = NULL;
+       	gchar *fburi = NULL;
 	static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 	EMeetingStorePrivate *priv = fbd->store->priv;
 
@@ -1154,7 +1154,7 @@ freebusy_async (gpointer data)
 
 		if (fbd->fb_data != NULL) {
 			ECalComponent *comp = fbd->fb_data->data;
-			char *comp_str;
+			gchar *comp_str;
 
 			comp_str = e_cal_component_get_as_string (comp);
 			process_free_busy (fbd->qdata, comp_str);
@@ -1211,7 +1211,7 @@ refresh_busy_periods (gpointer data)
 	EMeetingStorePrivate *priv;
 	EMeetingAttendee *attendee = NULL;
 	EMeetingStoreQueueData *qdata = NULL;
-	int i;
+	gint i;
 	GThread *thread;
 	GError *error = NULL;
 	FreeBusyAsyncData *fbd;
@@ -1304,7 +1304,7 @@ refresh_busy_periods (gpointer data)
 }
 
 static void
-refresh_queue_add (EMeetingStore *store, int row,
+refresh_queue_add (EMeetingStore *store, gint row,
 		   EMeetingTime *start,
 		   EMeetingTime *end,
 		   EMeetingStoreRefreshCallback call_back,
@@ -1313,7 +1313,7 @@ refresh_queue_add (EMeetingStore *store, int row,
 	EMeetingStorePrivate *priv;
 	EMeetingAttendee *attendee;
 	EMeetingStoreQueueData *qdata;
-	int i;
+	gint i;
 
 	priv = store->priv;
 
@@ -1349,7 +1349,7 @@ refresh_queue_add (EMeetingStore *store, int row,
 		g_ptr_array_add (qdata->call_backs, call_back);
 		g_ptr_array_add (qdata->data, data);
 
-		g_hash_table_insert (priv->refresh_data, (void *)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
+		g_hash_table_insert (priv->refresh_data, (gpointer)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata);
 	} else {
 		if (e_meeting_time_compare_times (start, &qdata->start) == -1)
 			qdata->start = *start;
@@ -1407,7 +1407,7 @@ async_read (GObject *source_object, GAsyncResult *res, gpointer data)
 }
 
 static void
-start_async_read (const char *uri, gpointer data)
+start_async_read (const gchar *uri, gpointer data)
 {
 	EMeetingStoreQueueData *qdata = data;
 	GError *error = NULL;
@@ -1444,7 +1444,7 @@ e_meeting_store_refresh_all_busy_periods (EMeetingStore *store,
 					  EMeetingStoreRefreshCallback call_back,
 					  gpointer data)
 {
-	int i;
+	gint i;
 
 	g_return_if_fail (E_IS_MEETING_STORE (store));
 
@@ -1454,7 +1454,7 @@ e_meeting_store_refresh_all_busy_periods (EMeetingStore *store,
 
 void
 e_meeting_store_refresh_busy_periods (EMeetingStore *store,
-				      int row,
+				      gint row,
 				      EMeetingTime *start,
 				      EMeetingTime *end,
 				      EMeetingStoreRefreshCallback call_back,
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index 8a237fc34b..f67ad92ddd 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -70,7 +70,7 @@ typedef gboolean (* EMeetingStoreRefreshCallback) (gpointer data);
 GType    e_meeting_store_get_type (void);
 GObject *e_meeting_store_new      (void);
 
-void e_meeting_store_set_value (EMeetingStore *im, int row, int col, const gchar *val);
+void e_meeting_store_set_value (EMeetingStore *im, gint row, gint col, const gchar *val);
 
 ECal *e_meeting_store_get_e_cal (EMeetingStore *im);
 void e_meeting_store_set_e_cal (EMeetingStore *im, ECal *client);
@@ -100,7 +100,7 @@ void e_meeting_store_refresh_all_busy_periods (EMeetingStore *im,
 					       EMeetingStoreRefreshCallback call_back,
 					       gpointer data);
 void e_meeting_store_refresh_busy_periods (EMeetingStore *im,
-					   int row,
+					   gint row,
 					   EMeetingTime *start,
 					   EMeetingTime *end,
 					   EMeetingStoreRefreshCallback call_back,
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index ae7eeb7937..95a1738057 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -49,14 +49,14 @@ static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
 static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
 static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
 						 double *affine,
-						 ArtSVP *clip_path, int flags);
+						 ArtSVP *clip_path, gint flags);
 static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,
 					       GdkDrawable *drawable,
-					       int x, int y,
-					       int width, int height);
+					       gint x, gint y,
+					       gint width, gint height);
 static double e_meeting_time_selector_item_point (GnomeCanvasItem *item,
 						  double x, double y,
-						  int cx, int cy,
+						  gint cx, gint cy,
 						  GnomeCanvasItem **actual_item);
 static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item,
 						GdkEvent *event);
@@ -70,17 +70,17 @@ static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem
 static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 							GdkDrawable *drawable,
 							GDate *date,
-							int x, int scroll_y,
-							int width, int height);
-static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height);
+							gint x, gint scroll_y,
+							gint width, gint height);
+static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint y, gint width, gint height);
 static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 						    GdkDrawable *drawable,
 						    GDate *date,
-						    int x, int scroll_y,
-						    int width, int height);
-static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height);
+						    gint x, gint scroll_y,
+						    gint width, gint height);
+static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height);
 static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row);
-static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingFreeBusyType busy_type, cairo_t *cr);
+static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, gint row, gint x, gint y, gint width, gint first_period, EMeetingFreeBusyType busy_type, cairo_t *cr);
 
 static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y);
 static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
@@ -232,7 +232,7 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 
 
 static void
-e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
+e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update)
 		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -250,7 +250,7 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtS
  */
 
 static void
-e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
+e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingTimeSelectorItem *mts_item;
@@ -418,8 +418,8 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 static void
 e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 					    GdkDrawable *drawable, GDate *date,
-					    int x, int scroll_y,
-					    int width, int height)
+					    gint x, gint scroll_y,
+					    gint width, gint height)
 {
 	EMeetingTimeSelector *mts;
 	GdkGC *gc;
@@ -515,7 +515,7 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
    list of attendees. For now we just paint the bars for each attendee of
    each other. If we want to speed it up we could optimise it later. */
 static void
-e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
+e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingAttendee *ia;
@@ -565,8 +565,8 @@ e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelec
 static void
 e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 					GdkDrawable *drawable, GDate *date,
-					int x, int scroll_y,
-					int width, int height)
+					gint x, gint scroll_y,
+					gint width, gint height)
 {
 	EMeetingTimeSelector *mts;
 	GdkGC *gc;
@@ -639,7 +639,7 @@ e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 /* This paints the colored bars representing busy periods for the individual
    attendees. */
 static void
-e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
+e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingFreeBusyType busy_type;
@@ -722,7 +722,7 @@ e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *m
    busy type, e.g out of office. It is passed the index of the first visible
    busy period of the attendee and continues until it runs off the screen. */
 static void
-e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingFreeBusyType busy_type, cairo_t *cr)
+e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, gint x, gint y, gint width, gint row, gint first_period, EMeetingFreeBusyType busy_type, cairo_t *cr)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingAttendee *ia;
@@ -799,7 +799,7 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt
    This is needed so that we get button/motion events. */
 static double
 e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
-				    int cx, int cy,
+				    gint cx, gint cy,
 				    GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
@@ -875,7 +875,7 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
 	if (!mts->all_day) {
 		gint astart_year, astart_month, astart_day, astart_hour, astart_minute;
 		gint aend_year, aend_month, aend_day, aend_hour, aend_minute;
-		int hdiff, mdiff;
+		gint hdiff, mdiff;
 		GDate asdate, aedate;
 
 		e_meeting_time_selector_get_meeting_time (mts_item->mts,
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 0fbcfb43ee..26282356fc 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -86,7 +86,7 @@ static gint mts_signals [LAST_SIGNAL] = { 0 };
 
 static void e_meeting_time_selector_destroy (GtkObject *object);
 static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-						       const char *name, GdkColor *c);
+						       const gchar *name, GdkColor *c);
 static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
 						   GtkWidget *hbox,
 						   gchar *label_text,
@@ -655,7 +655,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	e_meeting_time_selector_alloc_named_color (mts, "orange4", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);
 
 	/* Create the stipple, for attendees with no data. */
-	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,
+	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar *)stipple_bits,
 						    8, 8);
 
 	/* Connect handlers to the adjustments  scroll the other items. */
@@ -742,7 +742,7 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea,
 
 static void
 e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-					   const char *name, GdkColor *c)
+					   const gchar *name, GdkColor *c)
 {
 	GdkColormap *colormap;
 
@@ -875,7 +875,7 @@ static int
 get_cell_height (GtkTreeView *tree)
 {
 	GtkTreeViewColumn *column;
-	int height = -1;
+	gint height = -1;
 
 	column = gtk_tree_view_get_column (tree, 0);
 	gtk_tree_view_column_cell_get_size (column, NULL,
@@ -890,7 +890,7 @@ style_change_idle_func (gpointer widget)
 {
 	EMeetingTimeSelector *mts;
 	EMeetingTime saved_time;
-	int hour, max_hour_width;
+	gint hour, max_hour_width;
 	/*int maxheight;      */
 	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
@@ -1233,7 +1233,7 @@ e_meeting_time_selector_refresh_cb (gpointer data)
 }
 
 void
-e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all)
+e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, gboolean all)
 {
 	EMeetingTime start, end;
 
@@ -1257,7 +1257,7 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, g
 	/* FIXME We should really have a mechanism to unqueue the
 	 * notification */
 	if (all) {
-		int i;
+		gint i;
 
 		for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++)
 			g_object_ref (GTK_OBJECT (mts));
@@ -1394,7 +1394,7 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
 
 /* This formats a EMeetingTimein a string and returns it.
    Note that it uses a static buffer. */
-gchar*
+gchar *
 e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
 {
 	static gchar buffer[128];
@@ -1414,7 +1414,7 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
 
 /* This formats a GDate in a string and returns it.
    Note that it uses a static buffer. */
-gchar*
+gchar *
 e_meeting_time_selector_dump_date (GDate *date)
 {
 	static gchar buffer[128];
@@ -2067,7 +2067,7 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
 {
 	/* An array of dates, one for each month in the year 2000. They must
 	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
+	static const gint days[12] = { 23, 20, 19, 23, 21, 18,
 				      23, 20, 17, 22, 19, 24 };
 	GDate date;
 	gint max_date_width, longest_weekday_width, longest_month_width, width;
@@ -2880,7 +2880,7 @@ static void
 row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
 	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-	int row = gtk_tree_path_get_indices (path) [0];
+	gint row = gtk_tree_path_get_indices (path) [0];
 	/* Update the scroll region. */
 	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
 
@@ -2896,7 +2896,7 @@ static void
 row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
 	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
-	int row = gtk_tree_path_get_indices (path) [0];
+	gint row = gtk_tree_path_get_indices (path) [0];
 
 	/* Get the latest free/busy info */
 	e_meeting_time_selector_refresh_free_busy (mts, row, FALSE);
@@ -2921,7 +2921,7 @@ row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
 static gboolean
 free_busy_timeout_refresh (gpointer data)
 {
-	char *fb_uri;
+	gchar *fb_uri;
 
 	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);
 
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 2cc82278f6..97be769917 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -382,13 +382,13 @@ void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
 					     EMeetingTime*time);
 gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
 						      EMeetingTime *mtstime);
-void e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all);
+void e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, gboolean all);
 
 /* Debugging function to dump information on all attendees. */
 #ifdef E_MEETING_TIME_SELECTOR_DEBUG
 void e_meeting_time_selector_dump (EMeetingTimeSelector *mts);
-gchar* e_meeting_time_selector_dump_time (EMeetingTime*mtstime);
-gchar* e_meeting_time_selector_dump_date (GDate *date);
+gchar * e_meeting_time_selector_dump_time (EMeetingTime*mtstime);
+gchar * e_meeting_time_selector_dump_date (GDate *date);
 #endif /* E_MEETING_TIME_SELECTOR_DEBUG */
 
 G_END_DECLS
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 7f14d4f794..3e604f8bbe 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -102,7 +102,7 @@ static GdkAtom clipboard_atom;
 
 /* The icons to represent the task. */
 #define E_MEMO_MODEL_NUM_ICONS	2
-static const char* icon_names[E_MEMO_MODEL_NUM_ICONS] = {
+static const gchar * icon_names[E_MEMO_MODEL_NUM_ICONS] = {
 	"stock_notes", "stock_insert-note"
 };
 static GdkPixbuf* icon_pixbufs[E_MEMO_MODEL_NUM_ICONS] = { NULL };
@@ -214,13 +214,13 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 {
 	ECalModel *model;
 	ECalModelComponent *comp_data;
-	int row = -1, col = -1;
+	gint row = -1, col = -1;
 	GtkWidget *box, *l, *w;
 	GtkStyle *style = gtk_widget_get_default_style ();
-	char *tmp;
-	const char *str;
+	gchar *tmp;
+	const gchar *str;
 	GString *tmp2;
-	char buff[1001];
+	gchar buff[1001];
 	gboolean free_text = FALSE;
 	ECalComponent *new_comp;
 	ECalComponentOrganizer organizer;
@@ -228,7 +228,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 	icalcomponent *clone;
 	icaltimezone *zone, *default_zone;
 	GSList *desc, *p;
-	int len;
+	gint len;
 	ETable *etable;
 	ESelectionModel *esm;
 	struct tm tmp_tm;
@@ -265,7 +265,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 		comp_data->client, comp_data->icalcomp, &free_text);
 	if (!(str && *str)) {
 		if (free_text)
-			g_free ((char *)str);
+			g_free ((gchar *)str);
 		free_text = FALSE;
 		str = _("* No Summary *");
 	}
@@ -284,7 +284,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 	g_free (tmp);
 
 	if (free_text)
-		g_free ((char *)str);
+		g_free ((gchar *)str);
 	free_text = FALSE;
 
 	w = gtk_event_box_new ();
@@ -297,7 +297,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
-		char *ptr ;
+		gchar *ptr ;
 		ptr = strchr( organizer.value, ':');
 
 		if (ptr) {
@@ -799,12 +799,12 @@ e_memo_table_get_table (EMemoTable *memo_table)
 }
 
 /* Used from e_table_selected_row_foreach(); puts the selected row number in an
- * int pointed to by the closure data.
+ * gint pointed to by the closure data.
  */
 static void
-get_selected_row_cb (int model_row, gpointer data)
+get_selected_row_cb (gint model_row, gpointer data)
 {
-	int *row;
+	gint *row;
 
 	row = data;
 	*row = model_row;
@@ -819,7 +819,7 @@ get_selected_comp (EMemoTable *memo_table)
 {
 	ECalModel *model;
 	ETable *etable;
-	int row;
+	gint row;
 
 	model = e_memo_table_get_model (memo_table);
 	etable = e_memo_table_get_table (memo_table);
@@ -842,7 +842,7 @@ struct get_selected_uids_closure {
 
 /* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
 static void
-add_uid_cb (int model_row, gpointer data)
+add_uid_cb (gint model_row, gpointer data)
 {
 	struct get_selected_uids_closure *closure;
 	ECalModelComponent *comp_data;
@@ -893,7 +893,7 @@ void
 e_memo_table_delete_selected (EMemoTable *memo_table)
 {
 	ETable *etable;
-	int n_selected;
+	gint n_selected;
 	ECalModelComponent *comp_data;
 	ECalComponent *comp = NULL;
 
@@ -988,7 +988,7 @@ clipboard_get_calendar_cb (GtkClipboard *clipboard,
 
 /* callback for e_table_selected_row_foreach */
 static void
-copy_row_cb (int model_row, gpointer data)
+copy_row_cb (gint model_row, gpointer data)
 {
 	EMemoTable *memo_table;
 	ECalModelComponent *comp_data;
@@ -1030,7 +1030,7 @@ e_memo_table_copy_clipboard (EMemoTable *memo_table)
 {
 	ETable *etable;
 	GtkClipboard *clipboard;
-	char *comp_str;
+	gchar *comp_str;
 
 	g_return_if_fail (E_IS_MEMO_TABLE (memo_table));
 
@@ -1059,7 +1059,7 @@ static void
 clipboard_get_calendar_data (EMemoTable *memo_table, const gchar *text)
 {
 	icalcomponent *icalcomp;
-	char *uid;
+	gchar *uid;
 	ECalComponent *comp;
 	ECal *client;
 	ECalModel *model;
@@ -1125,7 +1125,7 @@ clipboard_get_calendar_data (EMemoTable *memo_table, const gchar *text)
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomp);
 		uid = e_cal_component_gen_uid ();
-		e_cal_component_set_uid (comp, (const char *) uid);
+		e_cal_component_set_uid (comp, (const gchar *) uid);
 		free (uid);
 
 		e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL);
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index cbfc13eb87..3ac375abba 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -73,7 +73,7 @@ struct _EMemosPrivate {
 	GtkWidget *preview;
 
 	gchar *current_uid;
-	char *sexp;
+	gchar *sexp;
 
 	/* View instance and the view menus handler */
 	GalViewInstance *view_instance;
@@ -102,7 +102,7 @@ G_DEFINE_TYPE (EMemos, e_memos, GTK_TYPE_TABLE)
 
 /* Callback used when the sexp in the search bar changes */
 static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
+search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data)
 {
 	EMemos *memos;
 	EMemosPrivate *priv;
@@ -120,7 +120,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer
 
 /* Callback used when the selected category in the search bar changes */
 static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
+search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data)
 {
 	EMemos *memos;
 	EMemosPrivate *priv;
@@ -283,7 +283,7 @@ categories_changed_cb (gpointer object, gpointer user_data)
 	cat_array = g_ptr_array_new ();
 	cat_list = e_categories_get_list ();
 	while (cat_list != NULL) {
-		if (e_categories_is_searchable ((const char *) cat_list->data))
+		if (e_categories_is_searchable ((const gchar *) cat_list->data))
 			g_ptr_array_add (cat_array, cat_list->data);
 		cat_list = g_list_remove (cat_list, cat_list->data);
 	}
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index 7b484830fd..2c0f69f87d 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -52,7 +52,7 @@ struct _EMemosClass {
 	GtkTableClass parent_class;
 
 	/* Notification signals */
-	void (* selection_changed) (EMemos *memos, int n_selected);
+	void (* selection_changed) (EMemos *memos, gint n_selected);
         void (* source_added)      (EMemos *memos, ESource *source);
         void (* source_removed)    (EMemos *memos, ESource *source);
 };
diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c
index ccd9a2078d..d9b2192ad2 100644
--- a/calendar/gui/e-mini-calendar-config.c
+++ b/calendar/gui/e-mini-calendar-config.c
@@ -146,7 +146,7 @@ e_mini_calendar_config_get_calendar (EMiniCalendarConfig *mini_config)
 static void
 set_week_start (ECalendar *mini_cal)
 {
-	int week_start_day;
+	gint week_start_day;
 
 	week_start_day = calendar_config_get_week_start_day ();
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index e70e90a29f..9a5a894f4c 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -80,7 +80,7 @@ struct _ETasksPrivate {
 	GtkWidget *preview;
 
 	gchar *current_uid;
-	char *sexp;
+	gchar *sexp;
 	guint update_timeout;
 
 	GList *notifications;
@@ -89,7 +89,7 @@ struct _ETasksPrivate {
 static void setup_widgets (ETasks *tasks);
 static void e_tasks_destroy (GtkObject *object);
 
-static void backend_error_cb (ECal *client, const char *message, gpointer data);
+static void backend_error_cb (ECal *client, const gchar *message, gpointer data);
 
 /* Signal IDs */
 enum {
@@ -105,7 +105,7 @@ G_DEFINE_TYPE (ETasks, e_tasks, GTK_TYPE_TABLE)
 
 /* Callback used when the selected category in the search bar changes */
 static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
+search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data)
 {
 	ETasks *tasks;
 	ETasksPrivate *priv;
@@ -124,7 +124,7 @@ search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category,
  * This function is called from e_table_selected_row_foreach.
  **/
 static void
-get_selected_components_cb (int model_row, gpointer data)
+get_selected_components_cb (gint model_row, gpointer data)
 {
 	struct AffectedComponents *ac = (struct AffectedComponents *) data;
 
@@ -181,7 +181,7 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 	comp_data = (ECalModelComponent *) data;
 
 	if (list && comp_data) {
-		char *comp_str;
+		gchar *comp_str;
 		icalcomponent *vcal;
 
 		vcal = e_cal_util_new_top_level ();
@@ -191,7 +191,7 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 		comp_str = icalcomponent_as_ical_string_r (vcal);
 		if (comp_str) {
 			ESource *source = e_cal_get_source (comp_data->client);
-			const char *source_uid = e_source_peek_uid (source);
+			const gchar *source_uid = e_source_peek_uid (source);
 
 			*list = g_slist_prepend (*list, g_strdup_printf ("%s\n%s", source_uid, comp_str));
 
@@ -206,8 +206,8 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 
 static void
 table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
+		     gint                 row,
+		     gint                 col,
 		     GdkDragContext     *context,
 		     GtkSelectionData   *selection_data,
 		     guint               info,
@@ -236,8 +236,8 @@ table_drag_data_get (ETable             *table,
 /*
 static void
 table_drag_begin (ETable         *table,
-		  int             row,
-		  int             col,
+		  gint             row,
+		  gint             col,
 		  GdkDragContext *context,
 		  ETasks         *tasks)
 {
@@ -247,8 +247,8 @@ table_drag_begin (ETable         *table,
 
 static void
 table_drag_end (ETable         *table,
-		int             row,
-		int             col,
+		gint             row,
+		gint             col,
 		GdkDragContext *context,
 		ETasks         *tasks)
 {
@@ -258,8 +258,8 @@ table_drag_end (ETable         *table,
 
 static void
 table_drag_data_delete (ETable         *table,
-			int             row,
-			int             col,
+			gint             row,
+			gint             col,
 			GdkDragContext *context,
 			ETasks         *tasks)
 {
@@ -493,11 +493,11 @@ e_tasks_destroy (GtkObject *object)
 }
 
 static void
-set_status_message (ETasks *tasks, const char *message, ...)
+set_status_message (ETasks *tasks, const gchar *message, ...)
 {
 	ETasksPrivate *priv;
 	va_list args;
-	char sz[2048], *msg_string = NULL;
+	gchar sz[2048], *msg_string = NULL;
 
 	if (message) {
 		va_start (args, message);
@@ -548,7 +548,7 @@ e_tasks_new_task			(ETasks		*tasks)
 	ETasksPrivate *priv;
 	CompEditor *editor;
 	ECalComponent *comp;
-	const char *category;
+	const gchar *category;
 	ECal *ecal;
 	guint32 flags = 0;
 
@@ -581,7 +581,7 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
 	ETasksPrivate *priv;
 	ECal *client;
 	ECalModel *model;
-	const char *uid;
+	const gchar *uid;
 
 	g_return_val_if_fail (tasks != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);
@@ -650,7 +650,7 @@ void
 e_tasks_delete_completed (ETasks *tasks)
 {
 	ETasksPrivate *priv;
-	char *sexp;
+	gchar *sexp;
 	GList *l;
 
 	g_return_if_fail (tasks != NULL);
@@ -693,9 +693,9 @@ e_tasks_delete_completed (ETasks *tasks)
 
 void
 e_tasks_open_task_id (ETasks *tasks,
-		      const char *src_uid,
-		      const char *comp_uid,
-		      const char *comp_rid)
+		      const gchar *src_uid,
+		      const gchar *comp_uid,
+		      const gchar *comp_rid)
 {
 	ECal *client = NULL;
 	GList *l;
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 578da81625..628c34ace1 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -52,7 +52,7 @@ struct _ETasksClass {
 	GtkTableClass parent_class;
 
 	/* Notification signals */
-	void (* selection_changed) (ETasks *tasks, int n_selected);
+	void (* selection_changed) (ETasks *tasks, gint n_selected);
         void (* source_added)      (ETasks *tasks, ESource *source);
         void (* source_removed)    (ETasks *tasks, ESource *source);
 };
@@ -68,9 +68,9 @@ gboolean   e_tasks_remove_todo_source (ETasks *tasks, ESource *source);
 gboolean   e_tasks_set_default_source (ETasks *tasks, ESource *source);
 void       e_tasks_open_task         (ETasks		*tasks);
 void       e_tasks_open_task_id      (ETasks		*tasks,
-				      const char *src_uid,
-				      const char *comp_uid,
-				      const char *comp_rid);
+				      const gchar *src_uid,
+				      const gchar *comp_uid,
+				      const gchar *comp_rid);
 void       e_tasks_new_task          (ETasks            *tasks);
 void       e_tasks_delete_completed  (ETasks            *tasks);
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 2be6548757..2d0cf1ab5d 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -296,8 +296,8 @@ static void
 e_timezone_entry_set_entry (ETimezoneEntry *tentry)
 {
 	ETimezoneEntryPrivate *priv;
-	const char *display_name;
-	char *name_buffer;
+	const gchar *display_name;
+	gchar *name_buffer;
 
 	priv = tentry->priv;
 
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index 8a0c0de984..c981be8f53 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -146,7 +146,7 @@ e_week_view_config_get_view (EWeekViewConfig *view_config)
 static void
 set_week_start (EWeekView *week_view)
 {
-	int week_start_week;
+	gint week_start_week;
 
 	week_start_week = calendar_config_get_week_start_day ();
 
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 458d8e7e3c..a8123bdf53 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -828,11 +828,11 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
 
 	/* draw categories icons */
 	for (elem = categories_list; elem; elem = elem->next) {
-		char *category;
+		gchar *category;
 		GdkPixmap *pixmap = NULL;
 		GdkBitmap *mask = NULL;
 
-		category = (char *) elem->data;
+		category = (gchar *) elem->data;
 		if (!e_categories_config_get_icon_for (category, &pixmap, &mask))
 			continue;
 
@@ -944,7 +944,7 @@ e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
    This is needed so that we get button/motion events. */
 static double
 e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
-			      int cx, int cy,
+			      gint cx, gint cy,
 			      GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 37a2706f2a..134b318118 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -334,8 +334,8 @@ e_week_view_layout_get_day_position	(gint		 day,
 		#define wk(x) ( ( working_days & (days [ ((x) + display_start_day) % 7 ]) ) ? 1 : 0)
 		CalWeekdays days [] = {CAL_MONDAY, CAL_TUESDAY, CAL_WEDNESDAY, CAL_THURSDAY, CAL_FRIDAY, CAL_SATURDAY, CAL_SUNDAY};
 		CalWeekdays working_days;
-		int arr[4] = {1, 1, 1, 1};
-		int edge, i, wd, m, M;
+		gint arr[4] = {1, 1, 1, 1};
+		gint edge, i, wd, m, M;
 		gboolean any = TRUE;
 
 		g_return_if_fail (day < 7);
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index c2095dc90b..a0e7aae8b7 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -421,7 +421,7 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
    This is needed so that we get button/motion events. */
 static double
 e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			     int cx, int cy,
+			     gint cx, gint cy,
 			     GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index e23f2a675f..7a5ae4bf9b 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -269,7 +269,7 @@ e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
    This is needed so that we get button/motion events. */
 static double
 e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
-			       int cx, int cy,
+			       gint cx, gint cy,
 			       GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index f2082c5f11..04fa91006a 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -301,8 +301,8 @@ process_component (EWeekView *week_view, ECalModelComponent *comp_data)
 	ECalComponent *comp = NULL;
 	AddEventData add_event_data;
 	/* rid is never used in this function? */
-	const char *uid;
-	char *rid = NULL;
+	const gchar *uid;
+	gchar *rid = NULL;
 
 	/* If we don't have a valid date set yet, just return. */
 	if (!g_date_valid (&week_view->first_day_shown))
@@ -332,13 +332,13 @@ process_component (EWeekView *week_view, ECalModelComponent *comp_data)
 }
 
 static void
-update_row (EWeekView *week_view, int row)
+update_row (EWeekView *week_view, gint row)
 {
 	ECalModelComponent *comp_data;
 	ECalModel *model;
 	gint event_num;
-	const char *uid;
-	char *rid = NULL;
+	const gchar *uid;
+	gchar *rid = NULL;
 
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
 	comp_data = e_cal_model_get_component_at (model, row);
@@ -365,7 +365,7 @@ update_row (EWeekView *week_view, int row)
 }
 
 static void
-model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
+model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data)
 {
 	EWeekView *week_view = E_WEEK_VIEW (user_data);
 
@@ -378,7 +378,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
 }
 
 static void
-model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
+model_cell_changed_cb (ETableModel *etm, gint col, gint row, gpointer user_data)
 {
 	EWeekView *week_view = E_WEEK_VIEW (user_data);
 
@@ -390,11 +390,11 @@ model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data)
 }
 
 static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data)
+model_rows_inserted_cb (ETableModel *etm, gint row, gint count, gpointer user_data)
 {
 	EWeekView *week_view = E_WEEK_VIEW (user_data);
 	ECalModel *model;
-	int i;
+	gint i;
 
 	if (!E_CALENDAR_VIEW (week_view)->in_focus) {
 		return;
@@ -430,8 +430,8 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 
 	for (l = list; l != NULL; l = g_slist_next (l)) {
 		gint event_num;
-		const char *uid;
-		char *rid = NULL;
+		const gchar *uid;
+		gchar *rid = NULL;
 		ECalModelComponent *comp_data = l->data;
 
 		uid = icalcomponent_get_uid (comp_data->icalcomp);
@@ -592,7 +592,7 @@ e_week_view_init (EWeekView *week_view)
 			  G_CALLBACK (e_week_view_on_motion), week_view);
 
 	/* Create the buttons to jump to each days. */
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
+	pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm);
 
 	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
 		week_view->jump_buttons[i] = gnome_canvas_item_new
@@ -1968,7 +1968,7 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view,
 	for (event_num = week_view->events->len - 1;
 	     event_num >= 0;
 	     event_num--) {
-		const char *u;
+		const gchar *u;
 
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
@@ -2567,8 +2567,8 @@ e_week_view_ensure_events_sorted (EWeekView *week_view)
 
 
 gint
-e_week_view_event_sort_func (const void *arg1,
-			     const void *arg2)
+e_week_view_event_sort_func (gconstpointer arg1,
+			     gconstpointer arg2)
 {
 	EWeekViewEvent *event1, *event2;
 
@@ -2654,7 +2654,7 @@ e_week_view_reshape_events (EWeekView *week_view)
 }
 
 static EWeekViewEvent *
-tooltip_get_view_event (EWeekView *week_view, int day, int event_num)
+tooltip_get_view_event (EWeekView *week_view, gint day, gint event_num)
 {
 	EWeekViewEvent *pevent;
 
@@ -2666,7 +2666,7 @@ tooltip_get_view_event (EWeekView *week_view, int day, int event_num)
 static void
 tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
 {
-	int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
+	gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 	guint timeout;
 
@@ -2692,7 +2692,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
    	          GdkEvent *event,
 		  EWeekView *view)
 {
-	int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
+	gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 
 	pevent = tooltip_get_view_event (view, -1, event_num);
@@ -2854,7 +2854,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       NULL);
 
 		if (free_text)
-			g_free ((gchar*)summary);
+			g_free ((gchar *)summary);
 
 		if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp)) {
@@ -3111,7 +3111,7 @@ e_week_view_stop_editing_event (EWeekView *week_view)
 static void
 cancel_editing (EWeekView *week_view)
 {
-	int event_num, span_num;
+	gint event_num, span_num;
 	EWeekViewEvent *event;
 	EWeekViewEventSpan *span;
 	const gchar *summary;
@@ -3131,7 +3131,7 @@ cancel_editing (EWeekView *week_view)
 	g_object_set (G_OBJECT (span->text_item), "text", summary ? summary : "", NULL);
 
 	if (free_text)
-		g_free ((gchar*)summary);
+		g_free ((gchar *)summary);
 
 	/* Stop editing */
 	e_week_view_stop_editing_event (week_view);
@@ -3144,7 +3144,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 {
 	EWeekViewEvent *event;
 	gint event_num, span_num;
-	int nevent = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
+	gint nevent = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 
 	pevent = tooltip_get_view_event (week_view, -1, nevent);
@@ -3273,7 +3273,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 	case GDK_ENTER_NOTIFY:
 	{
 		ECalendarViewEventData *data;
-		int nspan;
+		gint nspan;
 
 		if (!e_week_view_find_event_from_item (week_view,
 						       item,
@@ -3554,7 +3554,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 	ECalComponent *comp;
 	ECalComponentText summary;
 	ECal *client;
-	const char *uid;
+	const gchar *uid;
 	gboolean on_server;
 
 	/* Note: the item we are passed here isn't reliable, so we just stop
@@ -3638,7 +3638,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 				if (mod == CALOBJ_MOD_THIS) {
 					ECalComponentDateTime dt;
 					struct icaltimetype tt;
-					char *tzid;
+					gchar *tzid;
 
 					e_cal_component_get_dtstart (comp, &dt);
 					if (dt.value->zone) {
@@ -3755,8 +3755,8 @@ e_week_view_find_event_from_uid (EWeekView	  *week_view,
 
 	num_events = week_view->events->len;
 	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u;
-		char *r = NULL;
+		const gchar *u;
+		gchar *r = NULL;
 
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);
@@ -4048,7 +4048,7 @@ e_week_view_add_new_event_in_selected_range (EWeekView *week_view, const gchar *
 	ECalComponentDateTime date;
 	struct icaltimetype itt;
 	time_t dtstart, dtend;
-	const char *uid;
+	const gchar *uid;
 	AddEventData add_event_data;
 	gboolean read_only = TRUE;
 	EWeekViewEvent *wvevent;
@@ -4367,14 +4367,14 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item,
 
 		if (focus_event->in) {
 			week_view->focused_jump_button = day;
-			pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm_focused);
+			pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm_focused);
 			gnome_canvas_item_set (week_view->jump_buttons[day],
 					       "GnomeCanvasPixbuf::pixbuf",
 					       pixbuf, NULL);
 		}
 		else {
 			week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
-			pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
+			pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm);
 			gnome_canvas_item_set (week_view->jump_buttons[day],
 					       "GnomeCanvasPixbuf::pixbuf",
 					       pixbuf, NULL);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 7e0043d12a..9d28807ec1 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -129,9 +129,9 @@ struct _GnomeCalendarPrivate {
 
 	/* Calendar query for the date navigator */
 	GList       *dn_queries; /* list of CalQueries */
-	char        *sexp;
-	char        *todo_sexp;
-	char        *memo_sexp;
+	gchar        *sexp;
+	gchar        *todo_sexp;
+	gchar        *memo_sexp;
 	guint        update_timeout;
 	guint        update_marcus_bains_line_timeout;
 
@@ -157,7 +157,7 @@ struct _GnomeCalendarPrivate {
 	guint	     day_selected_id;
 
 	/* Our current week start */
-	int week_start;
+	gint week_start;
 
 	/* Our current timezone. */
 	icaltimezone *zone;
@@ -549,7 +549,7 @@ static void
 get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time)
 {
 	GnomeCalendarPrivate *priv;
-	int shown, display_start;
+	gint shown, display_start;
 	GDate date;
 	gint weekday, first_day, last_day, days_shown, i;
 	gboolean has_working_days = FALSE;
@@ -681,12 +681,12 @@ get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_t
 }
 
 /* Adjusts a given query sexp with the time range of the date navigator */
-static char *
-adjust_e_cal_view_sexp (GnomeCalendar *gcal, const char *sexp)
+static gchar *
+adjust_e_cal_view_sexp (GnomeCalendar *gcal, const gchar *sexp)
 {
 	time_t start_time, end_time;
-	char *start, *end;
-	char *new_sexp;
+	gchar *start, *end;
+	gchar *new_sexp;
 
 	get_date_navigator_range (gcal, &start_time, &end_time);
 	if (start_time == -1 || end_time == -1)
@@ -717,7 +717,7 @@ update_query_async (struct _date_query_msg *msg)
 	GnomeCalendar *gcal = msg->gcal;
 	GnomeCalendarPrivate *priv;
 	ECalView *old_query;
-	char *real_sexp;
+	gchar *real_sexp;
 	GList *l;
 
 	priv = gcal->priv;
@@ -811,10 +811,10 @@ update_query (GnomeCalendar *gcal)
 }
 
 static void
-set_search_query (GnomeCalendar *gcal, const char *sexp)
+set_search_query (GnomeCalendar *gcal, const gchar *sexp)
 {
 	GnomeCalendarPrivate *priv;
-	int i;
+	gint i;
 	time_t start, end;
 
 	g_return_if_fail (gcal != NULL);
@@ -879,10 +879,10 @@ get_current_time (ECalendarItem *calitem, gpointer data)
 
 /* Callback used when the sexp changes in the calendar search bar */
 static void
-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
+search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data)
 {
 	GnomeCalendar *gcal;
-	const char *d_sexp = "occur-in-time-range?";
+	const gchar *d_sexp = "occur-in-time-range?";
 
 	gcal = GNOME_CALENDAR (data);
 
@@ -901,12 +901,12 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer
 
 /* Callback used when the selected category in the search bar changes */
 static void
-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)
+search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data)
 {
 	GnomeCalendar *gcal;
 	GnomeCalendarPrivate *priv;
 	ECalModel *model;
-	int i;
+	gint i;
 
 	gcal = GNOME_CALENDAR (data);
 	priv = gcal->priv;
@@ -1058,7 +1058,7 @@ update_todo_view_async (struct _mupdate_todo_msg *msg)
 	GnomeCalendar *gcal;
 	GnomeCalendarPrivate *priv;
 	ECalModel *model;
-	char *sexp = NULL;
+	gchar *sexp = NULL;
 
 	g_return_if_fail (msg != NULL);
 
@@ -1109,7 +1109,7 @@ update_memo_view (GnomeCalendar *gcal)
 	GnomeCalendarPrivate *priv;
 	ECalModel *model, *view_model;
 	time_t start, end;
-	char *iso_start, *iso_end;
+	gchar *iso_start, *iso_end;
 
 	priv = gcal->priv;
 
@@ -1294,7 +1294,7 @@ categories_changed_cb (gpointer object, gpointer user_data)
 	cat_array = g_ptr_array_new ();
 	cat_list = e_categories_get_list ();
 	while (cat_list != NULL) {
-		if (e_categories_is_searchable ((const char *) cat_list->data))
+		if (e_categories_is_searchable ((const gchar *) cat_list->data))
 			g_ptr_array_add (cat_array, cat_list->data);
 		cat_list = g_list_remove (cat_list, cat_list->data);
 	}
@@ -1306,7 +1306,7 @@ categories_changed_cb (gpointer object, gpointer user_data)
 
 
 static void
-view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, GnomeCalendar *gcal)
+view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal)
 {
 	if (type == E_CAL_SOURCE_TYPE_EVENT)
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), message, percent);
@@ -1351,8 +1351,8 @@ setup_widgets (GnomeCalendar *gcal)
 	GtkWidget *vbox;
 	GtkWidget *label;
 	ECalModel *cal_model;
-	int i;
-	char *tmp;
+	gint i;
+	gchar *tmp;
 
 	priv = gcal->priv;
 
@@ -1587,7 +1587,7 @@ gnome_calendar_destroy (GtkObject *object)
 
 	if (priv) {
 		GList *l;
-		int i;
+		gint i;
 
 		e_categories_unregister_change_listener (G_CALLBACK (categories_changed_cb), gcal);
 
@@ -1682,7 +1682,7 @@ static void
 notify_selected_time_changed (GnomeCalendar *gcal)
 {
 	GnomeCalendarPrivate *priv;
-	int i;
+	gint i;
 
 	priv = gcal->priv;
 	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
@@ -1763,7 +1763,7 @@ void
 gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
 {
 	GnomeCalendarPrivate *priv;
-	int i;
+	gint i;
 
 	g_return_if_fail (gcal != NULL);
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
@@ -1804,7 +1804,7 @@ update_view_times (GnomeCalendar *gcal, time_t start_time)
 }
 
 static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
+gnome_calendar_direction (GnomeCalendar *gcal, gint direction)
 {
 	GnomeCalendarPrivate *priv;
 
@@ -1906,7 +1906,7 @@ static void
 set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_selected)
 {
 	GnomeCalendarPrivate *priv;
-	const char *view_id;
+	const gchar *view_id;
 
 	g_return_if_fail (gcal != NULL);
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
@@ -1974,7 +1974,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
 {
 	GnomeCalendarPrivate *priv;
 	gboolean preserve_day;
-	int i;
+	gint i;
 
 	priv = gcal->priv;
 
@@ -2137,7 +2137,7 @@ add_mclient (ECalModel *model, ECal *client)
 }
 
 static void
-non_intrusive_error_remove(GtkWidget *w, void *data)
+non_intrusive_error_remove(GtkWidget *w, gpointer data)
 {
 	g_hash_table_remove(non_intrusive_error_table, data);
 }
@@ -2172,7 +2172,7 @@ add_mclient (ECalModel *model, ECal *client)
 }
 
 static void
-non_intrusive_error_remove(GtkWidget *w, void *data)
+non_intrusive_error_remove(GtkWidget *w, gpointer data)
 {
 	g_hash_table_remove(non_intrusive_error_table, data);
 }
@@ -2184,7 +2184,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	ESource *source;
 	ECalModel *model;
 	ECalLoadState state;
-	char *msg;
+	gchar *msg;
 	GtkWidget *w = NULL;
 	gchar *id;
 
@@ -2333,7 +2333,7 @@ static gboolean
 open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of)
 {
 	GnomeCalendarPrivate *priv;
-	char *msg;
+	gchar *msg;
 	icaltimezone *zone;
 
 	priv = gcal->priv;
@@ -2354,11 +2354,11 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 
 /* Callback when we get an error message from the backend */
 static void
-backend_error_cb (ECal *client, const char *message, gpointer data)
+backend_error_cb (ECal *client, const gchar *message, gpointer data)
 {
 	GnomeCalendar *gcal;
 	GtkDialog *dialog;
-	char *uristr;
+	gchar *uristr;
 	gchar *id;
 
 	gcal = GNOME_CALENDAR (data);
@@ -2388,7 +2388,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 	GnomeCalendar *gcal;
 	GnomeCalendarPrivate *priv;
 	ESource *source;
-	const char *id;
+	const gchar *id;
 	GtkWidget *w = NULL;
 
 	gcal = GNOME_CALENDAR (data);
@@ -2575,7 +2575,7 @@ gnome_calendar_remove_source (GnomeCalendar *gcal, ESource *source)
 }
 
 gboolean
-gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, const char *uid)
+gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, const gchar *uid)
 {
 	GnomeCalendarPrivate *priv;
 	ECal *client;
@@ -2715,7 +2715,7 @@ gnome_calendar_new_task		(GnomeCalendar *gcal, time_t *dtstart, time_t *dtend)
 	CompEditor *editor;
 	ECalComponent *comp;
 	icalcomponent *icalcomp;
-	const char *category;
+	const gchar *category;
 	guint32 flags = 0;
 	ECalComponentDateTime dt;
 	struct icaltimetype itt;
@@ -3149,7 +3149,7 @@ void
 gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 {
 	GnomeCalendarPrivate *priv;
-	char *sexp, *start, *end;
+	gchar *sexp, *start, *end;
 	GList *l;
 
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
@@ -3184,7 +3184,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 
 			/* FIXME write occur-before and occur-after
 			 * sexp funcs so we don't have to use the max
-			 * int */
+			 * gint */
 			if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER))
 				e_cal_generate_instances_for_object (client, m->data,
 							     older_than, G_MAXINT32,
@@ -3193,11 +3193,11 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 
 			/* FIXME Better error handling */
 			if (remove) {
-				const char *uid = icalcomponent_get_uid (m->data);
+				const gchar *uid = icalcomponent_get_uid (m->data);
 				GError *error = NULL;
 
 				if (e_cal_util_component_is_instance (m->data) || e_cal_util_component_has_recurrences (m->data)) {
-					char *rid = NULL;
+					gchar *rid = NULL;
 					struct icaltimetype recur_id = icalcomponent_get_recurrenceid (m->data);
 
 					if (!icaltime_is_null_time (recur_id) )
@@ -3261,9 +3261,9 @@ ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal)
 
 void
 gnome_calendar_edit_appointment (GnomeCalendar *gcal,
-				 const char* src_uid,
-				 const char* comp_uid,
-				 const char* comp_rid)
+				 const gchar * src_uid,
+				 const gchar * comp_uid,
+				 const gchar * comp_rid)
 {
 	ECal *client = NULL;
 	GList *l;
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index a483260d2c..3b9461565b 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -112,7 +112,7 @@ ECal *gnome_calendar_get_default_client    (GnomeCalendar *gcal);
 
 gboolean   gnome_calendar_add_source      (GnomeCalendar *gcal, ESource *source);
 gboolean   gnome_calendar_remove_source   (GnomeCalendar *gcal, ESource *source);
-gboolean   gnome_calendar_remove_source_by_uid   (GnomeCalendar *gcal, const char *uid);
+gboolean   gnome_calendar_remove_source_by_uid   (GnomeCalendar *gcal, const gchar *uid);
 gboolean   gnome_calendar_set_default_source (GnomeCalendar *gcal, ESource *source);
 
 void       gnome_calendar_next             	(GnomeCalendar *gcal);
@@ -179,9 +179,9 @@ void       gnome_calendar_purge                 (GnomeCalendar  *gcal,
 
 /* Direct calendar component operations */
 void       gnome_calendar_edit_appointment      (GnomeCalendar *gcal,
-						 const char* src_uid,
-						 const char* comp_uid,
-						 const char* comp_rid);
+						 const gchar * src_uid,
+						 const gchar * comp_uid,
+						 const gchar * comp_rid);
 
 void gnome_calendar_emit_user_created_signal  (gpointer instance, GnomeCalendar *gcal, ECal *calendar);
 
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index cb4bb12bfd..dcbe643901 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -209,8 +209,8 @@ goto_dialog (GnomeCalendar *gcal)
 #if 0  /* KILL-BONOBO */
 	time_t start_time;
 	struct icaltimetype tt;
-	int b;
-	char *gladefile;
+	gint b;
+	gchar *gladefile;
 
 	if (dlg) {
 		return;
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index bf270de0af..065434e4af 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -85,7 +85,7 @@ gboolean
 itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test)
 {
 	ECalComponentOrganizer organizer;
-	const char *strip;
+	const gchar *strip;
 	gboolean user_org = FALSE;
 
 	if (!e_cal_component_has_organizer (comp) || (!skip_cap_test && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)))
@@ -97,7 +97,7 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
   		strip = itip_strip_mailto (organizer.value);
 
  		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
- 			char *email = NULL;
+ 			gchar *email = NULL;
 
   			if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
 				g_free (email);
@@ -125,7 +125,7 @@ gboolean
 itip_sentby_is_user (ECalComponent *comp, ECal *client)
 {
 	ECalComponentOrganizer organizer;
-	const char *strip;
+	const gchar *strip;
 	gboolean user_sentby = FALSE;
 
 	if (!e_cal_component_has_organizer (comp) ||e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))
@@ -141,7 +141,7 @@ itip_sentby_is_user (ECalComponent *comp, ECal *client)
 }
 
 static ECalComponentAttendee *
-get_attendee (GSList *attendees, char *address)
+get_attendee (GSList *attendees, gchar *address)
 {
 	GSList *l;
 
@@ -160,7 +160,7 @@ get_attendee (GSList *attendees, char *address)
 }
 
 static ECalComponentAttendee *
-get_attendee_if_attendee_sentby_is_user (GSList *attendees, char *address)
+get_attendee_if_attendee_sentby_is_user (GSList *attendees, gchar *address)
 {
 	GSList *l;
 
@@ -175,8 +175,8 @@ get_attendee_if_attendee_sentby_is_user (GSList *attendees, char *address)
 	return NULL;
 }
 
-static char *
-html_new_lines_for (const char *string)
+static gchar *
+html_new_lines_for (const gchar *string)
 {
 	gchar **lines;
 	gchar *joined;
@@ -188,7 +188,7 @@ html_new_lines_for (const char *string)
 	return joined;
 }
 
-char *
+gchar *
 itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 {
 	GSList *attendees;
@@ -196,7 +196,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 	EAccount *a;
 	EIterator *it;
 	ECalComponentAttendee *attendee = NULL;
-	char *address = NULL;
+	gchar *address = NULL;
 
 	e_cal_component_get_attendee_list (comp, &attendees);
 	al = itip_addresses_get ();
@@ -208,7 +208,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 		attendee = get_attendee (attendees, address);
 
 		if (attendee) {
-			char *user_email = g_strdup (itip_strip_mailto (attendee->value));
+			gchar *user_email = g_strdup (itip_strip_mailto (attendee->value));
 
 			e_cal_component_free_attendee_list (attendees);
 			g_free (address);
@@ -218,7 +218,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 		attendee = get_attendee_if_attendee_sentby_is_user (attendees, address);
 
 		if (attendee) {
-			char *user_email = g_strdup (itip_strip_mailto (attendee->sentby));
+			gchar *user_email = g_strdup (itip_strip_mailto (attendee->sentby));
 
 			e_cal_component_free_attendee_list (attendees);
 			g_free (address);
@@ -239,7 +239,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 
 		attendee = get_attendee (attendees, a->id->address);
 		if (attendee) {
-			char *user_email = g_strdup (itip_strip_mailto (attendee->value));
+			gchar *user_email = g_strdup (itip_strip_mailto (attendee->value));
 
 			e_cal_component_free_attendee_list (attendees);
 			return user_email;
@@ -249,7 +249,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 		check the 'sentby' fields of the attendees if we can find the account */
 		attendee = get_attendee_if_attendee_sentby_is_user (attendees, a->id->address);
 		if (attendee) {
-			char *user_email = g_strdup (itip_strip_mailto (attendee->sentby));
+			gchar *user_email = g_strdup (itip_strip_mailto (attendee->sentby));
 
 			e_cal_component_free_attendee_list (attendees);
 			return user_email;
@@ -278,10 +278,10 @@ itip_strip_mailto (const gchar *address)
 	return address;
 }
 
-static char *
+static gchar *
 get_label (struct icaltimetype *tt)
 {
-        char buffer[1000];
+        gchar buffer[1000];
         struct tm tmp_tm;
 
 	tmp_tm = icaltimetype_to_tm (tt);
@@ -305,7 +305,7 @@ static void
 foreach_tzid_callback (icalparameter *param, gpointer data)
 {
 	ItipUtilTZData *tz_data = data;
-	const char *tzid;
+	const gchar *tzid;
 	icaltimezone *zone = NULL;
 	icalcomponent *vtimezone_comp;
 
@@ -330,7 +330,7 @@ foreach_tzid_callback (icalparameter *param, gpointer data)
 		return;
 
 	icalcomponent_add_component (tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
-	g_hash_table_insert (tz_data->tzids, (char *)tzid, (char *)tzid);
+	g_hash_table_insert (tz_data->tzids, (gchar *)tzid, (gchar *)tzid);
 }
 
 static icalcomponent *
@@ -364,7 +364,7 @@ comp_toplevel_with_zones (ECalComponentItipMethod method, ECalComponent *comp, E
 }
 
 static gboolean
-users_has_attendee (GList *users, const char *address)
+users_has_attendee (GList *users, const gchar *address)
 {
 	GList *l;
 
@@ -383,7 +383,7 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp)
 	ECalComponentAttendee *attendee;
 	GSList *attendees;
 	gchar *from;
-	char *sender = NULL;
+	gchar *sender = NULL;
 
 	switch (method) {
 	case E_CAL_COMPONENT_METHOD_PUBLISH:
@@ -436,7 +436,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 	GPtrArray *array = NULL;
 	EDestination *destination;
 	gint len;
- 	char *sender = NULL;
+ 	gchar *sender = NULL;
 
 	union {
 		gpointer *pdata;
@@ -616,10 +616,10 @@ static gchar *
 comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
 {
 	ECalComponentText caltext;
-	const char *description, *prefix = NULL;
+	const gchar *description, *prefix = NULL;
 	GSList *alist, *l;
 	gchar *subject;
-	char *sender;
+	gchar *sender;
 	ECalComponentAttendee *a = NULL;
 
 	e_cal_component_get_summary (comp, &caltext);
@@ -770,7 +770,7 @@ comp_description (ECalComponent *comp)
 {
 	gchar *description;
         ECalComponentDateTime dt;
-        char *start = NULL, *end = NULL;
+        gchar *start = NULL, *end = NULL;
 
         switch (e_cal_component_get_vtype (comp)) {
         case E_CAL_COMPONENT_EVENT:
@@ -852,11 +852,11 @@ comp_limit_attendees (ECalComponent *comp)
 	     prop != NULL;
 	     prop = icalcomponent_get_next_property (icomp, ICAL_ATTENDEE_PROPERTY))
 	{
-		char *attendee;
-		char *attendee_text;
+		gchar *attendee;
+		gchar *attendee_text;
 		icalparameter *param;
-		const char *attendee_sentby;
-		char *attendee_sentby_text = NULL;
+		const gchar *attendee_sentby;
+		gchar *attendee_sentby_text = NULL;
 
 		/* If we've already found something, just erase the rest */
 		if (found) {
@@ -907,7 +907,7 @@ comp_sentby (ECalComponent *comp, ECal *client)
 {
 	ECalComponentOrganizer organizer;
 	GSList * attendees, *l;
-	char *user = NULL;
+	gchar *user = NULL;
 
 	e_cal_component_get_organizer (comp, &organizer);
 	if (!organizer.value) {
@@ -919,7 +919,7 @@ comp_sentby (ECalComponent *comp, ECal *client)
 		organizer.language = NULL;
 
 		e_cal_component_set_organizer (comp, &organizer);
-		g_free ((char *) organizer.value);
+		g_free ((gchar *) organizer.value);
 
 		return;
 	}
@@ -945,10 +945,10 @@ comp_sentby (ECalComponent *comp, ECal *client)
 
 		e_cal_component_set_organizer (comp, &organizer);
 
-		g_free ((char *)organizer.value);
-		g_free ((char *)organizer.sentby);
-		g_free ((char *)organizer.cn);
-		g_free ((char *)organizer.language);
+		g_free ((gchar *)organizer.value);
+		g_free ((gchar *)organizer.sentby);
+		g_free ((gchar *)organizer.cn);
+		g_free ((gchar *)organizer.language);
 	}
 }
 static ECalComponent *
@@ -958,7 +958,7 @@ comp_minimal (ECalComponent *comp, gboolean attendee)
 	icalcomponent *icomp, *icomp_clone;
 	icalproperty *prop;
 	ECalComponentOrganizer organizer;
-	const char *uid;
+	const gchar *uid;
 	GSList *comments;
 	struct icaltimetype itt;
 	ECalComponentRange recur_id;
@@ -1099,13 +1099,13 @@ comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *clien
 			ECalComponentAlarm *alarm;
 			ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
 
-			alarm = e_cal_component_get_alarm (clone, (const char *)l->data);
+			alarm = e_cal_component_get_alarm (clone, (const gchar *)l->data);
 			if (alarm) {
 				e_cal_component_alarm_get_action (alarm, &action);
 				e_cal_component_alarm_free (alarm);
 
 				if (action == E_CAL_COMPONENT_ALARM_PROCEDURE)
-					e_cal_component_remove_alarm (clone, (const char *)l->data);
+					e_cal_component_remove_alarm (clone, (const gchar *)l->data);
 			}
 		}
 
@@ -1200,7 +1200,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 	EDestination **destinations;
 	ECalComponent *comp = NULL;
 	icalcomponent *top_level = NULL;
-	char *ical_string = NULL;
+	gchar *ical_string = NULL;
 	gchar *from = NULL;
 	gchar *content_type = NULL;
 	gchar *subject = NULL;
@@ -1337,7 +1337,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	GList *users = NULL;
 	gchar *from;
 	gchar *subject;
-	char *ical_string = NULL;
+	gchar *ical_string = NULL;
 	gboolean retval = FALSE;
 
 	/* Tidy up the comp */
@@ -1369,12 +1369,12 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){
 
 		GString *body;
-		char *orig_from = NULL;
-		const char *description = NULL;
-		char *subject = NULL;
-		const char *location = NULL;
-		char *time = NULL;
-		char *html_description = NULL;
+		gchar *orig_from = NULL;
+		const gchar *description = NULL;
+		gchar *subject = NULL;
+		const gchar *location = NULL;
+		gchar *time = NULL;
+		gchar *html_description = NULL;
 		GSList *text_list = NULL;
 		ECalComponentOrganizer organizer;
 		ECalComponentText text;
@@ -1518,9 +1518,9 @@ itip_publish_begin (ECalComponent *pub_comp, ECal *client,
 }
 
 static void
-fb_sort (struct icalperiodtype *ipt, int fb_count)
+fb_sort (struct icalperiodtype *ipt, gint fb_count)
 {
-	int i,j;
+	gint i,j;
 
 	if (ipt == NULL || fb_count == 0)
 		return;
@@ -1549,9 +1549,9 @@ comp_fb_normalize (icalcomponent *icomp)
 {
 	icalcomponent *iclone;
 	icalproperty *prop, *p;
-	const char *uid,  *comment;
+	const gchar *uid,  *comment;
 	struct icaltimetype itt;
-	int fb_count, i = 0, j;
+	gint fb_count, i = 0, j;
 	struct icalperiodtype *ipt;
 
 	iclone = icalcomponent_new (ICAL_VFREEBUSY_COMPONENT);
@@ -1638,7 +1638,7 @@ itip_publish_comp (ECal *client, gchar *uri, gchar *username,
 	SoupSession *session;
 	SoupMessage *msg;
 	SoupURI *real_uri;
-	char *ical_string = NULL;
+	gchar *ical_string = NULL;
 
 	toplevel = e_cal_util_new_top_level ();
 	icalcomponent_set_method (toplevel, ICAL_METHOD_PUBLISH);
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 8dce8266ab..c01fdbc676 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -39,10 +39,10 @@ typedef enum {
 } ECalComponentItipMethod;
 
 struct CalMimeAttach {
-	char *filename;
-	char *content_type;
-	char *description;
-	char *encoded_data;
+	gchar *filename;
+	gchar *content_type;
+	gchar *description;
+	gchar *encoded_data;
 	gboolean disposition;
 	guint length;
 };
@@ -56,13 +56,13 @@ gboolean itip_sentby_is_user (ECalComponent *comp, ECal *client);
 
 const gchar *itip_strip_mailto (const gchar *address);
 
-char *itip_get_comp_attendee (ECalComponent *comp, ECal *client);
+gchar *itip_get_comp_attendee (ECalComponent *comp, ECal *client);
 
 gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp,
 			 ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users, gboolean strip_alarms);
 
-gboolean itip_publish_comp (ECal *client, gchar* uri, gchar* username,
-			    gchar* password, ECalComponent **pub_comp);
+gboolean itip_publish_comp (ECal *client, gchar * uri, gchar * username,
+			    gchar * password, ECalComponent **pub_comp);
 
 gboolean itip_publish_begin (ECalComponent *pub_comp, ECal *client,
 			     gboolean cloned, ECalComponent **clone);
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 44bc1350d0..c6a4dddd54 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -116,7 +116,7 @@ is_in_uids (GSList *uids, ESource *source)
 	GSList *l;
 
 	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
+		const gchar *uid = l->data;
 
 		if (!strcmp (uid, e_source_peek_uid (source)))
 			return TRUE;
@@ -143,7 +143,7 @@ source_selection_changed_cb (ESourceSelector *selector, MemosComponentView *comp
 		ESource *selected_source = l->data;
 
 		e_memos_add_memo_source (component_view->memos, selected_source);
-		uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
+		uids_selected = g_slist_append (uids_selected, (gchar *)e_source_peek_uid (selected_source));
 	}
 
 	e_source_selector_free_selection (component_view->source_selection);
@@ -178,7 +178,7 @@ selector_tree_data_dropped (ESourceSelector *selector,
 	components = cal_comp_selection_get_string_list (data);
 	success = components != NULL;
 	for (p = components; p && success; p = p->next) {
-		char *comp_str; /* do not free this! */
+		gchar *comp_str; /* do not free this! */
 
 		/* p->data is "source_uid\ncomponent_string" */
 		comp_str = strchr (p->data, '\n');
@@ -225,7 +225,7 @@ setup_create_ecal (MemosComponent *component, MemosComponentView *component_view
 {
 	MemosComponentPrivate *priv;
 	ESource *source = NULL;
-	char *uid;
+	gchar *uid;
 	guint not;
 
 	priv = component->priv;
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index ab657d8872..9fdf6f971b 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -45,9 +45,9 @@
  * Return value: TRUE if the string is empty, FALSE otherwise.
  **/
 gboolean
-string_is_empty (const char *value)
+string_is_empty (const gchar *value)
 {
-	const char *p;
+	const gchar *p;
 	gboolean empty;
 
 	empty = TRUE;
@@ -69,11 +69,11 @@ string_is_empty (const char *value)
 /**
  * get_uri_without_password
  */
-char *
-get_uri_without_password (const char *full_uri)
+gchar *
+get_uri_without_password (const gchar *full_uri)
 {
 	EUri *uri;
-	char *uristr;
+	gchar *uristr;
 
 	uri = e_uri_new (full_uri);
 	if (!uri)
@@ -98,15 +98,15 @@ get_position_in_array (GPtrArray *objects, gpointer item)
 	return -1;
 }
 
-char *
+gchar *
 calculate_time (time_t start, time_t end)
 {
 	time_t difference = end - start;
-	char *str;
-	int   hours, minutes;
-	char *times[4];
-	char *joined;
-	int   i;
+	gchar *str;
+	gint   hours, minutes;
+	gchar *times[4];
+	gchar *joined;
+	gint   i;
 
         i = 0;
 	if (difference >= 3600) {
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
index 8c328652bb..6d3133b58d 100644
--- a/calendar/gui/misc.h
+++ b/calendar/gui/misc.h
@@ -29,8 +29,8 @@
 #include <glib.h>
 #include <time.h>
 
-gboolean string_is_empty (const char *value);
-char    *get_uri_without_password (const char *uri);
+gboolean string_is_empty (const gchar *value);
+gchar    *get_uri_without_password (const gchar *uri);
 gint get_position_in_array (GPtrArray *objects, gpointer item);
-char * calculate_time (time_t start, time_t end);
+gchar * calculate_time (time_t start, time_t end);
 #endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 2a5cda4090..b087d6a4ea 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -72,7 +72,7 @@ struct PrintCalItem {
 static double
 evo_calendar_print_renderer_get_width (GtkPrintContext *context,
 				       PangoFontDescription *font,
-				       const char *text)
+				       const gchar *text)
 {
 	PangoLayout *layout;
 	gint layout_width, layout_height;
@@ -152,7 +152,7 @@ get_font_size (PangoFontDescription *font)
 
 /* The weird month of September 1752, where 3 Sep through 13 Sep were
    eliminated due to the Gregorian reformation. */
-static const int sept_1752[42] = {
+static const gint sept_1752[42] = {
 	 0,  0,  1,  2, 14, 15, 16,
 	17, 18, 19, 20, 21, 22, 23,
 	24, 25, 26, 27, 28, 29, 30,
@@ -189,12 +189,12 @@ struct psinfo
 
 	GArray *events;
 
-	int rows_per_cell;
-	int rows_per_compressed_cell;
-	int display_start_weekday;
+	gint rows_per_cell;
+	gint rows_per_compressed_cell;
+	gint display_start_weekday;
 	gboolean multi_week_view;
-	int weeks_shown;
-	int month;
+	gint weeks_shown;
+	gint month;
 	gboolean compress_weekend;
 	gboolean use_24_hour_format;
 	double row_height;
@@ -232,10 +232,10 @@ convert_timet_to_struct_tm (time_t time, icaltimezone *zone)
  * returned in the start and end arguments.
  */
 static void
-build_month (int month, int year, int *days, int *start, int *end)
+build_month (gint month, gint year, gint *days, gint *start, gint *end)
 {
-	int i;
-	int d_month, d_week, week_start_day;
+	gint i;
+	gint d_month, d_week, week_start_day;
 
 	/* Note that months are zero-based, so September is month 8 */
 
@@ -411,7 +411,7 @@ print_rectangle (GtkPrintContext *context,
    or PANGO_ALIGN_CENTER. */
 static double
 print_text (GtkPrintContext *context, PangoFontDescription *desc,
-            const char *text, PangoAlignment alignment,
+            const gchar *text, PangoAlignment alignment,
             gdouble x1, gdouble x2, gdouble y1, gdouble y2)
 {
 	PangoLayout *layout;
@@ -454,7 +454,7 @@ print_text (GtkPrintContext *context, PangoFontDescription *desc,
 
 /* gets/frees the font for you, as a normal font */
 static double
-print_text_size (GtkPrintContext *context, const char *text,
+print_text_size (GtkPrintContext *context, const gchar *text,
                  PangoAlignment alignment, gdouble x1, gdouble x2,
                  gdouble y1, gdouble y2)
 {
@@ -470,7 +470,7 @@ print_text_size (GtkPrintContext *context, const char *text,
 
 /* gets/frees the font for you, as a bold font */
 static double
-print_text_size_bold (GtkPrintContext *context, const char *text,
+print_text_size_bold (GtkPrintContext *context, const gchar *text,
                       PangoAlignment alignment, gdouble x1, gdouble x2,
                       gdouble y1, gdouble y2)
 {
@@ -485,7 +485,7 @@ print_text_size_bold (GtkPrintContext *context, const char *text,
 }
 
 static void
-titled_box (GtkPrintContext *context, const char *text,
+titled_box (GtkPrintContext *context, const gchar *text,
             PangoFontDescription *font, PangoAlignment alignment,
             gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2,
 	    gdouble linewidth)
@@ -522,11 +522,11 @@ static const gchar *days[] = {
 /*
   format the date 'nicely' and consistently for various headers
 */
-static char *
-format_date(time_t time, int flags, char *buffer, int bufflen)
+static gchar *
+format_date(time_t time, gint flags, gchar *buffer, gint bufflen)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	char fmt[64];
+	gchar fmt[64];
 	struct tm tm;
 
 	tm = *convert_timet_to_struct_tm (time, zone);
@@ -575,17 +575,17 @@ instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end, gp
 static void
 print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 		   gdouble x1, gdouble y1, gdouble x2, gdouble y2,
-		   int titleflags, time_t greystart, time_t greyend,
-		   int bordertitle)
+		   gint titleflags, time_t greystart, time_t greyend,
+		   gint bordertitle)
 {
 #if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	PangoFontDescription *font, *font_bold, *font_normal;
 	time_t now, next;
-	int x, y;
-	int days[42];
-	int day, weekday, week_start_day;
-	char buf[100];
+	gint x, y;
+	gint days[42];
+	gint day, weekday, week_start_day;
+	gchar buf[100];
 	struct tm tm;
 	double font_size, max_font_size;
 	double header_size, col_width, row_height, text_xpad, w;
@@ -773,10 +773,10 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	double yinc, y;
 	double width = DAY_VIEW_TIME_COLUMN_WIDTH;
 	double font_size, max_font_size, hour_font_size, minute_font_size;
-	char buf[20];
-	const char *minute;
+	gchar buf[20];
+	const gchar *minute;
 	gboolean use_24_hour;
-	int i, hour, row;
+	gint i, hour, row;
 	double hour_minute_x;
 	cairo_t *cr;
 
@@ -972,10 +972,10 @@ free_event_array (GArray *array)
 	g_array_set_size (array, 0);
 }
 
-static const char *
+static const gchar *
 get_type_as_string (icalparameter_cutype cutype)
 {
-	const char *res;
+	const gchar *res;
 
 	switch (cutype) {
 		case ICAL_CUTYPE_NONE:       res = NULL;            break;
@@ -989,10 +989,10 @@ get_type_as_string (icalparameter_cutype cutype)
 	return res;
 }
 
-static const char *
+static const gchar *
 get_role_as_string (icalparameter_role role)
 {
-	const char *res;
+	const gchar *res;
 
 	switch (role) {
 		case ICAL_ROLE_NONE:           res = NULL;                      break;
@@ -1024,7 +1024,7 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *
 
 		if (attendee && attendee->value && *attendee->value) {
 			GString *text;
-			const char *tmp;
+			const gchar *tmp;
 
 			tmp = get_type_as_string (attendee->cutype);
 			text = g_string_new (tmp ? tmp : "");
@@ -1093,8 +1093,8 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 {
 	double x1, x2, y1, y2;
 	double left_triangle_width = -1.0, right_triangle_width = -1.0;
-	char *text;
-	char buffer[32];
+	gchar *text;
+	gchar buffer[32];
 	struct tm date_tm;
 	double red, green, blue;
 
@@ -1172,8 +1172,8 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		 EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
 {
 	double x1, x2, y1, y2, col_width, row_height;
-	int start_offset, end_offset, start_row, end_row;
-	char *text, start_buffer[32], end_buffer[32];
+	gint start_offset, end_offset, start_row, end_row;
+	gchar *text, start_buffer[32], end_buffer[32];
 	gboolean display_times = FALSE;
 	struct tm date_tm;
 	double red, green, blue;
@@ -1395,11 +1395,11 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		       struct psinfo *psi,
 		       double x1, double x2, double y1, double y2,
 		       EWeekViewEvent *event, EWeekViewEventSpan *span,
-		       char *text, double red, double green, double blue)
+		       gchar *text, double red, double green, double blue)
 {
 	double left_triangle_width = -1.0, right_triangle_width = -1.0;
 	struct tm date_tm;
-	char buffer[32];
+	gchar buffer[32];
 
 	/* If the event starts before the first day of the span, draw a
 	   triangle to indicate it continues. */
@@ -1462,10 +1462,10 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		      struct psinfo *psi,
 		      double x1, double x2, double y1, double y2,
 		      EWeekViewEvent *event, EWeekViewEventSpan *span,
-		      char *text, double red, double green, double blue)
+		      gchar *text, double red, double green, double blue)
 {
 	struct tm date_tm;
-	char buffer[32];
+	gchar buffer[32];
 
 	date_tm.tm_year = 2001;
 	date_tm.tm_mon = 0;
@@ -1506,8 +1506,8 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 {
 	EWeekViewEventSpan *span;
 	gint span_num;
-	char *text;
-	int num_days, start_x, start_y, start_h, end_x, end_y, end_h;
+	gchar *text;
+	gint num_days, start_x, start_y, start_h, end_x, end_y, end_h;
 	double x1, x2, y1, y2;
 	double red, green, blue;
 	GdkPixbuf *pixbuf = NULL;
@@ -1597,12 +1597,12 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 			}
 
 			if (!pixbuf) {
-				const char **xpm = (const char **)jump_xpm;
+				const gchar **xpm = (const gchar **)jump_xpm;
 
 				/* this ugly thing is here only to get rid of compiler warning
 				   about unused 'jump_xpm_focused' */
 				if (pixbuf)
-					xpm = (const char **)jump_xpm_focused;
+					xpm = (const gchar **)jump_xpm_focused;
 
 				pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 			}
@@ -1631,7 +1631,7 @@ print_week_view_background (GtkPrintContext *context,
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	struct tm tm;
-	int day, day_x, day_y, day_h;
+	gint day, day_x, day_y, day_h;
 	double x1, x2, y1, y2, font_size, fillcolor;
 	const gchar *format_string;
 	gchar buffer[128];
@@ -1740,8 +1740,8 @@ print_week_summary_cb (ECalComponent *comp,
 
 static void
 print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
-		    time_t whence, gboolean multi_week_view, int weeks_shown,
-		    int month, double font_size,
+		    time_t whence, gboolean multi_week_view, gint weeks_shown,
+		    gint month, double font_size,
 		    double left, double right, double top, double bottom)
 {
 #if 0  /* KILL-BONOBO */
@@ -1847,12 +1847,12 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 static void
 print_year_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		    double left, double right, double top, double bottom,
-		    int morerows)
+		    gint morerows)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	double row_height, col_width, l, r, t, b;
 	time_t now;
-	int col, row, rows, cols;
+	gint col, row, rows, cols;
 
 	l = left;
 	t = top;
@@ -1896,10 +1896,10 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc
 	time_t date;
 	struct tm tm;
 	struct icaltimetype tt;
-	char buffer[100];
+	gchar buffer[100];
 	PangoFontDescription *font;
 	gboolean compress_weekend;
-	int columns, col, weekday, month;
+	gint columns, col, weekday, month;
 	double font_size, cell_width, x1, x2, y1, y2;
 
 	weekday = calendar_config_get_week_start_day ();
@@ -2005,7 +2005,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		ECalModelComponent *comp_data;
 		ECalComponent *comp;
 		ECalComponentText summary;
-		int model_row;
+		gint model_row;
 
 		model_row = e_table_view_to_model_row (table, row);
 		comp_data = e_cal_model_get_component_at (model, model_row);
@@ -2068,9 +2068,9 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
 	GtkPageSetup *setup;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	int i, days = 1;
+	gint i, days = 1;
 	double todo, l;
-	char buf[100];
+	gchar buf[100];
 	cairo_t *cr;
 	gdouble width, height;
 
@@ -2138,7 +2138,7 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	GtkPageSetup *setup;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	double l;
-	char buf[100];
+	gchar buf[100];
 	time_t when;
 	gint week_start_day;
 	struct tm tm;
@@ -2212,7 +2212,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
 	GtkPageSetup *setup;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	char buf[100];
+	gchar buf[100];
 	gdouble width, height;
 	double l;
 
@@ -2254,7 +2254,7 @@ static void
 print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
 	GtkPageSetup *setup;
-	char buf[100];
+	gchar buf[100];
 	cairo_t *cr;
 	gdouble width, height;
 
@@ -2289,7 +2289,7 @@ write_label_piece (time_t t,
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	struct tm *tmp_tm;
-	int len;
+	gint len;
 
 	tmp_tm = convert_timet_to_struct_tm (t, zone);
 
@@ -2306,7 +2306,7 @@ write_label_piece (time_t t,
 }
 
 static icaltimezone*
-get_zone_from_tzid (ECal *client, const char *tzid)
+get_zone_from_tzid (ECal *client, const gchar *tzid)
 {
 	icaltimezone *zone;
 
@@ -2330,7 +2330,7 @@ print_date_label (GtkPrintContext *context, ECalComponent *comp, ECal *client,
 	icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;
 	ECalComponentDateTime datetime;
 	time_t start = 0, end = 0, complete = 0, due = 0;
-	static char buffer[1024];
+	static gchar buffer[1024];
 
 	e_cal_component_get_dtstart (comp, &datetime);
 	if (datetime.value) {
@@ -2463,8 +2463,8 @@ print_comp_draw_real (GtkPrintOperation *operation,
 	GSList *desc, *l;
 	GSList *contact_list, *elem;
 
-	const char *title, *categories, *location;
-	char *categories_string, *location_string, *summary_string;
+	const gchar *title, *categories, *location;
+	gchar *categories_string, *location_string, *summary_string;
 	double header_size;
 	cairo_t *cr;
 	gdouble width, height, page_start;
@@ -2560,10 +2560,10 @@ print_comp_draw_real (GtkPrintOperation *operation,
 	/* For a VTODO we print the Status, Priority, % Complete and URL. */
 	if (vtype == E_CAL_COMPONENT_TODO) {
 		icalproperty_status status;
-		const char *status_string = NULL;
-		int *percent;
-		int *priority;
-		const char *url;
+		const gchar *status_string = NULL;
+		gint *percent;
+		gint *priority;
+		const gchar *url;
 
 		/* Status */
 		e_cal_component_get_status (comp, &status);
@@ -2586,7 +2586,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 			}
 
 			if (status_string) {
-				char *status_text = g_strdup_printf (_("Status: %s"),
+				gchar *status_text = g_strdup_printf (_("Status: %s"),
 							      status_string);
 				top = bound_text (context, font, status_text, -1,
 						  0.0, top, width, height, FALSE, &page_start, &pages);
@@ -2598,7 +2598,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 		/* Priority */
 		e_cal_component_get_priority (comp, &priority);
 		if (priority && *priority >= 0) {
-			char *priority_string, *pri_text;
+			gchar *priority_string, *pri_text;
 
 			priority_string = e_cal_util_priority_to_string (*priority);
 
@@ -2615,7 +2615,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 		/* Percent Complete */
 		e_cal_component_get_percent (comp, &percent);
 		if (percent) {
-			char *percent_string;
+			gchar *percent_string;
 
 			percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent);
 			e_cal_component_free_percent (percent);
@@ -2629,7 +2629,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 		/* URL */
 		e_cal_component_get_url (comp, &url);
 		if (url && url[0]) {
-			char *url_string = g_strdup_printf (_("URL: %s"),
+			gchar *url_string = g_strdup_printf (_("URL: %s"),
 							    url);
 
 			top = bound_text (context, font, url_string, -1,
@@ -2674,7 +2674,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
 	e_cal_component_get_description_list (comp, &desc);
 	for (l = desc; l != NULL; l = l->next) {
 		ECalComponentText *ptext = l->data;
-		const char *line, *next_line;
+		const gchar *line, *next_line;
 
 		for (line = ptext->value; line != NULL; line = next_line) {
 			next_line = strchr (line, '\n');
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index b57a50d6ce..272d822a2c 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -160,7 +160,7 @@ tag_calendar_by_client (ECalendar *ecal, ECal *client)
    the server. We need to try to use builtin timezones first, as they may not
    be added to the server yet. */
 static icaltimezone*
-resolve_tzid_cb (const char *tzid, gpointer data)
+resolve_tzid_cb (const gchar *tzid, gpointer data)
 {
 	ECal *client;
 	icaltimezone *zone = NULL;
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 533e071a7c..039ad9ac87 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -117,7 +117,7 @@ is_in_uids (GSList *uids, ESource *source)
 	GSList *l;
 
 	for (l = uids; l; l = l->next) {
-		const char *uid = l->data;
+		const gchar *uid = l->data;
 
 		if (!strcmp (uid, e_source_peek_uid (source)))
 			return TRUE;
@@ -144,7 +144,7 @@ update_uris_for_selection (TasksComponentView *component_view)
 		ESource *selected_source = l->data;
 
 		e_tasks_add_todo_source (component_view->tasks, selected_source);
-		uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
+		uids_selected = g_slist_append (uids_selected, (gchar *)e_source_peek_uid (selected_source));
 	}
 
 	e_source_selector_free_selection (component_view->source_selection);
@@ -180,7 +180,7 @@ update_uri_for_primary_selection (TasksComponentView *component_view)
 
 /* Callbacks.  */
 static void
-copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+copy_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TasksComponentView *component_view = data;
 	ESource *selected_source;
@@ -193,12 +193,12 @@ copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+delete_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TasksComponentView *component_view = data;
 	ESource *selected_source;
 	ECal *cal;
-	char *uri;
+	gchar *uri;
 
 	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
@@ -232,13 +232,13 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-new_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+new_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)));
 }
 
 static void
-rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+rename_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TasksComponentView *component_view = data;
 	ESourceSelector *selector;
@@ -248,7 +248,7 @@ rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+edit_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	TasksComponentView *component_view = data;
 	ESource *selected_source;
@@ -261,7 +261,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
+set_offline_availability (EPopup *ep, EPopupItem *pitem, gpointer data, const gchar *value)
 {
 	TasksComponentView *component_view = data;
 	ESource *selected_source;
@@ -274,13 +274,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
 }
 
 static void
-mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	set_offline_availability (ep, pitem, data, "0");
 }
 
 static void
-mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	set_offline_availability (ep, pitem, data, "1");
 }
@@ -300,7 +300,7 @@ static EPopupItem etc_source_popups[] = {
 };
 
 static void
-etc_source_popup_free(EPopup *ep, GSList *list, void *data)
+etc_source_popup_free(EPopup *ep, GSList *list, gpointer data)
 {
 	g_slist_free(list);
 }
@@ -311,7 +311,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve
 	ECalPopup *ep;
 	ECalPopupTargetSource *t;
 	GSList *menus = NULL;
-	int i;
+	gint i;
 	GtkMenu *menu;
 
 	/** @HookPoint-ECalPopup: Tasks Source Selector Context Menu
@@ -376,7 +376,7 @@ selector_tree_data_dropped (ESourceSelector *selector,
 	components = cal_comp_selection_get_string_list (data);
 	success = components != NULL;
 	for (p = components; p && success; p = p->next) {
-		char *comp_str; /* do not free this! */
+		gchar *comp_str; /* do not free this! */
 
 		/* p->data is "source_uid\ncomponent_string" */
 		comp_str = strchr (p->data, '\n');
@@ -422,7 +422,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
 {
 	TasksComponentPrivate *priv;
 	ESource *source = NULL;
-	char *uid;
+	gchar *uid;
 	guint not;
 
 	priv = component->priv;
@@ -622,16 +622,16 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
 }
 
 static void
-impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
+impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev)
 {
 	TasksComponent *tasks_component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
 	TasksComponentPrivate *priv;
 	GList *l;
 	TasksComponentView *view = NULL;
 
-	char *src_uid = NULL;
-	char *uid = NULL;
-	char *rid = NULL;
+	gchar *src_uid = NULL;
+	gchar *uid = NULL;
+	gchar *rid = NULL;
 
 	priv = tasks_component->priv;
 
@@ -643,8 +643,8 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
 
 	if (!strncmp (uri, "task:", 5)) {
 		EUri *euri = e_uri_new (uri);
-		const char *p;
-		char *header, *content;
+		const gchar *p;
+		gchar *header, *content;
 		size_t len, clen;
 
 		p = euri->query;
@@ -656,7 +656,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
 				if (p[len] != '=')
 					break;
 
-				header = (char *) p;
+				header = (gchar *) p;
 				header[len] = '\0';
 				p += len + 1;
 
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 1be68ac35e..e2d3ee6070 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -64,11 +64,11 @@ static void tasks_control_purge_cmd		(BonoboUIComponent	*uic,
 						 const char		*path);
 static void tasks_control_assign_cmd           (BonoboUIComponent      *uic,
                                                 gpointer               data,
-                                                const char             *path);
+                                                const gchar             *path);
 
 static void tasks_control_forward_cmd          (BonoboUIComponent      *uic,
                                                 gpointer               data,
-                                                const char             *path);
+                                                const gchar             *path);
 
 struct _tasks_sensitize_item {
 	const gchar *command;
@@ -79,7 +79,7 @@ static void
 sensitize_items(BonoboUIComponent *uic, struct _tasks_sensitize_item *items, guint32 mask)
 {
 	while (items->command) {
-		char command[32];
+		gchar command[32];
 
 		if (strlen(items->command)>=21) {
 			g_warning ("Size more than 21: %s\n", items->command);
@@ -114,7 +114,7 @@ static struct _tasks_sensitize_item tasks_sensitize_table[] = {
  * selected tasks.
  */
 void
-tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected)
+tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, gint n_selected)
 {
 	BonoboUIComponent *uic;
 	gboolean read_only = TRUE;
@@ -164,7 +164,7 @@ tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_s
 
 /* Callback used when the selection in the table changes */
 static void
-selection_changed_cb (ETasks *tasks, int n_selected, gpointer data)
+selection_changed_cb (ETasks *tasks, gint n_selected, gpointer data)
 {
 	BonoboControl *control;
 
@@ -197,11 +197,11 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 {
 	Bonobo_UIContainer remote_uih;
 	BonoboUIComponent *uic;
-	int n_selected;
+	gint n_selected;
 	ECalendarTable *cal_table;
 	ETable *etable;
 	gboolean state;
-	char *xmlfile;
+	gchar *xmlfile;
 
 	uic = bonobo_control_get_ui_component (control);
 	g_return_if_fail (uic != NULL);
@@ -295,7 +295,7 @@ static gboolean
 confirm_purge (ETasks *tasks)
 {
 	GtkWidget *dialog, *checkbox, *parent;
-	int button;
+	gint button;
 
 	if (!calendar_config_get_confirm_purge ())
 		return TRUE;
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index 9dd3a3946d..de98914e40 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -30,6 +30,6 @@
 BonoboControl *tasks_control_new                (void);
 void           tasks_control_activate           (BonoboControl *control, ETasks *tasks);
 void           tasks_control_deactivate         (BonoboControl *control, ETasks *tasks);
-void           tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected);
+void           tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, gint n_selected);
 
 #endif /* _TASKS_CONTROL_H_ */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 56a7386d4b..913144d4a7 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -48,14 +48,14 @@ struct _WeekdayPickerPrivate {
 	guint8 blocked_day_mask;
 
 	/* Day that defines the start of the week; 0 = Sunday, ..., 6 = Saturday */
-	int week_start_day;
+	gint week_start_day;
 
 	/* Current keyboard focus day */
-	int focus_day;
+	gint focus_day;
 
 	/* Metrics */
-	int font_ascent, font_descent;
-	int max_letter_width;
+	gint font_ascent, font_descent;
+	gint max_letter_width;
 
 	/* Components */
 	GnomeCanvasItem *boxes[7];
@@ -114,7 +114,7 @@ weekday_picker_class_init (WeekdayPickerClass *class)
 }
 
 static void
-day_clicked (WeekdayPicker *wp, int index)
+day_clicked (WeekdayPicker *wp, gint index)
 {
 	WeekdayPickerPrivate *priv = wp->priv;
 	guint8 day_mask;
@@ -172,7 +172,7 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 {
 	WeekdayPicker *wp;
 	WeekdayPickerPrivate *priv;
-	int i;
+	gint i;
 
 	wp = WEEKDAY_PICKER (data);
 	priv = wp->priv;
@@ -210,7 +210,7 @@ create_items (WeekdayPicker *wp)
 {
 	WeekdayPickerPrivate *priv;
 	GnomeCanvasGroup *parent;
-	int i;
+	gint i;
 
 	priv = wp->priv;
 
@@ -270,7 +270,7 @@ colorize_items (WeekdayPicker *wp)
 	GdkColor *outline, *focus_outline;
 	GdkColor *fill, *sel_fill;
 	GdkColor *text_fill, *sel_text_fill;
-	int i;
+	gint i;
 
 	priv = wp->priv;
 
@@ -284,7 +284,7 @@ colorize_items (WeekdayPicker *wp)
 	sel_text_fill = &GTK_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
 
 	for (i = 0; i < 7; i++) {
-		int day;
+		gint day;
 		GdkColor *f, *t, *o;
 
 		day = i + priv->week_start_day;
@@ -316,8 +316,8 @@ colorize_items (WeekdayPicker *wp)
 }
 
 /* Configures the items in the weekday picker by setting their attributes. */
-static char *
-get_day_text (int day_index)
+static gchar *
+get_day_text (gint day_index)
 {
 	GDateWeekday weekday;
 
@@ -331,9 +331,9 @@ static void
 configure_items (WeekdayPicker *wp)
 {
 	WeekdayPickerPrivate *priv;
-	int width, height;
-	int box_width;
-	int i;
+	gint width, height;
+	gint box_width;
+	gint i;
 
 	priv = wp->priv;
 
@@ -343,8 +343,8 @@ configure_items (WeekdayPicker *wp)
 	box_width = (width - 1) / 7;
 
 	for (i = 0; i < 7; i++) {
-		char *c;
-		int day;
+		gchar *c;
+		gint day;
 
 		day = i + priv->week_start_day;
 		if (day >= 7)
@@ -422,8 +422,8 @@ weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
 {
 	WeekdayPicker *wp;
 	WeekdayPickerPrivate *priv;
-	int max_width;
-	int i;
+	gint max_width;
+	gint i;
 	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
 	PangoFontMetrics *font_metrics;
@@ -445,8 +445,8 @@ weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
 	max_width = 0;
 
 	for (i = 0; i < 7; i++) {
-		char *c;
-		int w;
+		gchar *c;
+		gint w;
 
 		c = get_day_text (i);
 		pango_layout_set_text (layout, c, strlen (c));
@@ -580,7 +580,7 @@ weekday_picker_get_blocked_days (WeekdayPicker *wp)
  * Sets the day that defines the start of the week for a weekday picker.
  **/
 void
-weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day)
+weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day)
 {
 	WeekdayPickerPrivate *priv;
 
@@ -603,7 +603,7 @@ weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day)
  * Return value: Index of the day that defines the start of the week.  See
  * weekday_picker_set_week_start_day() to see how this is represented.
  **/
-int
+gint
 weekday_picker_get_week_start_day (WeekdayPicker *wp)
 {
 	WeekdayPickerPrivate *priv;
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
index bd78201bd3..f92eb3764e 100644
--- a/calendar/gui/weekday-picker.h
+++ b/calendar/gui/weekday-picker.h
@@ -64,8 +64,8 @@ guint8 weekday_picker_get_days (WeekdayPicker *wp);
 void weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask);
 guint weekday_picker_get_blocked_days (WeekdayPicker *wp);
 
-void weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day);
-int weekday_picker_get_week_start_day (WeekdayPicker *wp);
+void weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day);
+gint weekday_picker_get_week_start_day (WeekdayPicker *wp);
 
 
 
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index a4e0fa7048..caa7a8a87c 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -65,13 +65,13 @@ typedef struct {
 	guint cancelled:1;
 } ICalIntelligentImporter;
 
-static const int import_type_map[] = {
+static const gint import_type_map[] = {
 	E_CAL_SOURCE_TYPE_EVENT,
 	E_CAL_SOURCE_TYPE_TODO,
 	-1
 };
 
-static const char *import_type_strings[] = {
+static const gchar *import_type_strings[] = {
 	N_("Appointments and Meetings"),
 	N_("Tasks"),
 	NULL
@@ -184,7 +184,7 @@ struct _selector_data {
 	EImportTarget *target;
 	GtkWidget *selector;
 	GtkWidget *notebook;
-	int page;
+	gint page;
 };
 
 static void
@@ -210,7 +210,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *vbox, *hbox, *first = NULL;
 	GSList *group = NULL;
-	int i;
+	gint i;
 	GtkWidget *nb;
 
 	vbox = gtk_vbox_new (FALSE, FALSE);
@@ -276,7 +276,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static gboolean
-ivcal_import_items(void *d)
+ivcal_import_items(gpointer d)
 {
 	ICalImporter *ici = d;
 
@@ -359,8 +359,8 @@ ivcal_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
 static gboolean
 ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *filename;
-	char *contents;
+	gchar *filename;
+	gchar *contents;
 	gboolean ret = FALSE;
 	EImportTargetURI *s;
 
@@ -400,8 +400,8 @@ ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 static void
 ical_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *filename;
-	char *contents;
+	gchar *filename;
+	gchar *contents;
 	icalcomponent *icalcomp;
 	EImportTargetURI *s = (EImportTargetURI *)target;
 
@@ -453,8 +453,8 @@ ical_importer_peek(void)
 static gboolean
 vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *filename;
-	char *contents;
+	gchar *filename;
+	gchar *contents;
 	gboolean ret = FALSE;
 	EImportTargetURI *s;
 
@@ -514,12 +514,12 @@ vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 /* This tries to load in a vCalendar file and convert it to an icalcomponent.
    It returns NULL on failure. */
 static icalcomponent*
-load_vcalendar_file (const char *filename)
+load_vcalendar_file (const gchar *filename)
 {
 	icalvcal_defaults defaults = { NULL };
 	icalcomponent *icalcomp = NULL;
-	char *contents;
-	char *default_alarm_filename;
+	gchar *contents;
+	gchar *default_alarm_filename;
 
 	default_alarm_filename = g_build_filename (EVOLUTION_SOUNDDIR,
 						   "default_alarm.wav",
@@ -527,8 +527,8 @@ load_vcalendar_file (const char *filename)
 	defaults.alarm_audio_url = g_filename_to_uri (default_alarm_filename,
 						      NULL, NULL);
 	g_free (default_alarm_filename);
-	defaults.alarm_audio_fmttype = (char *) "audio/x-wav";
-	defaults.alarm_description = (char *) _("Reminder!");
+	defaults.alarm_audio_fmttype = (gchar *) "audio/x-wav";
+	defaults.alarm_description = (gchar *) _("Reminder!");
 
 	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
 		VObject *vcal;
@@ -550,7 +550,7 @@ load_vcalendar_file (const char *filename)
 static void
 vcal_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *filename;
+	gchar *filename;
 	icalcomponent *icalcomp;
 	EImportTargetURI *s = (EImportTargetURI *)target;
 
@@ -591,7 +591,7 @@ vcal_importer_peek(void)
 static gboolean
 gnome_calendar_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	char *filename;
+	gchar *filename;
 	gboolean res;
 	EImportTargetHome *s = (EImportTargetHome *)target;
 
@@ -609,11 +609,11 @@ static void
 gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	icalcomponent *icalcomp = NULL;
-	char *filename;
+	gchar *filename;
 	GList *vtodos;
 	ECal *calendar_client = NULL, *tasks_client = NULL;
-	int t;
-	int do_calendar, do_tasks;
+	gint t;
+	gint do_calendar, do_tasks;
 	EImportTargetHome *s = (EImportTargetHome *)target;
 	ICalIntelligentImporter *ici;
 
diff --git a/calendar/module/e-cal-shell-migrate.c b/calendar/module/e-cal-shell-migrate.c
index 5414f4a391..911dfcbd4a 100644
--- a/calendar/module/e-cal-shell-migrate.c
+++ b/calendar/module/e-cal-shell-migrate.c
@@ -158,9 +158,9 @@ dialog_close (void)
 }
 
 static void
-dialog_set_folder_name (const char *folder_name)
+dialog_set_folder_name (const gchar *folder_name)
 {
-	char *text;
+	gchar *text;
 
 	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
 	gtk_label_set_text (label, text);
@@ -175,7 +175,7 @@ dialog_set_folder_name (const char *folder_name)
 static void
 dialog_set_progress (double percent)
 {
-	char text[5];
+	gchar text[5];
 
 	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
 
@@ -187,7 +187,7 @@ dialog_set_progress (double percent)
 }
 
 static gboolean
-check_for_conflict (ESourceGroup *group, char *name)
+check_for_conflict (ESourceGroup *group, gchar *name)
 {
 	GSList *sources;
 	GSList *s;
@@ -204,12 +204,12 @@ check_for_conflict (ESourceGroup *group, char *name)
 	return FALSE;
 }
 
-static char *
-get_source_name (ESourceGroup *group, const char *path)
+static gchar *
+get_source_name (ESourceGroup *group, const gchar *path)
 {
-	char **p = g_strsplit (path, "/", 0);
-	int i, j, starting_index;
-	int num_elements;
+	gchar **p = g_strsplit (path, "/", 0);
+	gint i, j, starting_index;
+	gint num_elements;
 	gboolean conflict;
 	GString *s = g_string_new (NULL);
 
@@ -251,8 +251,8 @@ static gboolean
 migrate_ical (ECal *old_ecal, ECal *new_ecal)
 {
 	GList *l, *objects;
-	int num_added = 0;
-	int num_objects;
+	gint num_added = 0;
+	gint num_objects;
 	gboolean retval = TRUE;
 
 	/* both ecals are loaded, start the actual migration */
@@ -282,12 +282,12 @@ migrate_ical (ECal *old_ecal, ECal *new_ecal)
 }
 
 static gboolean
-migrate_ical_folder_to_source (char *old_path, ESource *new_source, ECalSourceType type)
+migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
 {
 	ECal *old_ecal = NULL, *new_ecal = NULL;
 	ESource *old_source;
 	ESourceGroup *group;
-	char *old_uri = g_strdup_printf ("file://%s", old_path);
+	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
 	GError *error = NULL;
 	gboolean retval = FALSE;
 
@@ -332,7 +332,7 @@ finish:
 }
 
 static gboolean
-migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name, ECalSourceType type)
+migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
 {
 	ESource *new_source;
 	gboolean retval;
@@ -353,7 +353,7 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name
 #ifndef G_OS_WIN32
 
 static void
-migrate_pilot_db_key (const char *key, gpointer user_data)
+migrate_pilot_db_key (const gchar *key, gpointer user_data)
 {
 	EXmlHash *xmlhash = user_data;
 
@@ -361,12 +361,12 @@ migrate_pilot_db_key (const char *key, gpointer user_data)
 }
 
 static void
-migrate_pilot_data (const char *component, const char *conduit, const char *old_path, const char *new_path)
+migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
 {
-	char *changelog, *map;
-	const char *dent;
-	const char *ext;
-	char *filename;
+	gchar *changelog, *map;
+	const gchar *dent;
+	const gchar *ext;
+	gchar *filename;
 	GDir *dir;
 
 	if (!(dir = g_dir_open (old_path, 0, NULL)))
@@ -382,9 +382,9 @@ migrate_pilot_data (const char *component, const char *conduit, const char *old_
 		if (!strncmp (dent, map, strlen (map)) &&
 		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
 			/* pilot map file - src and dest file formats are identical */
-			unsigned char inbuf[4096];
+			guchar inbuf[4096];
 			size_t nread, nwritten;
-			int fd0, fd1;
+			gint fd0, fd1;
 			ssize_t n;
 
 			filename = g_build_filename (old_path, dent, NULL);
@@ -503,7 +503,7 @@ create_calendar_sources (EShellBackend *shell_backend,
 	EShellSettings *shell_settings;
 	GSList *groups;
 	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
+	gchar *base_uri, *base_uri_proto;
 	const gchar *base_dir;
 
 	*on_this_computer = NULL;
@@ -569,7 +569,7 @@ create_calendar_sources (EShellBackend *shell_backend,
 	}
 
 	if (!*personal_source) {
-		char *primary_calendar;
+		gchar *primary_calendar;
 
 		/* Create the default Person calendar */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
@@ -640,7 +640,7 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 #ifndef G_OS_WIN32
 	if (major == 1) {
 		xmlDocPtr config_doc = NULL;
-		char *conf_file;
+		gchar *conf_file;
 		struct stat st;
 
 		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
@@ -650,7 +650,7 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 
 		if (config_doc && minor <= 2) {
 			GConfClient *gconf;
-			int res = 0;
+			gint res = 0;
 
 			/* move bonobo config to gconf */
 			gconf = gconf_client_get_default ();
@@ -670,7 +670,7 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 
 		if (minor <= 4) {
 			GSList *migration_dirs, *l;
-			char *path, *local_cal_folder;
+			gchar *path, *local_cal_folder;
 
 			setup_progress_dialog ();
 
@@ -683,12 +683,12 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 				migrate_ical_folder_to_source (local_cal_folder, personal_source, E_CAL_SOURCE_TYPE_EVENT);
 
 			for (l = migration_dirs; l; l = l->next) {
-				char *source_name;
+				gchar *source_name;
 
-				if (personal_source && !strcmp ((char*)l->data, local_cal_folder))
+				if (personal_source && !strcmp ((gchar *)l->data, local_cal_folder))
 					continue;
 
-				source_name = get_source_name (on_this_computer, (char*)l->data);
+				source_name = get_source_name (on_this_computer, (gchar *)l->data);
 
 				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) {
 					/* FIXME: domain/code */
@@ -708,8 +708,8 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 		if (minor <= 4 || (minor == 5 && micro < 5)) {
 			GConfClient *gconf;
 			GConfValue *gconf_val;
-			int i;
-			const char *keys[] = {
+			gint i;
+			const gchar *keys[] = {
 				CALENDAR_CONFIG_HPANE_POS,
 				CALENDAR_CONFIG_VPANE_POS,
 				CALENDAR_CONFIG_MONTH_HPANE_POS,
@@ -732,7 +732,7 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 		}
 
 		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			char *old_path, *new_path;
+			gchar *old_path, *new_path;
 
 			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL);
 			new_path = g_build_filename (e_shell_backend_get_config_dir (shell_backend),
diff --git a/calendar/module/e-memo-shell-migrate.c b/calendar/module/e-memo-shell-migrate.c
index de40a7e702..ccda6665d3 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/calendar/module/e-memo-shell-migrate.c
@@ -46,7 +46,7 @@ create_memo_sources (EShellBackend *shell_backend,
 {
 	GSList *groups;
 	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
+	gchar *base_uri, *base_uri_proto;
 	const gchar *base_dir;
 
 	*on_this_computer = NULL;
@@ -141,17 +141,17 @@ is_groupwise_account (EAccount *account)
 }
 
 static void
-add_gw_esource (ESourceList *source_list, const char *group_name,  const char *source_name, CamelURL *url, GConfClient *client)
+add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar *source_name, CamelURL *url, GConfClient *client)
 {
 	ESourceGroup *group;
 	ESource *source;
 	GSList *ids, *temp ;
 	GError *error = NULL;
-	char *relative_uri;
-	const char *soap_port;
-	const char * use_ssl;
-	const char *poa_address;
-	const char *offline_sync;
+	gchar *relative_uri;
+	const gchar *soap_port;
+	const gchar * use_ssl;
+	const gchar *poa_address;
+	const gchar *offline_sync;
 
 
 	poa_address = url->host;
diff --git a/calendar/module/e-task-shell-migrate.c b/calendar/module/e-task-shell-migrate.c
index 9653fb95ea..4fc8b8c752 100644
--- a/calendar/module/e-task-shell-migrate.c
+++ b/calendar/module/e-task-shell-migrate.c
@@ -124,9 +124,9 @@ dialog_close (void)
 }
 
 static void
-dialog_set_folder_name (const char *folder_name)
+dialog_set_folder_name (const gchar *folder_name)
 {
-	char *text;
+	gchar *text;
 
 	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
 	gtk_label_set_text (label, text);
@@ -141,7 +141,7 @@ dialog_set_folder_name (const char *folder_name)
 static void
 dialog_set_progress (double percent)
 {
-	char text[5];
+	gchar text[5];
 
 	snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
 
@@ -153,7 +153,7 @@ dialog_set_progress (double percent)
 }
 
 static gboolean
-check_for_conflict (ESourceGroup *group, char *name)
+check_for_conflict (ESourceGroup *group, gchar *name)
 {
 	GSList *sources;
 	GSList *s;
@@ -170,12 +170,12 @@ check_for_conflict (ESourceGroup *group, char *name)
 	return FALSE;
 }
 
-static char *
-get_source_name (ESourceGroup *group, const char *path)
+static gchar *
+get_source_name (ESourceGroup *group, const gchar *path)
 {
-	char **p = g_strsplit (path, "/", 0);
-	int i, j, starting_index;
-	int num_elements;
+	gchar **p = g_strsplit (path, "/", 0);
+	gint i, j, starting_index;
+	gint num_elements;
 	gboolean conflict;
 	GString *s = g_string_new (NULL);
 
@@ -217,8 +217,8 @@ static gboolean
 migrate_ical (ECal *old_ecal, ECal *new_ecal)
 {
 	GList *l, *objects;
-	int num_added = 0;
-	int num_objects;
+	gint num_added = 0;
+	gint num_objects;
 	gboolean retval = TRUE;
 
 	/* both ecals are loaded, start the actual migration */
@@ -248,12 +248,12 @@ migrate_ical (ECal *old_ecal, ECal *new_ecal)
 }
 
 static gboolean
-migrate_ical_folder_to_source (char *old_path, ESource *new_source, ECalSourceType type)
+migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
 {
 	ECal *old_ecal = NULL, *new_ecal = NULL;
 	ESource *old_source;
 	ESourceGroup *group;
-	char *old_uri = g_strdup_printf ("file://%s", old_path);
+	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
 	GError *error = NULL;
 	gboolean retval = FALSE;
 
@@ -298,7 +298,7 @@ finish:
 }
 
 static gboolean
-migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name, ECalSourceType type)
+migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
 {
 	ESource *new_source;
 	gboolean retval;
@@ -319,7 +319,7 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name
 #ifndef G_OS_WIN32
 
 static void
-migrate_pilot_db_key (const char *key, gpointer user_data)
+migrate_pilot_db_key (const gchar *key, gpointer user_data)
 {
 	EXmlHash *xmlhash = user_data;
 
@@ -327,12 +327,12 @@ migrate_pilot_db_key (const char *key, gpointer user_data)
 }
 
 static void
-migrate_pilot_data (const char *component, const char *conduit, const char *old_path, const char *new_path)
+migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
 {
-	char *changelog, *map;
-	const char *dent;
-	const char *ext;
-	char *filename;
+	gchar *changelog, *map;
+	const gchar *dent;
+	const gchar *ext;
+	gchar *filename;
 	GDir *dir;
 
 	if (!(dir = g_dir_open (old_path, 0, NULL)))
@@ -348,9 +348,9 @@ migrate_pilot_data (const char *component, const char *conduit, const char *old_
 		if (!strncmp (dent, map, strlen (map)) &&
 		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
 			/* pilot map file - src and dest file formats are identical */
-			unsigned char inbuf[4096];
+			guchar inbuf[4096];
 			size_t nread, nwritten;
-			int fd0, fd1;
+			gint fd0, fd1;
 			ssize_t n;
 
 			filename = g_build_filename (old_path, dent, NULL);
@@ -446,7 +446,7 @@ create_task_sources (EShellBackend *shell_backend,
 {
 	GSList *groups;
 	ESourceGroup *group;
-	char *base_uri, *base_uri_proto;
+	gchar *base_uri, *base_uri_proto;
 	const gchar *base_dir;
 
 	*on_this_computer = NULL;
@@ -556,7 +556,7 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 #ifndef G_OS_WIN32
 	if (major == 1) {
 		xmlDocPtr config_doc = NULL;
-		char *conf_file;
+		gchar *conf_file;
 
 		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
 		if (g_file_test (conf_file, G_FILE_TEST_IS_REGULAR))
@@ -565,7 +565,7 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 
 		if (config_doc && minor <= 2) {
 			GConfClient *gconf;
-			int res = 0;
+			gint res = 0;
 
 			/* move bonobo config to gconf */
 			gconf = gconf_client_get_default ();
@@ -584,7 +584,7 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 
 		if (minor <= 4) {
 			GSList *migration_dirs, *l;
-			char *path, *local_task_folder;
+			gchar *path, *local_task_folder;
 
 			setup_progress_dialog ();
 
@@ -597,12 +597,12 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 				migrate_ical_folder_to_source (local_task_folder, personal_source, E_CAL_SOURCE_TYPE_TODO);
 
 			for (l = migration_dirs; l; l = l->next) {
-				char *source_name;
+				gchar *source_name;
 
-				if (personal_source && !strcmp ((char*)l->data, local_task_folder))
+				if (personal_source && !strcmp ((gchar *)l->data, local_task_folder))
 					continue;
 
-				source_name = get_source_name (on_this_computer, (char*)l->data);
+				source_name = get_source_name (on_this_computer, (gchar *)l->data);
 
 				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) {
 					/* FIXME: domain/code */
@@ -620,7 +620,7 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 		}
 
 		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			char *old_path, *new_path;
+			gchar *old_path, *new_path;
 
 			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Tasks", NULL);
 			new_path = g_build_filename (e_shell_backend_get_config_dir (shell_backend),