Prefer GLib basic types over C types.

24 files changed, 303 insertions, 303 deletions

diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 2c08341ef3..53af222142 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -83,7 +83,7 @@ CamelServiceAuthType camel_exchange_password_authtype = {
 
 typedef struct {
 	gboolean state;
-	char *message;
+	gchar *message;
 	GtkWidget *text_view;
 }OOFData;
 
@@ -119,7 +119,7 @@ static void
 btn_chpass_clicked (GtkButton *button, gpointer data)
 {
 	ExchangeAccount *account;
-	char *old_password, *new_password;
+	gchar *old_password, *new_password;
  	ExchangeAccountResult result;
 
 	account = exchange_operations_get_exchange_account ();
@@ -178,8 +178,8 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	EMConfigTargetAccount *target_account;
 	ExchangeAccount *account = NULL;
 	CamelURL *url;
-	const char *source_url;
-	char *message = NULL, *txt = NULL, *oof_message;
+	const gchar *source_url;
+	gchar *message = NULL, *txt = NULL, *oof_message;
 	gboolean oof_state = FALSE;
 	gint offline_status;
 
@@ -386,7 +386,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 }
 
 static void
-print_error (const char *owa_url, E2kAutoconfigResult result)
+print_error (const gchar *owa_url, E2kAutoconfigResult result)
 {
 	switch (result) {
 
@@ -430,7 +430,7 @@ print_error (const char *owa_url, E2kAutoconfigResult result)
 	}
 }
 
-static const char *
+static const gchar *
 gal_auth_to_string (E2kAutoconfigGalAuthPref ad_auth)
 {
 	switch (ad_auth) {
@@ -449,9 +449,9 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	E2kAutoconfigResult result;
 	CamelURL *url=NULL;
 	gboolean remember_password;
-	char *url_string, *key;
-	const char *source_url, *id_name, *owa_url;
-	char *at, *user;
+	gchar *url_string, *key;
+	const gchar *source_url, *id_name, *owa_url;
+	gchar *at, *user;
 	gboolean valid = FALSE;
 	ExchangeParams *exchange_params;
 	GtkWidget *mailbox_entry = g_object_get_data (G_OBJECT (button), "mailbox-entry");
@@ -520,7 +520,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	camel_url_set_param (url, "ad_auth", valid ? gal_auth_to_string (exchange_params->ad_auth) : NULL);
 
 	if (mailbox_entry) {
-		const char *par = camel_url_get_param (url, "mailbox");
+		const gchar *par = camel_url_get_param (url, "mailbox");
 
 		gtk_entry_set_text (GTK_ENTRY (mailbox_entry), par ? par : "");
 	}
@@ -544,16 +544,16 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 static void
 owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
 {
-	const char *uri, *ssl = NULL;
+	const gchar *uri, *ssl = NULL;
 	CamelURL *url, *owaurl = NULL;
-	char *url_string;
+	gchar *url_string;
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target;
 	GtkWidget *button = g_object_get_data((GObject *)entry, "authenticate-button");
-	int active = FALSE;
+	gint active = FALSE;
 
 	/* NB: we set the button active only if we have a parsable uri entered */
 
-	const char * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL);
+	const gchar * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL);
 	if (target_url && target_url[0] != '\0')
 		url = camel_url_new(target_url, NULL);
 	else url = NULL;
@@ -583,11 +583,11 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
 }
 
 static void
-update_mailbox_param_in_url (EAccount *account, e_account_item_t item, const char *mailbox)
+update_mailbox_param_in_url (EAccount *account, e_account_item_t item, const gchar *mailbox)
 {
 	CamelURL *url;
-	char *url_string;
-	const char *target_url;
+	gchar *url_string;
+	const gchar *target_url;
 
 	if (!account)
 		return;
@@ -613,7 +613,7 @@ static void
 mailbox_editor_entry_changed (GtkWidget *entry, EConfig *config)
 {
 	EMConfigTargetAccount *target;
-	const char *mailbox;
+	const gchar *mailbox;
 
 	target = (EMConfigTargetAccount *)config->target;
 	mailbox = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -634,7 +634,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config)
 	if (entry) {
 		gboolean is_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
 		EMConfigTargetAccount *target;
-		const char *mailbox;
+		const gchar *mailbox;
 
 		gtk_widget_set_sensitive (entry, is_active);
 
@@ -646,12 +646,12 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config)
 	}
 }
 
