1 files changed, 54 insertions, 54 deletions

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)