-static char *
+static gchar *
 construct_owa_url (CamelURL *url)
 {
-	const char *owa_path, *use_ssl = NULL;
-	const char *protocol = "http", *mailbox_name;
-	char *owa_url;
+	const gchar *owa_path, *use_ssl = NULL;
+	const gchar *protocol = "http", *mailbox_name;
+	gchar *owa_url;
 
 	use_ssl = camel_url_get_param (url, "use_ssl");
 	if (use_ssl) {
@@ -677,11 +677,11 @@ GtkWidget *
 org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	const char *source_url;
-	char *owa_url = NULL, *mailbox_name, *username;
+	const gchar *source_url;
+	gchar *owa_url = NULL, *mailbox_name, *username;
 	GtkWidget *owa_entry, *mailbox_entry, *want_mailbox_check;
 	CamelURL *url;
-	int row;
+	gint row;
 	GtkWidget *hbox, *label, *button;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
@@ -716,7 +716,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	/* if the host is null, then user+other info is dropped silently, force it to be kept */
 	if (url->host == NULL) {
-		char *uri;
+		gchar *uri;
 
 		camel_url_set_host(url, "");
 		uri = camel_url_to_string(url, 0);
@@ -734,7 +734,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	if (!owa_url) {
 		if (url->host[0] != 0) {
-			char *uri;
+			gchar *uri;
 
 			/* url has hostname but not owa_url.
 			 * Account has been created using x-c-s or evo is upgraded to 2.2
@@ -818,7 +818,7 @@ gboolean
 org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 {
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)data->config->target;
-	int status = TRUE;
+	gint status = TRUE;
 
 	/* We assume that if the host is set, then the setting is valid.
 	   The host gets set when the provider validate() call is made */
@@ -831,7 +831,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 	    strcmp (data->pageid, "20.receive_options") == 0) {
 		CamelURL *url;
 
-		const char * target_url = e_account_get_string(target->account,  E_ACCOUNT_SOURCE_URL);
+		const gchar * target_url = e_account_get_string(target->account,  E_ACCOUNT_SOURCE_URL);
 		if (target_url && target_url[0] != '\0')
 			url = camel_url_new(target_url, NULL);
 		else
@@ -875,7 +875,7 @@ void
 org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	const char *source_url;
+	const gchar *source_url;
 	CamelURL *url;
 	gint offline_status;
 
@@ -922,13 +922,13 @@ static void
 exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 {
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target;
-	int id = gtk_combo_box_get_active(dropdown);
+	gint id = gtk_combo_box_get_active(dropdown);
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	CamelServiceAuthType *authtype;
 	CamelURL *url_source, *url_transport;
-	const char *source_url, *transport_url;
-	char *source_url_string, *transport_url_string;
+	const gchar *source_url, *transport_url;
+	gchar *source_url_string, *transport_url_string;
 
 	source_url = e_account_get_string (target->account,
 					   E_ACCOUNT_SOURCE_URL);
@@ -969,14 +969,14 @@ GtkWidget *
 org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	const char *source_url;
-	char *label_text, *exchange_account_authtype = NULL;
+	const gchar *source_url;
+	gchar *label_text, *exchange_account_authtype = NULL;
 	CamelURL *url;
 	GtkWidget *hbox, *button, *auth_label, *vbox, *label_hide;
 	GtkComboBox *dropdown;
 	GtkTreeIter iter;
 	GtkListStore *store;
-	int i, active=0, auth_changed_id = 0;
+	gint i, active=0, auth_changed_id = 0;
 	GList *authtypes, *l, *ll;
 	ExchangeAccount *account;
 
@@ -1025,7 +1025,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	for (i=0, l=authtypes; l; l=l->next, i++) {
 		CamelServiceAuthType *authtype = l->data;
-		int avail = TRUE;
+		gint avail = TRUE;
 
 		if (authtypes) {
 			for (ll = authtypes; ll; ll = g_list_next(ll))
@@ -1104,8 +1104,8 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	GtkListStore *model;
 	GtkVBox *vbx;
 	GtkHBox *hbx_size;
-	char *folder_name, *folder_size;
-	int mode;
+	gchar *folder_name, *folder_size;
+	gint mode;
 
 	service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
 	if (!service)
@@ -1126,7 +1126,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	if (mode == OFFLINE_MODE)
 		return NULL;
 
-	folder_name = (char*) camel_folder_get_name (cml_folder);
+	folder_name = (gchar *) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
 
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 58af042c0c..e43d3b0531 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -62,7 +62,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	GPtrArray *folder_array;
 	GPtrArray *calendar_list;
 	EFolder *folder;
-	int i, prefix_len;
+	gint i, prefix_len;
 	gchar *type;
 	gchar *uri_prefix;
 	gchar *tmp, *ruri;
@@ -155,11 +155,11 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gchar *account_name;
         gchar *uri_text;
 	gchar *cal_name;
-	char *folder_size;
-	const char *rel_uri;
-	int row, i;
+	gchar *folder_size;
+	const gchar *rel_uri;
+	gint row, i;
 	gint offline_status;
-	char *offline_msg;
+	gchar *offline_msg;
 	GtkWidget *lbl_offline_msg;
 	gboolean is_personal;
 
@@ -225,7 +225,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_free (uri_text);
 
 	if (calendar_src_exists && is_personal) {
-		cal_name = (gchar*) e_source_peek_name (source);
+		cal_name = (gchar *) e_source_peek_name (source);
 		model = exchange_account_folder_size_get_model (account);
 		if (model)
 			folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, cal_name));
@@ -281,13 +281,13 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	if (calendar_src_exists) {
 		gchar *uri_prefix, *sruri, *tmpruri;
-		int prefix_len;
+		gint prefix_len;
 		GtkTreeSelection *selection;
 
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
 
-		tmpruri = (gchar*) rel_uri;
+		tmpruri = (gchar *) rel_uri;
 
 		if (g_str_has_prefix (tmpruri, uri_prefix)) {
 			sruri = g_strdup (tmpruri+prefix_len);
@@ -313,12 +313,12 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	/* FIXME - check pageid */
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
 	ESourceGroup *group;
-	const char *base_uri;
-	const char *rel_uri;
+	const gchar *base_uri;
+	const gchar *rel_uri;
 	gint offline_status;
 	ExchangeAccount *account;
 	EUri *euri;
-	int uri_len;
+	gint uri_len;
 	gchar *uri_text, *uri_string, *path, *folder_name;
 	gboolean is_personal;
 
@@ -381,7 +381,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	ESource *source = t->source;
 	gchar *uri_text, *gruri, *gname, *ruri, *ftype, *path, *path_prefix, *oldpath=NULL;
 	gchar *username, *windows_domain, *authtype;
-	int prefix_len;
+	gint prefix_len;
 	ExchangeAccount *account;
 	ExchangeAccountFolderResult result;
 	ExchangeConfigListenerStatus status;
@@ -429,13 +429,13 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		ftype = g_strdup ("mail");
 	}
 
-	gname = (gchar*) e_source_peek_name (source);
-	gruri = (gchar*) e_source_peek_relative_uri (source);
+	gname = (gchar *) e_source_peek_name (source);
+	gruri = (gchar *) e_source_peek_relative_uri (source);
 
 	if (calendar_src_exists) {
 		gchar *tmpruri, *uri_string, *temp_path, *prefix;
 		EUri *euri;
-		int uri_len;
+		gint uri_len;
 
 		/* sample uri_string: exchange://user;auth=NTLM@host/ */
 		/* sample uri_text: exchange://user;auth=NTLM@host/;personal/Calendar */
diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index 539bd24d3a..82382f6f9f 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -42,7 +42,7 @@ entry_changed (GtkEntry *entry, gpointer user_data)
 	GladeXML *xml = user_data;
 	GtkEntry *new_entry, *confirm_entry;
 	GtkWidget *ok_button;
-	const char *text;
+	const gchar *text;
 
         new_entry = GTK_ENTRY (glade_xml_get_widget (xml, "new_pass_entry"));
         confirm_entry = GTK_ENTRY (glade_xml_get_widget (xml, "confirm_pass_entry"));
@@ -71,15 +71,15 @@ entry_changed (GtkEntry *entry, gpointer user_data)
  *
  * Prompt the user for a new password.
  */
-char *
-exchange_get_new_password (const char *existing_password, gboolean voluntary)
+gchar *
+exchange_get_new_password (const gchar *existing_password, gboolean voluntary)
 {
 	GladeXML *xml;
 	GtkWidget *top_widget;
 	GtkEntry *cur_entry, *new_entry, *confirm_entry;
 	GtkResponseType response;
 	GtkLabel *top_label;
-	char *new_pass;
+	gchar *new_pass;
 
 	xml = glade_xml_new (FILENAME, ROOTNODE, NULL);
 	top_widget = glade_xml_get_widget (xml, ROOTNODE);
@@ -100,7 +100,7 @@ exchange_get_new_password (const char *existing_password, gboolean voluntary)
 run_dialog_again:
 	response = gtk_dialog_run (GTK_DIALOG (top_widget));
 	if (response == GTK_RESPONSE_OK) {
-		const char *cur_pass, *new_pass1, *new_pass2;
+		const gchar *cur_pass, *new_pass1, *new_pass2;
 
 		cur_pass = gtk_entry_get_text (cur_entry);
 		new_pass1 = gtk_entry_get_text (new_entry);
diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h
index e320d89cf9..389922f1b3 100644
--- a/plugins/exchange-operations/exchange-change-password.h
+++ b/plugins/exchange-operations/exchange-change-password.h
@@ -28,7 +28,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-char *exchange_get_new_password (const char *existing_password,
+gchar *exchange_get_new_password (const gchar *existing_password,
 				 gboolean    voluntary);
 
 #ifdef __cplusplus
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 5ff53fb171..35d06d527d 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -53,16 +53,16 @@ struct _ExchangeConfigListenerPrivate {
 	GConfClient *gconf;
 	guint idle_id;
 
-	char *configured_uri, *configured_name;
+	gchar *configured_uri, *configured_name;
 	EAccount *configured_account;
 
 	ExchangeAccount *exchange_account;
 };
 
 typedef struct {
-	const char *name;
-	const char *uri;
-	int type;
+	const gchar *name;
+	const gchar *uri;
+	gint type;
 }FolderInfo;
 
 enum {
@@ -96,7 +96,7 @@ static void exchange_add_autocompletion_folders (GConfClient *gc_client,
 static gboolean exchange_camel_urls_is_equal (const gchar *url1,
 					      const gchar *url2);
 static void remove_selected_non_offline_esources (ExchangeAccount *account,
-						  const char *gconf_key);
+						  const gchar *gconf_key);
 static void
 class_init (GObjectClass *object_class)
 {
@@ -182,9 +182,9 @@ E2K_MAKE_TYPE (exchange_config_listener, ExchangeConfigListener, class_init, ini
 #define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1)
 
 static EFolder *
-standard_folder (ExchangeAccount *account, const char *folder_type)
+standard_folder (ExchangeAccount *account, const gchar *folder_type)
 {
-	const char *uri;
+	const gchar *uri;
 
 	uri = exchange_account_get_standard_uri (account, folder_type);
 	if (!uri)
@@ -193,14 +193,14 @@ standard_folder (ExchangeAccount *account, const char *folder_type)
 }
 
 static void
-set_special_mail_folder (ExchangeAccount *account, const char *folder_type,
-			 char **folder_uri)
+set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type,
+			 gchar **folder_uri)
 {
 	EFolder *folder;
-	const char *physical_uri;
-	char *url_string, *path;
+	const gchar *physical_uri;
+	gchar *url_string, *path;
 	CamelURL *camel_url;
-	int uri_len;
+	gint uri_len;
 
 	folder = standard_folder (account, folder_type);
 	if (!folder)
@@ -271,12 +271,12 @@ add_account_esources (ExchangeAccount *account,
 	ESourceGroup *cal_source_group = NULL;
 	ESourceGroup *tasks_source_group = NULL;
 	ESourceGroup *contacts_source_group = NULL;
-	char *relative_uri = NULL, *username = NULL;
+	gchar *relative_uri = NULL, *username = NULL;
 #if 0
 	GSList *ids;
 #endif
 	GConfClient *client;
-	int mode;
+	gint mode;
 	ESourceList *cal_source_list, *tasks_source_list, *contacts_source_list;
 	FolderInfo *folder=NULL;
 	gboolean offline_mode = FALSE;
@@ -409,11 +409,11 @@ add_new_sources (ExchangeAccount *account)
 
 	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
-		int i;
-		const char *folder_type;
-		const char *folder_name;
-		const char *folder_uri;
-		int type;
+		gint i;
+		const gchar *folder_type;
+		const gchar *folder_name;
+		const gchar *folder_uri;
+		gint type;
 		EFolder *folder;
 		ExchangeHierarchy *hier;
 		gboolean create_esource = FALSE;
@@ -462,8 +462,8 @@ add_sources (ExchangeAccount *account)
 
 	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
-		int i;
-		const char *folder_type;
+		gint i;
+		const gchar *folder_type;
 		EFolder *folder;
 		GSList *folders = NULL;
 
@@ -516,7 +516,7 @@ remove_account_esource (ExchangeAccount *account,
 	GSList *sources;
 	GSList *ids, *node_to_be_deleted;
 	gboolean found_group;
-	const char *source_uid;
+	const gchar *source_uid;
 	GConfClient *client;
 	ESourceList *source_list = NULL;
 
@@ -614,10 +614,10 @@ remove_account_esources (ExchangeAccount *account)
 }
 
 #ifdef HAVE_KRB5
-static char *
+static gchar *
 get_new_exchange_password (ExchangeAccount *account)
 {
-	char *old_password, *new_password;
+	gchar *old_password, *new_password;
 
 	old_password = exchange_account_get_password (account);
 	new_password = exchange_get_new_password (old_password, 0);
@@ -638,7 +638,7 @@ get_new_exchange_password (ExchangeAccount *account)
 static void
 change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
 {
-	char *current_passwd, *new_passwd;
+	gchar *current_passwd, *new_passwd;
 
 	gtk_widget_hide (gtk_widget_get_toplevel(button));
 	current_passwd = exchange_account_get_password (account);
@@ -650,13 +650,13 @@ change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
 #endif
 
 static void
-display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
+display_passwd_expiry_message (gint max_passwd_age, ExchangeAccount *account)
 {
 	GladeXML *xml;
 	GtkWidget *top_widget, *change_passwd_button;
 	GtkResponseType response;
 	GtkLabel *warning_msg_label;
-	char *passwd_expiry_msg =
+	gchar *passwd_expiry_msg =
 		g_strdup_printf (_("Your password will expire in the next %d days"), max_passwd_age);
 
 	xml = glade_xml_new (FILENAME, ROOTNODE, NULL);
@@ -688,13 +688,13 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 {
 	ExchangeConfigListenerPrivate *priv;
 	ExchangeAccountResult result;
-	char *key, *password, *title, *url_string;
+	gchar *key, *password, *title, *url_string;
 #ifdef HAVE_KRB5
-	char *new_password;
+	gchar *new_password;
 #endif
 	gboolean oldremember, remember = FALSE;
 	CamelURL *camel_url;
-	const char *remember_password;
+	const gchar *remember_password;
 
 	g_return_val_if_fail (EXCHANGE_IS_CONFIG_LISTENER (ex_conf_listener), EXCHANGE_ACCOUNT_CONFIG_ERROR);
 	priv = ex_conf_listener->priv;
@@ -752,7 +752,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		 result == EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR ||
 		 result == EXCHANGE_ACCOUNT_QUOTA_WARN) {
 		gchar *current_quota_usage = NULL;
-		const char *error_code = NULL;
+		const gchar *error_code = NULL;
 		GtkWidget *widget;
 
 		switch (result) {
@@ -789,7 +789,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		result = EXCHANGE_ACCOUNT_CONNECT_SUCCESS;
 	}
 	if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS) {
-		int max_pwd_age_days;
+		gint max_pwd_age_days;
 		GladeXML *xml;
 		GtkWidget *dialog;
 		GtkResponseType response;
@@ -905,13 +905,13 @@ configured_account_destroyed (gpointer user_data, GObject *where_account_was)
 }
 
 static gboolean
-requires_relogin (char *current_url, char *new_url)
+requires_relogin (gchar *current_url, gchar *new_url)
 {
 	E2kUri *current_uri, *new_uri;
-	const char *current_param_val, *new_param_val;
-	const char *params [] = { "owa_url", "ad_server", "use_ssl" };
-	const int n_params = G_N_ELEMENTS (params);
-	int i;
+	const gchar *current_param_val, *new_param_val;
+	const gchar *params [] = { "owa_url", "ad_server", "use_ssl" };
+	const gint n_params = G_N_ELEMENTS (params);
+	gint i;
 	gboolean relogin = FALSE;
 
 	current_uri = e2k_uri_new (current_url);
@@ -1176,8 +1176,8 @@ exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener)
  **/
 void
 exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name,
-							 const char *new_name)
+							 const gchar *old_name,
+							 const gchar *new_name)
 {
 	GConfClient *client;
 	ESourceGroup *group;
@@ -1299,22 +1299,22 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 {
 	CamelURL *curl1, *curl2;
 	gchar *param1, *param2;
-	const char *params[] = {
+	const gchar *params[] = {
 		"auth",
 		"owa_url",
 		"owa_path",
 		"mailbox",
 		"ad_server",
 	};
-	const int n_params = 5;
-	int i;
+	const gint n_params = 5;
+	gint i;
 
 	curl1 = camel_url_new (url1, NULL);
 	curl2 = camel_url_new (url2, NULL);
 
 	for (i = 0; i < n_params; ++i) {
-		param1 = (gchar*) camel_url_get_param (curl1, params[i]);
-		param2 = (gchar*) camel_url_get_param (curl2, params[i]);
+		param1 = (gchar *) camel_url_get_param (curl1, params[i]);
+		param2 = (gchar *) camel_url_get_param (curl2, params[i]);
 		if ((param1 && !param2) || (!param1 && param2) || /* Missing */
 		    (param1 && param2 && strcmp (param1, param2))) { /* Differing */
 			g_free (param1);
@@ -1342,7 +1342,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
  * selection list
  **/
 static void
-remove_selected_non_offline_esources (ExchangeAccount *account, const char *gconf_key)
+remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gconf_key)
 {
 	ESourceGroup *group;
 	ESource *source = NULL;
@@ -1350,11 +1350,11 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon
 	GSList *sources;
 	GSList *ids, *node_to_be_deleted;
 	gboolean found_group;
-	const char *source_uid;
+	const gchar *source_uid;
 	GConfClient *client;
 	ESourceList *source_list = NULL;
-	const char *offline_mode=NULL;
-	char *selected_gconf_key;
+	const gchar *offline_mode=NULL;
+	gchar *selected_gconf_key;
 
 
 	if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) {
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index b5ceca2a27..3ec2d5c62f 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -71,13 +71,13 @@ ExchangeConfigListener *exchange_config_listener_new      (void);
 
 GSList                 *exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener);
 
-void 			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri);
-void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri);
+void 			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
+void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
 ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode);
 
 void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name,
-							 const char *new_name);
+							 const gchar *old_name,
+							 const gchar *new_name);
 
 ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl,
 							ExchangeAccount *account);
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 1955f58eba..aec27f3f69 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -67,7 +67,7 @@ e_exchange_contacts_get_contacts (void)
 	GPtrArray *contacts_list;
 	EFolder *folder;
 
-	int i, prefix_len;
+	gint i, prefix_len;
 	gchar *uri_prefix, *ruri;
 
 	account = exchange_operations_get_exchange_account ();
@@ -84,9 +84,9 @@ e_exchange_contacts_get_contacts (void)
 	for (i=0; i<folder_array->len; ++i) {
 		gchar *type, *tmp;
 		folder = g_ptr_array_index (folder_array, i);
-		type = (gchar*) e_folder_get_type_string (folder);
+		type = (gchar *) e_folder_get_type_string (folder);
 		if (!strcmp (type, "contacts")) {
-			tmp = (gchar*) e_folder_get_physical_uri (folder);
+			tmp = (gchar *) e_folder_get_physical_uri (folder);
 			if (g_str_has_prefix (tmp, uri_prefix)) {
 				ruri = g_strdup (tmp+prefix_len);
 				g_ptr_array_add (contacts_list, ruri);
@@ -136,14 +136,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GPtrArray *conlist;
 	gchar *ruri, *account_name, *uri_text;
 	ExchangeAccount *account;
-	int i;
-	char *folder_size, *abook_name;
-	const char *rel_uri;
-	const char *uid;
+	gint i;
+	gchar *folder_size, *abook_name;
+	const gchar *rel_uri;
+	const gchar *uid;
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
 	ESource *source = t->source;
 	GtkWidget *lbl_offline_msg, *vb_offline_msg;
-	char *offline_msg;
+	gchar *offline_msg;
 	gint offline_status;
 	gboolean gal_folder = FALSE, is_personal;
 
@@ -212,7 +212,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_free (uri_text);
 
 	if (contacts_src_exists && is_personal ) {
-		abook_name = (char*)e_source_peek_name (source);
+		abook_name = (gchar *)e_source_peek_name (source);
 		model = exchange_account_folder_size_get_model (account);
 		if (model)
 			folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, abook_name));
@@ -275,10 +275,10 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	if (contacts_src_exists) {
 		gchar *uri_prefix, *sruri, *tmpruri;
-		int prefix_len;
+		gint prefix_len;
 		GtkTreeSelection *selection;
 
-		tmpruri = (gchar*) rel_uri;
+		tmpruri = (gchar *) rel_uri;
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
 
@@ -311,8 +311,8 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	/* FIXME - check pageid */
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
 	ESourceGroup *group;
-	const char *base_uri;
-	const char *rel_uri;
+	const gchar *base_uri;
+	const gchar *rel_uri;
 	gint offline_status;
 	ExchangeAccount *account;
 
@@ -375,7 +375,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	}
 	else {
 		EUri *euri;
-		int uri_len;
+		gint uri_len;
 		gchar *uri_text, *uri_string, *path, *folder_name;
 		gboolean is_personal;
 
@@ -414,7 +414,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	ESource *source = t->source;
 	gchar *uri_text, *gname, *gruri, *ruri = NULL, *path = NULL, *path_prefix, *oldpath=NULL;
 	gchar *username, *windows_domain, *authtype;
-	int prefix_len;
+	gint prefix_len;
 	ExchangeAccount *account;
 	ExchangeAccountFolderResult result;
 	gint offline_status;
@@ -451,13 +451,13 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	prefix_len = strlen (path_prefix);
 	g_free (path_prefix);
 
-	gname = (gchar*) e_source_peek_name (source);
-	gruri = (gchar*) e_source_peek_relative_uri (source);
+	gname = (gchar *) e_source_peek_name (source);
+	gruri = (gchar *) e_source_peek_relative_uri (source);
 
 	if (contacts_src_exists) {
 		gchar *tmpruri, *uri_string, *temp_path, *prefix;
 		EUri *euri;
-		int uri_len;
+		gint uri_len;
 
 		euri = e_uri_new (uri_text);
 		uri_string = e_uri_to_string (euri, FALSE);
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 7de3948814..437aeec51f 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -54,7 +54,7 @@
  * means "end of list" to e_dialog_combo_box_get/set
  */
 
-static const int exchange_perm_map[] = {
+static const gint exchange_perm_map[] = {
 	E2K_PERMISSIONS_ROLE_NONE,
 	E2K_PERMISSIONS_ROLE_REVIEWER,
 	E2K_PERMISSIONS_ROLE_AUTHOR,
@@ -65,18 +65,18 @@ static const int exchange_perm_map[] = {
 	-1
 };
 
-const char *exchange_delegates_user_folder_names[] = {
+const gchar *exchange_delegates_user_folder_names[] = {
 	"calendar", "tasks", "inbox", "contacts"
 };
 
 /* To translators: The folder names to be displayed in the message being
    sent to the delegatee.
 */
-static const char *folder_names_for_display[] = {
+static const gchar *folder_names_for_display[] = {
 	N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts")
 };
 
-static const char *widget_names[] = {
+static const gchar *widget_names[] = {
 	"calendar_perms_combobox", "task_perms_combobox", "inbox_perms_combobox", "contact_perms_combobox",
 };
 
@@ -156,10 +156,10 @@ parent_window_destroyed (gpointer dialog, GObject *where_parent_window_was)
 
 /* Maps the role_nam parameter to their corresponding Full role name
 */
-static const char *
+static const gchar *
 map_to_full_role_name (E2kPermissionsRole role_nam)
 {
-	const char *role_name;
+	const gchar *role_name;
 
 	switch (role_nam)
 	{
@@ -187,7 +187,7 @@ map_to_full_role_name (E2kPermissionsRole role_nam)
 
 static void
 em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info,
-		       int queued, const char *appended_uid, void *data)
+		       gint queued, const gchar *appended_uid, gpointer data)
 {
 	camel_message_info_free (info);
 	mail_send ();
@@ -211,8 +211,8 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 {
 	GladeXML *xml;
 	GtkWidget *dialog, *table, *label, *combobox, *check, *check_delegate;
-	char *title;
-	int button, i;
+	gchar *title;
+	gint button, i;
 	E2kPermissionsRole role;
 	gboolean modified;
 
@@ -299,13 +299,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			CamelStream *stream;
 			CamelFolder *out_folder;
 			CamelMessageInfo *info;
-			char *self_address, *delegate_mail_subject;
-			char *role_name;
+			gchar *self_address, *delegate_mail_subject;
+			gchar *role_name;
 			GString *role_name_final;
 
-			const char *recipient_address;
-			const char *delegate_exchange_dn;
-			const char *msg_part1 = NULL, *msg_part2 = NULL;
+			const gchar *recipient_address;
+			const gchar *delegate_exchange_dn;
+			const gchar *msg_part1 = NULL, *msg_part2 = NULL;
 
 			role_name_final = g_string_new ("");
 
@@ -456,10 +456,10 @@ exchange_delegates_user_edit (ExchangeAccount *account,
  * with most of the internal data blank).
  **/
 ExchangeDelegatesUser *
-exchange_delegates_user_new (const char *display_name)
+exchange_delegates_user_new (const gchar *display_name)
 {
 	ExchangeDelegatesUser *user;
-	int i;
+	gint i;
 
 	user = g_object_new (EXCHANGE_TYPE_DELEGATES_USER, NULL);
 	user->display_name = g_strdup (display_name);
@@ -487,7 +487,7 @@ exchange_delegates_user_new (const char *display_name)
  **/
 ExchangeDelegatesUser *
 exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc,
-				    const char *email,
+				    const gchar *email,
 		                    GByteArray *creator_entryid)
 {
 	E2kGlobalCatalogStatus status;
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index 251a09de9d..d1a38ca876 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -52,7 +52,7 @@ enum {
 struct _ExchangeDelegatesUser {
 	GObject parent;
 
-	char *display_name, *dn;
+	gchar *display_name, *dn;
 	GByteArray *entryid;
 
 	E2kSid *sid;
@@ -71,9 +71,9 @@ struct _ExchangeDelegatesUserClass {
 
 GType    exchange_delegates_user_get_type (void);
 
-ExchangeDelegatesUser *exchange_delegates_user_new         (const char            *display_name);
+ExchangeDelegatesUser *exchange_delegates_user_new         (const gchar            *display_name);
 ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog      *gc,
-							    const char            *email,
+							    const gchar            *email,
 							    GByteArray            *creator_entryid);
 
 gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user,
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 4038ef0baf..f5e8891b77 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -47,14 +47,14 @@
 #include <glade/glade-xml.h>
 
 typedef struct {
-	const char *uri;
+	const gchar *uri;
 	E2kSecurityDescriptor *sd;
 	gboolean changed;
 } ExchangeDelegatesFolder;
 
 typedef struct {
 	ExchangeAccount *account;
-	char *self_dn;
+	gchar *self_dn;
 
 	GladeXML *xml;
 	GtkWidget *dialog, *parent;
@@ -69,18 +69,18 @@ typedef struct {
 	ExchangeDelegatesFolder freebusy_folder;
 } ExchangeDelegates;
 
-extern const char *exchange_delegates_user_folder_names[];
+extern const gchar *exchange_delegates_user_folder_names[];
 
-const char *exchange_localfreebusy_path = "NON_IPM_SUBTREE/Freebusy%20Data/LocalFreebusy.EML";
+const gchar *exchange_localfreebusy_path = "NON_IPM_SUBTREE/Freebusy%20Data/LocalFreebusy.EML";
 
 static void set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data);
 
 static void
 set_sd_for_href (ExchangeDelegates *delegates,
-		 const char *href,
+		 const gchar *href,
 		 E2kSecurityDescriptor *sd)
 {
-	int i;
+	gint i;
 
 	for (i = 0; i < EXCHANGE_DELEGATES_LAST; i++) {
 		if (!delegates->folder[i].uri)
@@ -112,7 +112,7 @@ set_sd_for_href (ExchangeDelegates *delegates,
 static gboolean
 fill_in_sids (ExchangeDelegates *delegates)
 {
-	int u, u2, sd, needed_sids;
+	gint u, u2, sd, needed_sids;
 	ExchangeDelegatesUser *user, *user2;
 	GList *sids, *s;
 	E2kSid *sid;
@@ -186,11 +186,11 @@ fill_in_sids (ExchangeDelegates *delegates)
 	return ok;
 }
 
-static const char *sd_props[] = {
+static const gchar *sd_props[] = {
 	E2K_PR_EXCHANGE_SD_BINARY,
 	E2K_PR_EXCHANGE_SD_XML
 };
-static const int n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]);
+static const gint n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]);
 
 /* Read the folder security descriptors and match them up with the
  * list of delegates.
@@ -207,7 +207,7 @@ get_folder_security (ExchangeDelegates *delegates)
 	GByteArray *binary_form;
 	ExchangeDelegatesUser *user;
 	guint32 perms;
-	int i, u;
+	gint i, u;
 
 	/* If we've been here before, just return the success or
 	 * failure result from last time.
@@ -228,16 +228,16 @@ get_folder_security (ExchangeDelegates *delegates)
 		delegates->folder[i].uri = exchange_account_get_standard_uri (
 			delegates->account, exchange_delegates_user_folder_names[i]);
 		if (delegates->folder[i].uri) {
-			g_ptr_array_add (hrefs, (char *)e2k_uri_relative (
+			g_ptr_array_add (hrefs, (gchar *)e2k_uri_relative (
 						 delegates->account->home_uri,
 						 delegates->folder[i].uri));
 		}
 	}
-	g_ptr_array_add (hrefs, (char *)exchange_localfreebusy_path);
+	g_ptr_array_add (hrefs, (gchar *)exchange_localfreebusy_path);
 
 	iter = e2k_context_bpropfind_start (
 		ctx, NULL, delegates->account->home_uri,
-		(const char **)hrefs->pdata, hrefs->len,
+		(const gchar **)hrefs->pdata, hrefs->len,
 		sd_props, n_sd_props);
 	g_ptr_array_free (hrefs, TRUE);
 
@@ -281,13 +281,13 @@ get_folder_security (ExchangeDelegates *delegates)
 }
 
 
-static const char *delegation_props[] = {
+static const gchar *delegation_props[] = {
 	PR_DELEGATES_DISPLAY_NAMES,
 	PR_DELEGATES_ENTRYIDS,
 	PR_DELEGATES_SEE_PRIVATE,
 	PR_CREATOR_ENTRYID
 };
-static const int n_delegation_props = sizeof (delegation_props) / sizeof (delegation_props[0]);
+static const gint n_delegation_props = sizeof (delegation_props) / sizeof (delegation_props[0]);
 
 /* Fetch the list of delegates from the freebusy message. */
 static gboolean
@@ -299,7 +299,7 @@ get_user_list (ExchangeDelegates *delegates)
 	GPtrArray *display_names, *entryids, *privflags;
 	GByteArray *entryid;
 	ExchangeDelegatesUser *user;
-	int i;
+	gint i;
 
 	ctx = exchange_account_get_context (delegates->account);
 	iter = e2k_context_bpropfind_start (ctx, NULL,
@@ -359,7 +359,7 @@ add_remove_user (ExchangeDelegatesUser *user,
 		 GPtrArray *to_array, GPtrArray *from_array)
 {
 	ExchangeDelegatesUser *match;
-	int i;
+	gint i;
 
 	for (i = 0; i < from_array->len; i++) {
 		match = from_array->pdata[i];
@@ -379,7 +379,7 @@ static void
 set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data)
 {
 	ExchangeDelegates *delegates = user_data;
-	int i, role;
+	gint i, role;
 	guint32 perms;
 
 	for (i = 0; i < EXCHANGE_DELEGATES_LAST; i++) {
@@ -401,10 +401,10 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 	ExchangeDelegates *delegates = data;
 	E2kGlobalCatalog *gc;
 	GtkWidget *dialog, *parent_window;
-	const char *delegate_exchange_dn;
-	char *email;
+	const gchar *delegate_exchange_dn;
+	gchar *email;
 	ExchangeDelegatesUser *user, *match;
-	int response, u;
+	gint response, u;
 	GtkTreeIter iter;
 
 	if (!get_folder_security (delegates))
@@ -478,7 +478,7 @@ get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter)
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
 	GtkTreePath *path;
-	int *indices, row;
+	gint *indices, row;
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
 	if (!gtk_tree_selection_get_selected (selection, &model, iter))
@@ -498,7 +498,7 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data)
 	ExchangeDelegates *delegates = data;
 	GtkWidget *parent_window;
 	GtkTreeIter iter;
-	int row;
+	gint row;
 
 	if (!get_folder_security (delegates))
 		return;
@@ -512,14 +512,14 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data)
 				      parent_window);
 }
 
-const char *
-email_look_up (const char *delegate_legacy, ExchangeAccount *account)
+const gchar *
+email_look_up (const gchar *delegate_legacy, ExchangeAccount *account)
 {
 	E2kGlobalCatalog *gc;
 	E2kGlobalCatalogEntry *entry;
 	E2kGlobalCatalogStatus status;
 
-	const char *email_id;
+	const gchar *email_id;
 
 	gc = exchange_account_get_global_catalog (account);
 
@@ -541,7 +541,7 @@ table_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer data)
 	ExchangeDelegates *delegates = data;
 	GtkWidget *parent_window;
 	GtkTreeIter iter;
-	int row;
+	gint row;
 
 	if (event->type != GDK_2BUTTON_PRESS)
 		return FALSE;
@@ -565,7 +565,7 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data)
 	ExchangeDelegates *delegates = data;
 	ExchangeDelegatesUser *user;
 	GtkWidget *dialog;
-	int row, btn, i;
+	gint row, btn, i;
 	GtkTreeIter iter;
 
 	if (!get_folder_security (delegates))
@@ -609,7 +609,7 @@ proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder)
 {
 	GByteArray *binsd;
 	E2kProperties *props;
-	const char *href = "";
+	const gchar *href = "";
 	E2kResultIter *iter;
 	E2kResult *result;
 	E2kHTTPStatus status;
@@ -640,7 +640,7 @@ get_user_dn (E2kGlobalCatalog *gc, ExchangeDelegatesUser *user)
 {
 	E2kGlobalCatalogEntry *entry;
 	E2kGlobalCatalogStatus status;
-	const char *exchange_dn;
+	const gchar *exchange_dn;
 
 	exchange_dn = e2k_entryid_to_dn (user->entryid);
 	status = e2k_global_catalog_lookup (
@@ -663,9 +663,9 @@ delegates_apply (ExchangeDelegates *delegates)
 	E2kContext *ctx;
 	GPtrArray *display_names, *entryids, *privflags;
 	GByteArray *entryid_dup;
-	char *error = NULL;
+	gchar *error = NULL;
 	E2kProperties *props;
-	int i;
+	gint i;
 	E2kGlobalCatalogStatus status;
 
 	if (!delegates->loaded_folders)
@@ -837,7 +837,7 @@ static void parent_destroyed (gpointer user_data, GObject *ex_parent);
 static void
 delegates_destroy (ExchangeDelegates *delegates)
 {
-	int i;
+	gint i;
 
 	g_object_unref (delegates->account);
 
@@ -879,7 +879,7 @@ delegates_destroy (ExchangeDelegates *delegates)
 	if (delegates->freebusy_folder.sd)
 		g_object_unref (delegates->freebusy_folder.sd);
 	if (delegates->freebusy_folder.uri)
-		g_free ((char *)delegates->freebusy_folder.uri);
+		g_free ((gchar *)delegates->freebusy_folder.uri);
 
 	if (delegates->xml)
 		g_object_unref (delegates->xml);
@@ -889,7 +889,7 @@ delegates_destroy (ExchangeDelegates *delegates)
 
 
 static void
-dialog_response (GtkDialog *dialog, int response, gpointer user_data)
+dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
 {
 	ExchangeDelegates *delegates = user_data;
 
@@ -915,7 +915,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 	ExchangeDelegatesUser *user;
 	GtkTreeViewColumn *column;
 	GtkTreeIter iter;
-	int i;
+	gint i;
 
 	g_return_if_fail (GTK_IS_WIDGET (parent));
 	g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index 77fc354c60..5defd27f9a 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 void exchange_delegates (ExchangeAccount *account, GtkWidget *parent);
-const char *email_look_up (const char *delegate_legacy, ExchangeAccount *account);
+const gchar *email_look_up (const gchar *delegate_legacy, ExchangeAccount *account);
 
 #ifdef __cplusplus
 }
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 63874c793a..03d7ac7aa9 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -47,7 +47,7 @@
 
 #define d(x)
 
-static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data);
+static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, gpointer data);
 void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t);
 void org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_calendar_permissions (EPlugin *ep, ECalPopupTargetSource *target);
@@ -63,7 +63,7 @@ static EPopupItem popup_items[] = {
 };
 
 static void
-popup_free (EPopup *ep, GSList *items, void *data)
+popup_free (EPopup *ep, GSList *items, gpointer data)
 {
        g_slist_free (items);
 }
@@ -72,8 +72,8 @@ void
 org_gnome_exchange_calendar_permissions (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	GSList *menus = NULL;
-	int i = 0, mode;
-	static int first =0;
+	gint i = 0, mode;
+	static gint first =0;
 	ExchangeAccount *account = NULL;
 	ESource *source = NULL;
 	gchar *uri = NULL;
@@ -113,8 +113,8 @@ void
 org_gnome_exchange_addressbook_permissions (EPlugin *ep, EABPopupTargetSource *target)
 {
 	GSList *menus = NULL;
-	int i = 0, mode;
-	static int first =0;
+	gint i = 0, mode;
+	static gint first =0;
 	ExchangeAccount *account = NULL;
 	ESource *source = NULL;
 	gchar *uri = NULL;
@@ -152,10 +152,10 @@ void
 org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 {
 	GSList *menus = NULL;
-	int i = 0, mode;
-	static int first =0;
+	gint i = 0, mode;
+	static gint first =0;
 	gchar *path = NULL;
-	char *fixed_path = NULL;
+	gchar *fixed_path = NULL;
 	ExchangeAccount *account = NULL;
 
 	d(g_print ("exchange-folder-permission.c: entry\n"));
@@ -201,7 +201,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 }
 
 static void
-org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data)
+org_folder_permissions_cb (EPopup *ep, EPopupItem *p, gpointer data)
 {
 	ExchangeAccount *account = NULL;
 	EFolder *folder = NULL;
@@ -223,7 +223,7 @@ org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *tar
 	ExchangeAccount *account = NULL;
 	EFolder *folder = NULL;
 	gchar *path = NULL;
-	int mode;
+	gint mode;
 
 	if (!g_str_has_prefix (target->uri, "exchange://"))
 		return;
@@ -249,7 +249,7 @@ org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *targ
 	ECalModel *model = NULL;
 	ECal *ecal = NULL;
 	gchar *uri = NULL;
-	int mode;
+	gint mode;
 
 	if (!target)
 		return;
@@ -283,7 +283,7 @@ org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *ta
 	ECalModel *model = NULL;
 	ECal *ecal = NULL;
 	gchar *uri = NULL;
-	int mode;
+	gint mode;
 
 	if (!target)
 		return;
@@ -315,7 +315,7 @@ org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target
 	EFolder *folder = NULL;
 	EBook *ebook = NULL;
 	gchar *uri = NULL;
-	int mode;
+	gint mode;
 
 	if (!target)
 		return;
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index ff3634341a..1a916a9f1b 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -46,7 +46,7 @@ get_folder_size_func (GtkTreeModel *model,
 {
 	GHashTable *info = (GHashTable *) user_data;
 	gdouble folder_size;
-	char *folder_name;
+	gchar *folder_name;
 
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1);
 
@@ -54,11 +54,11 @@ get_folder_size_func (GtkTreeModel *model,
 	return FALSE;
 }
 
-char *
-exchange_folder_size_get_val (GtkListStore *model, const char *folder_name)
+gchar *
+exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name)
 {
 	GHashTable *finfo;
-	char *folder_size, *fsize;
+	gchar *folder_size, *fsize;
 
 	finfo = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
@@ -86,7 +86,7 @@ format_size_func (GtkTreeViewColumn *col,
 {
 	GtkCellRendererText *cell = (GtkCellRendererText *)renderer;
 	gdouble folder_size;
-	char * new_text;
+	gchar * new_text;
 
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, -1);
 
@@ -108,7 +108,7 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
         GladeXML *xml;
         GtkWidget *dialog, *table;
 	GList *l;
-	char *col_name;
+	gchar *col_name;
 
 	printf ("exchange_folder_size_display called\n");
         g_return_if_fail (GTK_IS_WIDGET (parent));
diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 95c795686d..08f22c7114 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 void exchange_folder_size_display (GtkListStore *model, GtkWidget *parent);
-char * exchange_folder_size_get_val (GtkListStore *model, const char *folder_name);
+gchar * exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name);
 
 #ifdef __cplusplus
 }
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 2f72552983..6b5d2375bc 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -105,7 +105,7 @@ setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname)
 		NULL
 		/* FIXME: Should these be translated?  */
 	};
-	int i;
+	gint i;
 
 	combo = GTK_COMBO_BOX (glade_xml_get_widget (glade_xml, "folder-name-combo"));
 	g_assert (GTK_IS_COMBO_BOX_ENTRY (combo));
@@ -120,10 +120,10 @@ setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname)
 
 static void
 folder_name_entry_changed_callback (GtkEditable *editable,
-                                    void *data)
+                                    gpointer data)
 {
 	GtkDialog *dialog = GTK_DIALOG (data);
-	const char *folder_name_text = gtk_entry_get_text (GTK_ENTRY (editable));
+	const gchar *folder_name_text = gtk_entry_get_text (GTK_ENTRY (editable));
 
 	if (*folder_name_text == '\0')
 		gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
@@ -132,10 +132,10 @@ folder_name_entry_changed_callback (GtkEditable *editable,
 }
 
 static void
-user_name_entry_changed_callback (GtkEditable *editable, void *data)
+user_name_entry_changed_callback (GtkEditable *editable, gpointer data)
 {
 	GtkDialog *dialog = GTK_DIALOG (data);
-	const char *user_name_text = gtk_entry_get_text (GTK_ENTRY (editable));
+	const gchar *user_name_text = gtk_entry_get_text (GTK_ENTRY (editable));
 
 	if (*user_name_text == '\0')
 		gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
@@ -181,7 +181,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 {
 	SubscriptionInfo *subscription_info = data;
 	gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL;
-	char *subscriber_email;
+	gchar *subscriber_email;
 	EFolder *folder = NULL;
 	EDestinationStore *destination_store;
 	GList *destinations;
@@ -292,7 +292,7 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
 	GladeXML *glade_xml;
 	GtkWidget *dialog, *ok_button;
 	SubscriptionInfo *subscription_info;
-	int mode;
+	gint mode;
 
 	exchange_account_is_offline (account, &mode);
 	if (mode == OFFLINE_MODE)
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 3362f0ae83..959bdec8e5 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -50,15 +50,15 @@ void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelec
 void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data);
+void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data);
 void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target);
-void org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data);
+void org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data);
 void org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target);
-void org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *data);
-void popup_free (EPopup *ep, GSList *items, void *data);
-void popup_inbox_free (EPopup *ep, GSList *items, void *data);
-void popup_ab_free (EPopup *ep, GSList *items, void *data);
-static void exchange_get_folder (char *uri, CamelFolder *folder, void *data);
+void org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data);
+void popup_free (EPopup *ep, GSList *items, gpointer data);
+void popup_inbox_free (EPopup *ep, GSList *items, gpointer data);
+void popup_ab_free (EPopup *ep, GSList *items, gpointer data);
+static void exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data);
 
 #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars"
 
@@ -68,20 +68,20 @@ static EPopupItem popup_inbox_items[] = {
 };
 
 void
-popup_inbox_free (EPopup *ep, GSList *items, void *data)
+popup_inbox_free (EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free (items);
 }
 
 void
-org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data)
 {
 	ExchangeAccount *account = NULL;
 	EMPopupTargetFolder *target = data;
 	gchar *path = NULL;
 	gchar *stored_path = NULL;
-	const char *inbox_uri = NULL;
-	const char *inbox_physical_uri = NULL;
+	const gchar *inbox_uri = NULL;
+	const gchar *inbox_physical_uri = NULL;
 	gchar *target_uri = NULL;
 	EFolder *inbox;
 	ExchangeAccountFolderResult result;
@@ -147,11 +147,11 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
 }
 
 static CamelFolderInfo *
-ex_create_folder_info (CamelStore *store, char *name, char *uri,
-                  int unread_count, int flags)
+ex_create_folder_info (CamelStore *store, gchar *name, gchar *uri,
+                  gint unread_count, gint flags)
 {
         CamelFolderInfo *info;
-        const char *path;
+        const gchar *path;
 
         path = strstr (uri, "://");
         if (!path)
@@ -170,7 +170,7 @@ ex_create_folder_info (CamelStore *store, char *name, char *uri,
 }
 
 static void
-exchange_get_folder (char *uri, CamelFolder *folder, void *data)
+exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data)
 {
 	CamelStore *store;
 	CamelException ex;
@@ -206,7 +206,7 @@ void
 org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target)
 {
 	GSList *menus = NULL;
-	int i = 0;
+	gint i = 0;
 	ExchangeAccount *account = NULL;
 	gchar *path = NULL;
 	gchar *sub_folder = NULL;
@@ -237,7 +237,7 @@ static EPopupItem popup_items[] = {
 };
 
 void
-popup_free (EPopup *ep, GSList *items, void *data)
+popup_free (EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free (items);
 }
@@ -247,7 +247,7 @@ static EPopupItem popup_ab_items[] = {
 };
 
 void
-popup_ab_free (EPopup *ep, GSList *items, void *data)
+popup_ab_free (EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free (items);
 }
@@ -256,12 +256,12 @@ void
 org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)
 {
 	GSList *menus = NULL;
-	int i = 0;
+	gint i = 0;
 	ESource *source = NULL;
 	gchar *uri = NULL;
 	gchar *path = NULL;
-	char *sub_folder = NULL;
-	const char *base_uri;
+	gchar *sub_folder = NULL;
+	const gchar *base_uri;
 	ExchangeAccount *account = NULL;
 	ESourceGroup *group;
 
@@ -298,12 +298,12 @@ void
 org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	GSList *menus = NULL;
-	int i = 0;
+	gint i = 0;
 	ESource *source = NULL;
 	gchar *ruri = NULL;
 	gchar *path = NULL;
-	char *sub_folder = NULL;
-	const char *base_uri;
+	gchar *sub_folder = NULL;
+	const gchar *base_uri;
 	ExchangeAccount *account = NULL;
 	ESourceGroup *group;
 
@@ -335,14 +335,14 @@ org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target)
 }
 
 static void
-unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data)
+unsubscribe_dialog_ab_response (GtkDialog *dialog, gint response, gpointer data)
 {
 
 	if (response == GTK_RESPONSE_OK) {
 		ExchangeAccount *account = NULL;
 		gchar *path = NULL;
 		gchar *uri = NULL;
-		const char *source_uid = NULL;
+		const gchar *source_uid = NULL;
 		ESourceGroup *source_group = NULL;
 		ESource *source = NULL;
 		EABPopupTargetSource *target = data;
@@ -371,7 +371,7 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data)
 }
 
 static void
-unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
+unsubscribe_dialog_response (GtkDialog *dialog, gint response, gpointer data)
 {
 
 	if (response == GTK_RESPONSE_OK) {
@@ -379,7 +379,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 		ExchangeAccount *account = NULL;
 		gchar *path = NULL;
 		gchar *ruri = NULL;
-		const char *source_uid = NULL;
+		const gchar *source_uid = NULL;
 		GConfClient *client;
 		ESourceGroup *source_group = NULL;
 		ESource *source = NULL;
@@ -430,7 +430,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 }
 
 void
-org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data)
 {
 	GtkWidget *dialog = NULL;
 	EABPopupTargetSource *target = data;
@@ -485,7 +485,7 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 	unsubscribe_dialog_ab_response (GTK_DIALOG (dialog), response, data);
 }
 void
-org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data)
 {
 	GtkWidget *dialog = NULL;
 	ECalPopupTargetSource *target = data;
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 74d3af258e..39929eaa5b 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -44,7 +44,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
 	CamelAddress *sender_address;
-	const char *sender_id, *recipient_id;
+	const gchar *sender_id, *recipient_id;
 	struct _camel_header_address *addr;
 	struct _camel_header_address *sender_addr;
 
@@ -86,7 +86,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 			e_msg_composer_remove_header (composer, "Sensitivity");
 
 		sender_address = (CamelAddress *) e_msg_composer_get_from (composer);
-		sender_id = (const char*) camel_address_encode (sender_address);
+		sender_id = (const gchar *) camel_address_encode (sender_address);
 
 		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
 		sender_addr = camel_header_address_decode (sender_id, NULL);
@@ -122,7 +122,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		if (dialog->options->delivery_enabled) {
 			EComposerHeaderTable *table;
 			EAccount *account;
-			char *mdn_address;
+			gchar *mdn_address;
 
 			table = e_msg_composer_get_header_table (composer);
 			account = e_composer_header_table_get_account (table);
@@ -137,7 +137,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		if (dialog->options->read_enabled) {
 			EComposerHeaderTable *table;
 			EAccount *account;
-			char *mdn_address;
+			gchar *mdn_address;
 
 			table = e_msg_composer_get_header_table (composer);
 			account = e_composer_header_table_get_account (table);
@@ -171,7 +171,7 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 	EMsgComposer *composer = target->composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
-	char *temp = NULL;
+	gchar *temp = NULL;
 
 	table = e_msg_composer_get_header_table (composer);
 	account = e_composer_header_table_get_account (table);
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index 553a41695e..e9b8d3fd5d 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -57,8 +57,8 @@ free_exchange_listener (void)
 	g_object_unref (exchange_global_config_listener);
 }
 
-int
-e_plugin_lib_enable (EPluginLib *eplib, int enable)
+gint
+e_plugin_lib_enable (EPluginLib *eplib, gint enable)
 {
 	if (!exchange_global_config_listener) {
 		exchange_global_config_listener = exchange_config_listener_new ();
@@ -75,10 +75,10 @@ exchange_is_offline (gint *mode)
 
 /* FIXME: See if a GLib variant of this function available */
 gboolean
-exchange_operations_tokenize_string (char **string, char *token, char delimit, unsigned int maxsize)
+exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize)
 {
-	unsigned int i=0;
-	char *str=*string;
+	guint i=0;
+	gchar *str=*string;
 	while (*str!=delimit && *str!='\0' && i<maxsize-1) {
 		token[i++]=*str++;
 	}
@@ -92,11 +92,11 @@ exchange_operations_tokenize_string (char **string, char *token, char delimit, u
 }
 
 gboolean
-exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *ruri)
+exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *ruri)
 {
 	GtkTreeIter iter;
-	char *luri=(char *)ruri;
-	char nodename[80];
+	gchar *luri=(gchar *)ruri;
+	gchar nodename[80];
 	gchar *uri;
 	gboolean status, found;
 
@@ -146,10 +146,10 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 }
 
 void
-exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection)
+exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection)
 {
-	char *luri=(char *)nuri;
-	char nodename[80];
+	gchar *luri=(gchar *)nuri;
+	gchar nodename[80];
 	GtkTreeIter iter;
 	gboolean status;
 
@@ -273,7 +273,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
 	sources = e_source_group_peek_sources (group);
 	for (tsource = sources; tsource != NULL; tsource = tsource->next) {
 		gchar *ruri;
-		ruri = (gchar*) e_source_peek_relative_uri (tsource->data);
+		ruri = (gchar *) e_source_peek_relative_uri (tsource->data);
 		if (ruri && g_strrstr (ruri, old_path)) {
 			/* This ESource points to one of the child folders */
 			gchar **tmpv, *truri;
@@ -288,7 +288,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
 }
 
 gboolean
-is_exchange_personal_folder (ExchangeAccount *account, char *uri)
+is_exchange_personal_folder (ExchangeAccount *account, gchar *uri)
 {
 	ExchangeHierarchy *hier;
 	EFolder *folder;
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index c453b0b978..5de844ba7f 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -38,21 +38,21 @@ extern "C" {
 
 extern ExchangeConfigListener *exchange_global_config_listener;
 
-int e_plugin_lib_enable (EPluginLib *eplib, int enable);
+gint e_plugin_lib_enable (EPluginLib *eplib, gint enable);
 
 ExchangeAccount *exchange_operations_get_exchange_account (void);
 ExchangeConfigListenerStatus exchange_is_offline (gint *mode);
 
-gboolean exchange_operations_tokenize_string (char **string, char *token, char delimit, unsigned int maxsize);
+gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize);
 
-gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri);
-void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection) ;
+gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri);
+void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ;
 
 void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result);
 
 void exchange_operations_update_child_esources (ESource *source, const gchar *old_path, const gchar *new_path);
 
-gboolean is_exchange_personal_folder (ExchangeAccount *account, char *uri);
+gboolean is_exchange_personal_folder (ExchangeAccount *account, gchar *uri);
 
 #ifdef __cplusplus
 }
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index a83d54c517..9456754377 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -45,7 +45,7 @@
 
 struct _ExchangePermissionsDialogPrivate {
 	ExchangeAccount *account;
-	char *base_uri, *folder_path;
+	gchar *base_uri, *folder_path;
 	E2kSecurityDescriptor *sd;
 	gboolean changed;
 	gboolean frozen;
@@ -129,13 +129,13 @@ static void get_widgets         (ExchangePermissionsDialog *dialog,
 static void setup_user_list     (ExchangePermissionsDialog *dialog);
 static void display_permissions (ExchangePermissionsDialog *dialog);
 static void dialog_response     (ExchangePermissionsDialog *dialog,
-				 int response, gpointer user_data);
+				 gint response, gpointer user_data);
 
-static const char *sd_props[] = {
+static const gchar *sd_props[] = {
 	E2K_PR_EXCHANGE_SD_BINARY,
 	E2K_PR_EXCHANGE_SD_XML
 };
-static const int n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]);
+static const gint n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]);
 
 /**
  * exchange_permissions_dialog_new:
@@ -151,15 +151,15 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
 				 GtkWidget *parent)
 {
 	ExchangePermissionsDialog *dialog;
-	const char *base_uri, *folder_uri, *folder_path;
+	const gchar *base_uri, *folder_uri, *folder_path;
 	E2kContext *ctx;
 	ExchangeHierarchy *hier;
 	GladeXML *xml;
 	GtkWidget *box;
-	char *title;
+	gchar *title;
 	E2kHTTPStatus status;
 	E2kResult *results;
-	int nresults = 0;
+	gint nresults = 0;
 	xmlNode *xml_form;
 	GByteArray *binary_form;
 
@@ -242,7 +242,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
 }
 
 static void
-dialog_response (ExchangePermissionsDialog *dialog, int response,
+dialog_response (ExchangePermissionsDialog *dialog, gint response,
 		 gpointer user_data)
 {
 	E2kContext *ctx;
@@ -276,7 +276,7 @@ dialog_response (ExchangePermissionsDialog *dialog, int response,
 	 * folder hierarchy. #29726
 	 */
 	iter = e2k_context_bproppatch_start (ctx, NULL, dialog->priv->base_uri,
-					     (const char **)&dialog->priv->folder_path, 1,
+					     (const gchar **)&dialog->priv->folder_path, 1,
 					     props, FALSE);
 	e2k_properties_free (props);
 
@@ -388,7 +388,7 @@ add_clicked (GtkButton *button, gpointer user_data)
 	const guint8 *bsid, *bsid2;
 	GList *email_list = NULL;
 	GList *l = NULL;
-	char *email = NULL;
+	gchar *email = NULL;
 	gboolean valid;
 	gint result;
 
@@ -525,7 +525,7 @@ static void
 role_changed (GtkWidget *role_combo, gpointer user_data)
 {
 	ExchangePermissionsDialog *dialog = user_data;
-	int role;
+	gint role;
 
 	if (dialog->priv->frozen)
 		return;
@@ -548,7 +548,7 @@ role_changed (GtkWidget *role_combo, gpointer user_data)
 static void
 display_role (ExchangePermissionsDialog *dialog)
 {
-	int role = dialog->priv->selected_role;
+	gint role = dialog->priv->selected_role;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 
@@ -772,17 +772,17 @@ get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml)
 			  "toggled", G_CALLBACK (rv_toggle), dialog);
 }
 
-GtkWidget *exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char *string2, int int1, int int2);
+GtkWidget *exchange_permissions_role_optionmenu_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2);
 
 GtkWidget *
-exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char *string2, int int1, int int2)
+exchange_permissions_role_optionmenu_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2)
 {
 	GtkWidget *menu;
-	const char **roles;
-	int role;
+	const gchar **roles;
+	gint role;
 
 	menu = gtk_combo_box_new_text ();
-	roles = g_new (const char *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1);
+	roles = g_new (const gchar *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1);
 	for (role = 0; role < E2K_PERMISSIONS_ROLE_NUM_ROLES; role++) {
 		roles[role] = e2k_permissions_role_get_name (role);
 		gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index a9858d324a..783887cb24 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -68,7 +68,7 @@ struct _ExchangeSendOptionsDialogPrivate {
 	/*Label Widgets*/
 	GtkWidget *importance_label;
 	GtkWidget *sensitivity_label;
-	char *help_section;
+	gchar *help_section;
 };
 
 static void exchange_sendoptions_dialog_class_init (GObjectClass *object_class);
@@ -92,7 +92,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
-	const char *address, *email, *name;
+	const gchar *address, *email, *name;
 
 	guint count=0;
 	ENameSelectorEntry *name_selector_entry;
@@ -120,8 +120,8 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 		   produced ambiguous results. Hence count is used :)
 		*/
 		for (; tmp != NULL; tmp = g_list_next (tmp)) {
-			address = g_strdup ((char *) e_destination_get_address (tmp->data));
-			email = g_strdup ((char *) e_destination_get_email (tmp->data));
+			address = g_strdup ((gchar *) e_destination_get_address (tmp->data));
+			email = g_strdup ((gchar *) e_destination_get_email (tmp->data));
 			name = g_strdup (e_destination_get_name (tmp->data));
 			if (g_str_equal (email, ""))
 				continue;
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index b7bb9dd58b..8a6d37d947 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -60,9 +60,9 @@ typedef struct {
 	gboolean send_as_del_enabled;
 	gboolean delivery_enabled;
 	gboolean read_enabled;
-	const char *delegate_name;
-	const char *delegate_email;
-	const char *delegate_address;
+	const gchar *delegate_name;
+	const gchar *delegate_email;
+	const gchar *delegate_address;
 } ExchangeSendOptions ;
 
 struct _ExchangeSendOptionsDialog {
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index 9285b9680e..3b7602f6e4 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -30,7 +30,7 @@
 #include "e2k-xml-utils.h"
 
 struct _E2kUserDialogPrivate {
-	char *section_name;
+	gchar *section_name;
 	ENameSelector *name_selector;
 	GtkWidget *entry, *parent_window;
 };
@@ -125,8 +125,8 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data)
 static gboolean
 e2k_user_dialog_construct (E2kUserDialog *dialog,
 			   GtkWidget *parent_window,
-			   const char *label_text,
-			   const char *section_name)
+			   const gchar *label_text,
+			   const gchar *section_name)
 {
 	E2kUserDialogPrivate *priv;
 	GtkWidget *hbox, *vbox, *label, *button;
@@ -197,7 +197,7 @@ e2k_user_dialog_construct (E2kUserDialog *dialog,
  **/
 GtkWidget *
 e2k_user_dialog_new (GtkWidget *parent_window,
-		     const char *label_text, const char *section_name)
+		     const gchar *label_text, const gchar *section_name)
 {
 	E2kUserDialog *dialog;
 
@@ -243,7 +243,7 @@ e2k_user_dialog_get_user_list (E2kUserDialog *dialog)
 		return NULL;
 
 	for (l = destinations; l; l = g_list_next (l)) {
-		const char *mail;
+		const gchar *mail;
 		destination = l->data;
 
 		mail = e_destination_get_email (destination);
@@ -263,7 +263,7 @@ e2k_user_dialog_get_user_list (E2kUserDialog *dialog)
  *
  * Return value: the email address, which must be freed with g_free().
  **/
-char *
+gchar *
 e2k_user_dialog_get_user (E2kUserDialog *dialog)
 {
 	E2kUserDialogPrivate *priv;
diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h
index 6bf191bc6e..8b6134befe 100644
--- a/plugins/exchange-operations/exchange-user-dialog.h
+++ b/plugins/exchange-operations/exchange-user-dialog.h
@@ -48,9 +48,9 @@ struct _E2kUserDialogClass {
 
 GType      e2k_user_dialog_get_type (void);
 GtkWidget *e2k_user_dialog_new      (GtkWidget     *parent_window,
-				     const char    *label_text,
-				     const char    *section_name);
-char      *e2k_user_dialog_get_user (E2kUserDialog *dialog);
+				     const gchar    *label_text,
+				     const gchar    *section_name);
+gchar      *e2k_user_dialog_get_user (E2kUserDialog *dialog);
 GList      *e2k_user_dialog_get_user_list (E2kUserDialog *dialog);
 
 #endif /* __E2K_USER_DIALOG_H__ */