Prefer GLib basic types over C types.

15 files changed, 177 insertions, 177 deletions

diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index b6519c636e..ae0c5e1e8a 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -34,9 +34,9 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
 	ESource *source = t->source;
-	char *uri_text;
+	gchar *uri_text;
 	ESourceGroup *source_group;
-	char *relative_uri;
+	gchar *relative_uri;
 	GSList *l;
 
 	uri_text = e_source_get_uri (source);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 29c5ed2855..c9d4ad54e4 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -57,17 +57,17 @@ struct AcceptData {
 void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target);
 
 static void
-install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
+install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 {
 	struct AcceptData *accept_data = (struct AcceptData *)data;
 	EMFolderTreeModel *model;
-	const char *uri, *path;
-	int parts = 0;
+	const gchar *uri, *path;
+	gint parts = 0;
 	gchar **names;
 	gchar *folder_name;
 	gchar *parent_name;
 	gchar *container_id;
-	const char *item_id;
+	const gchar *item_id;
 	CamelException ex;
 	CamelStore *store;
 	CamelFolder *folder;
@@ -106,12 +106,12 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 		if(E_IS_GW_CONNECTION (cnc)) {
 			container_id = get_container_id (cnc, parent_name);
 
-			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (char *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
+			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
 
 				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
 				/*changes = camel_folder_change_info_new ();
-				camel_folder_change_info_remove_uid (changes, (char *) item_id);
+				camel_folder_change_info_remove_uid (changes, (gchar *) item_id);
 				camel_folder_summary_remove_uid (folder->summary, item_id);*/
 				/* camel_folder_delete_message (folder, item_id); */
 				camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
@@ -146,7 +146,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 }
 
 static void
-accept_free(void *data)
+accept_free(gpointer data)
 {
 	struct AcceptData *accept_data = data;
 
@@ -161,7 +161,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog;
 	struct AcceptData *accept_data;
-	char *uri;
+	gchar *uri;
 
 	accept_data = g_new0(struct AcceptData, 1);
 	model = mail_component_peek_tree_model (NULL);
@@ -186,20 +186,20 @@ void
 org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 {
 	const CamelInternetAddress *from_addr = NULL;
-	const char *name;
-	const char *email;
+	const gchar *name;
+	const gchar *email;
 	GtkWidget *window;
 	GnomeDruid *wizard;
 	GnomeDruidPageEdge *title_page;
 	CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
 	CamelStreamMem *content;
 	CamelDataWrapper *dw;
-	char *start_message;
+	gchar *start_message;
 
 	if (!msg)
 		return;
 
-	if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
+	if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
 	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
 	    || !camel_internet_address_get(from_addr, 0, &name, &email)
 	    || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 3e7d522c19..aa8c96368d 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -52,7 +52,7 @@ abort_changes (JunkSettings *js)
 }
 
 static void
-junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js)
+junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js)
 {
 	if (response == GTK_RESPONSE_ACCEPT) {
 		commit_changes(js);
@@ -66,11 +66,11 @@ junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js)
 }
 
 static void
-junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
+junk_mail_settings (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	GtkWidget *dialog ,*w, *notebook, *box;
 	JunkSettings *junk_tab;
-	int page_count =0;
+	gint page_count =0;
 	EGwConnection *cnc;
 	gchar *msg;
 	CamelFolder *folder = (CamelFolder *)data;
@@ -118,7 +118,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);
 }
@@ -128,8 +128,8 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
 
-	int i = 0;
-	static int first = 0;
+	gint i = 0;
+	static gint first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 3d66a1c518..cc735feee1 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -35,7 +35,7 @@
 
 struct _JunkEntry {
 	EGwJunkEntry *entry;
-	int flag;
+	gint flag;
 };
 
 typedef struct _JunkEntry JunkEntry;
@@ -175,9 +175,9 @@ static void
 get_junk_list (JunkSettings *js)
 {
 	GList *list = NULL;
-	char *entry;
-	char *msg;
-	int use_junk, use_block, use_pab, persistence;
+	gchar *entry;
+	gchar *msg;
+	gint use_junk, use_block, use_pab, persistence;
 
 	if (E_IS_GW_CONNECTION (js->cnc)) {
 		if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) {
@@ -227,7 +227,7 @@ commit_changes (JunkSettings *js)
 	GList *node = NULL;
 	JunkEntry *junk_entry = NULL;
 	EGwJunkEntry *entry;
-	int use_junk, use_pab, use_block, persistence;
+	gint use_junk, use_pab, use_block, persistence;
 
 	for (node = js->junk_list; node; node = node->next)
 	{
@@ -301,8 +301,8 @@ disable_clicked (GtkRadioButton *button, JunkSettings *js)
 static void
 add_clicked(GtkButton *button, JunkSettings *js)
 {
-	const char *email = NULL;
-	const char *self_email = NULL;
+	const gchar *email = NULL;
+	const gchar *self_email = NULL;
 	JunkEntry *new_entry = NULL;
 	EGwJunkEntry *junk_entry = NULL;
 	gchar *msg = NULL;
@@ -372,7 +372,7 @@ static void
 junk_settings_construct (JunkSettings *js)
 {
 	GladeXML *xml;
-	char *gladefile;
+	gchar *gladefile;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 				      "junk-settings.glade",
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index cf039931a5..7007ba5760 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -36,19 +36,19 @@
 void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t);
 
 
-static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
+static void retract_mail_settings (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder = (CamelFolder *)data;
 	CamelStore *store = folder->parent_store;
-	char *id;
+	gchar *id;
 	GtkWidget *confirm_dialog, *confirm_warning;
-	int n;
+	gint n;
 
 	cnc = get_cnc (store);
 
 	if (cnc && E_IS_GW_CONNECTION(cnc)) {
-		id = (char *)item->user_data;
+		id = (gchar *)item->user_data;
 
 		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL,
 				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -87,7 +87,7 @@ static EPopupItem popup_items[] = {
 	{ E_POPUP_ITEM, (gchar *) "20.emfv.04", (gchar *) N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
-static void popup_free (EPopup *ep, GSList *items, void *data)
+static void popup_free (EPopup *ep, GSList *items, gpointer data)
 {
 	g_slist_free (items);
 }
@@ -96,8 +96,8 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
 	GPtrArray *uids;
-	int i = 0;
-	static int first = 0;
+	gint i = 0;
+	static gint first = 0;
 
 	uids = t->uids;
 	if (g_strrstr (t->uri, "groupwise://") && !g_ascii_strcasecmp((t->folder)->full_name, "Sent Items")) {
@@ -105,7 +105,7 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 		/* for translation*/
 		if (!first) {
 			popup_items[1].label =  _(popup_items[1].label);
-			popup_items[1].user_data = g_strdup((char *) g_ptr_array_index(uids, 0));
+			popup_items[1].user_data = g_strdup((gchar *) g_ptr_array_index(uids, 0));
 		}
 
 		first++;
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 7954f9e1a4..05b3452091 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -46,7 +46,7 @@ static ESendOptionsDialog * dialog = NULL ;
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
 static time_t
-add_day_to_time (time_t time, int days)
+add_day_to_time (time_t time, gint days)
 {
 	struct tm *tm;
 
@@ -61,8 +61,8 @@ static void
 feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 {
 	EMsgComposer *comp;
-	char value [100];
-	char *temp = NULL;
+	gchar value [100];
+	gchar *temp = NULL;
 
 	comp = (EMsgComposer *) data;
 	/* we are bothered only for ok response: other cases are handled generally*/
@@ -145,7 +145,7 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
-	char *temp = NULL;
+	gchar *temp = NULL;
 
 	table = e_msg_composer_get_header_table (comp);
 	account = e_composer_header_table_get_account (table);
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 67123decf4..57eba9392c 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -44,10 +44,10 @@ ECalendarView *c_view;
 
 void org_gnome_accept(EPlugin *ep, ECalPopupTargetSelect *target);
 void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target);
-static void on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data);
-static void on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data);
-static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data);
-static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data);
+static void on_accept_meeting (EPopup *ep, EPopupItem *pitem, gpointer data);
+static void on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, gpointer data);
+static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, gpointer data);
+static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, gpointer data);
 
 static EPopupItem popup_items[] = {
 	{ E_POPUP_ITEM, (gchar *) "41.accept", (gchar *) N_("Accept"), on_accept_meeting, NULL, (gchar *) GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
@@ -56,7 +56,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);
 	items = NULL;
@@ -67,9 +67,9 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
 	GList *selected;
-	int i = 0;
-	static int first = 0;
-	const char *uri = NULL;
+	gint i = 0;
+	static gint first = 0;
+	const gchar *uri = NULL;
 	ECalendarView *cal_view = E_CALENDAR_VIEW (target->target.widget);
 
 	c_view = cal_view;
@@ -135,7 +135,7 @@ receive_objects (gpointer data)
 }
 
 static icalproperty *
-find_attendee (icalcomponent *ical_comp, const char *address)
+find_attendee (icalcomponent *ical_comp, const gchar *address)
 {
 	icalproperty *prop;
 
@@ -146,8 +146,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)
@@ -167,7 +167,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 	return prop;
 }
 static void
-change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status)
+change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status)
 {
 	icalproperty *prop;
 
@@ -206,7 +206,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 		gboolean recurring = FALSE;
 		GThread *thread = NULL;
 		GError *error = NULL;
-		char *address = NULL;
+		gchar *address = NULL;
 
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		address = itip_get_comp_attendee (comp, event->comp_data->client);
@@ -226,7 +226,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 
 		if (recurring) {
 			gint response;
-			const char *msg;
+			const gchar *msg;
 
 			if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE)
 				msg = "org.gnome.evolution.process_meeting:recurrence-accept";
@@ -236,7 +236,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 			response = e_error_run (NULL, msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
 				icalproperty *prop;
-				const char *uid = icalcomponent_get_uid (r_data->icalcomp);
+				const gchar *uid = icalcomponent_get_uid (r_data->icalcomp);
 
 				prop = icalproperty_new_x ("All");
 				icalproperty_set_x_name (prop, "X-GW-RECUR-INSTANCES-MOD-TYPE");
@@ -263,14 +263,14 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 /*FIXME the data does not give us the ECalendarView object.
   we should remove the global c_view variable once we get it from the data*/
 static void
-on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+on_accept_meeting (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = c_view;
 
 	process_meeting (cal_view, ICAL_PARTSTAT_ACCEPTED);
 }
 static void
-on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data)
+on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = c_view;
 
@@ -278,7 +278,7 @@ on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+on_decline_meeting (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = c_view;
 
@@ -289,8 +289,8 @@ static gboolean
 is_meeting_owner (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) &&
@@ -327,9 +327,9 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
 	GList *selected;
-	int i = 0;
-	static int first = 0;
-	const char *uri = NULL;
+	gint i = 0;
+	static gint first = 0;
+	const gchar *uri = NULL;
 	ECalendarView *cal_view = E_CALENDAR_VIEW (target->target.widget);
 	ECalComponent *comp = NULL;
 	ECalendarViewEvent *event = NULL;
@@ -373,7 +373,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 }
 
 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;
@@ -415,8 +415,8 @@ retract_object (gpointer val)
 	ThreadData *data = val;
 	icalcomponent *icalcomp = NULL, *mod_comp = NULL;
 	GList *users = NULL;
-	char *rid = NULL;
-	const char *uid;
+	gchar *rid = NULL;
+	const gchar *uid;
 	GError *error = NULL;
 
 	add_retract_data (data->comp, NULL, data->mod);
@@ -459,7 +459,7 @@ static void
 object_created_cb (CompEditor *ce, gpointer data)
 {
 	GThread *thread = NULL;
-	int response;
+	gint response;
 	GError *error = NULL;
 
 	gtk_widget_hide (GTK_WIDGET (ce));
@@ -478,7 +478,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 }
 
 static void
-on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
+on_resend_meeting (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = c_view;
 	GList *selected;
@@ -492,7 +492,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 		CalObjModType mod = CALOBJ_MOD_THIS;
 		ThreadData *data = NULL;
 		gint response;
-		const char *msg;
+		const gchar *msg;
 		/* inserting the boolean to share the code between resend and retract */
 		gboolean resend = TRUE;
 
@@ -521,7 +521,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 		if (resend)
 		{
 			guint flags = 0;
-			char *new_uid = NULL;
+			gchar *new_uid = NULL;
 			CompEditor *ce;
 			icalcomponent *icalcomp;
 
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index ebcf068bf0..29c6545f01 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -69,7 +69,7 @@ struct _proxyLoginPrivate {
 	/*Tree View*/
 	GtkTreeView *tree;
 
-	char *help_section;
+	gchar *help_section;
 };
 
 static void
@@ -175,12 +175,12 @@ proxy_login_new (void)
 }
 
 static int
-proxy_get_password (EAccount *account, char **user_name, char **password)
+proxy_get_password (EAccount *account, gchar **user_name, gchar **password)
 {
 	const gchar *failed_auth;
-	char *uri, *key, *prompt;
+	gchar *uri, *key, *prompt;
 	CamelURL *url;
-	const char *poa_address, *use_ssl = NULL, *soap_port;
+	const gchar *poa_address, *use_ssl = NULL, *soap_port;
 
 	url = camel_url_new (account->source->url, NULL);
 	if (url == NULL)
@@ -223,8 +223,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 	EGwConnection *cnc;
 	CamelURL *url;
 	const gchar *failed_auth;
-	char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL;
-	const char *use_ssl = NULL, *soap_port;
+	gchar *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL;
+	const gchar *use_ssl = NULL, *soap_port;
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
@@ -259,7 +259,7 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 	g_free (prompt);
 	cnc = e_gw_connection_new (uri, url->user, password);
 	if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
-		char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+		gchar *http_uri = g_strconcat ("http://", uri + 8, NULL);
 		cnc = e_gw_connection_new (http_uri, url->user, password);
 		g_free (http_uri);
 	}
@@ -278,11 +278,11 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 {
 	GtkWidget *account_name_tbox;
 	proxyLoginPrivate *priv;
-	char *proxy_name;
+	gchar *proxy_name;
 
 	priv = pld->priv;
 	account_name_tbox = glade_xml_get_widget (priv->xml, "account_name");
-	proxy_name = g_strdup ((char *) gtk_entry_get_text ((GtkEntry *) account_name_tbox));
+	proxy_name = g_strdup ((gchar *) gtk_entry_get_text ((GtkEntry *) account_name_tbox));
 
 	switch (state) {
 	    case GTK_RESPONSE_OK:
@@ -302,18 +302,18 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 }
 
 static void
-proxy_soap_login (char *email)
+proxy_soap_login (gchar *email)
 {
 	EAccountList *accounts = mail_config_get_accounts();
 	EAccount *srcAccount;
 	EAccount *dstAccount;
 	EGwConnection *proxy_cnc, *cnc;
 	CamelURL *uri = NULL, *parent = NULL ;
-	char *password = NULL, *user_name = NULL;
-	char *proxy_source_url = NULL, *parent_source_url = NULL ;
-	char *name;
-	int i;
-	int permissions = 0;
+	gchar *password = NULL, *user_name = NULL;
+	gchar *proxy_source_url = NULL, *parent_source_url = NULL ;
+	gchar *name;
+	gint i;
+	gint permissions = 0;
 
 	for (i=0; email[i]!='\0' && email[i]!='@' ; i++);
 	if (email[i]=='@')
@@ -374,11 +374,11 @@ proxy_soap_login (char *email)
 
 
 static void
-proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data)
+proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data)
 {
 	MailComponent *component = mail_component_peek ();
 	EAccount *account = user_data;
-	int permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions"));
+	gint permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions"));
 
 	if (store == NULL)
 		return;
@@ -398,7 +398,7 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 	GtkTreeIter iter;
 	GtkWidget *account_name_tbox;
 	GtkTreeModel *model;
-	char *account_mailid;
+	gchar *account_mailid;
 
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 	gtk_tree_selection_get_selected (account_select, &model, &iter);
@@ -436,11 +436,11 @@ static void
 proxy_login_update_tree (void)
 {
     	GtkTreeIter iter;
-	int i,n;
+	gint i,n;
 	GdkPixbuf *broken_image = NULL;
 	GList *proxy_list = NULL;
-	char *proxy_name;
-	char *proxy_email;
+	gchar *proxy_name;
+	gchar *proxy_email;
 	EGwConnection *cnc;
 	proxyLoginPrivate *priv = pld->priv;
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
@@ -471,12 +471,12 @@ proxy_login_update_tree (void)
 }
 
 void
-org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
+org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, gpointer data)
 {
-	char *uri = data;
+	gchar *uri = data;
 	proxyLoginPrivate *priv;
 	EGwConnection *cnc;
-	char *gladefile;
+	gchar *gladefile;
 
 	/* This pops-up the password dialog in case the User has forgot-passwords explicitly */
 	cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL);
@@ -513,7 +513,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);
 }
@@ -523,7 +523,7 @@ org_gnome_create_proxy_login_option (EPlugin *ep, EMPopupTargetFolder *t)
 {
 	EAccount *account;
 	GSList *menus = NULL;
-	int i;
+	gint i;
 
 	account = mail_config_get_account_by_source_url (t->uri);
 	if (g_strrstr (t->uri,"groupwise://") && !account->parent_uid) {
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 24717f8cc7..47c2b3b901 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -53,13 +53,13 @@ struct _proxyLoginClass {
 GType proxy_login_get_type (void);
 proxyLogin * proxy_login_new (void);
 static void proxy_login_cb (GtkDialog *dialog, gint state);
-static void proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data);
+static void proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data);
 static void proxy_login_setup_tree_view (void);
-void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data);
+void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, gpointer data);
 proxyLogin* proxy_dialog_new (void);
-static void proxy_soap_login (char *email);
-char *parse_email_for_name (char *email);
+static void proxy_soap_login (gchar *email);
+gchar *parse_email_for_name (gchar *email);
 static void proxy_login_update_tree (void);
 static void proxy_login_tree_view_changed_cb(GtkDialog *dialog);
 void org_gnome_create_proxy_login_option(EPlugin *ep, EMPopupTargetFolder *t);
-static int proxy_get_password (EAccount *account, char **user_name, char **password);
+static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password);
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7ab0095dbf..6a18348002 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -62,7 +62,7 @@
 
 static GObjectClass *parent_class = NULL;
 
-static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
+static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, EAccount *account);
 
 struct _proxyDialogPrivate {
 	/* Glade XML data for the Add/Edit Proxy dialog*/
@@ -94,7 +94,7 @@ struct _proxyDialogPrivate {
 	GtkWidget *notifications;
 	GtkWidget *options;
 	GtkWidget *private;
-        char *help_section;
+        gchar *help_section;
 
 	GList *proxy_list;
 };
@@ -254,7 +254,7 @@ proxy_dialog_new (void)
 static int
 proxy_get_permissions_from_dialog (EAccount *account)
 {
-	int permissions;
+	gint permissions;
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
@@ -309,7 +309,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 	GtkTreeModel *model;
 	proxyHandler *new_proxy = NULL;
 	proxyDialogPrivate *priv;
-	char *account_mailid;
+	gchar *account_mailid;
 	proxyDialog *prd = NULL;
 
 	prd = g_object_get_data ((GObject *)account, "prd");
@@ -322,7 +322,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 				ENameSelectorEntry *name_selector_entry;
 				EDestinationStore *destination_store;
 				GList *destinations, *tmp;
-				char *name, *email;
+				gchar *name, *email;
 				GList *existing_list;
 				name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 				destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (
@@ -337,7 +337,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 
 				for (; tmp != NULL; tmp = g_list_next (tmp)) {
 					email = NULL;
-					email = (char *)e_destination_get_email (tmp->data);
+					email = (gchar *)e_destination_get_email (tmp->data);
 
 					if (g_str_equal(email, ""))
 						continue;
@@ -376,12 +376,12 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 
 				for (; tmp != NULL; tmp = g_list_next (tmp)) {
 					name = NULL; email = NULL;
-					email = (char *) e_destination_get_email (tmp->data);
+					email = (gchar *) e_destination_get_email (tmp->data);
 
 					if (g_str_equal(email, ""))
 						continue;
 
-					name = (char *) e_destination_get_name (tmp->data);
+					name = (gchar *) e_destination_get_name (tmp->data);
 					new_proxy = (proxyHandler *) g_malloc0 (sizeof (proxyHandler));
 
 					if (name)
@@ -460,9 +460,9 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
 	const gchar *failed_auth;
-	char *uri, *key, *prompt, *password = NULL;
+	gchar *uri, *key, *prompt, *password = NULL;
 	CamelURL *url;
-	const char *poa_address, *use_ssl, *soap_port;
+	const gchar *poa_address, *use_ssl, *soap_port;
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
@@ -498,7 +498,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 
 	cnc = e_gw_connection_new (uri, url->user, password);
 	if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
-		char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+		gchar *http_uri = g_strconcat ("http://", uri + 8, NULL);
 		cnc = e_gw_connection_new (http_uri, url->user, password);
 		g_free (http_uri);
 	}
@@ -640,8 +640,8 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	proxyDialogPrivate *priv;
 	CamelOfflineStore *store;
 	CamelException ex;
-	int pag_num;
-	char *gladefile;
+	gint pag_num;
+	gchar *gladefile;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
@@ -723,7 +723,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 }
 
 static gboolean
-proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account)
+proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, EAccount *account)
 {
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
@@ -823,7 +823,7 @@ proxy_edit_ok (GtkWidget *button, EAccount *account)
 }
 
 static proxyHandler *
-proxy_get_item_from_list (EAccount *account, char *account_name)
+proxy_get_item_from_list (EAccount *account, gchar *account_name)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
@@ -852,7 +852,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account)
 	proxyDialogPrivate *priv;
 	proxyHandler *deleted;
 	GtkTreeSelection* account_select;
-	char *account_mailid;
+	gchar *account_mailid;
 	proxyDialog *prd = NULL;
 
 	prd = g_object_get_data ((GObject *)account, "prd");
@@ -906,7 +906,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	ENameSelectorEntry *name_selector_entry;
 	GtkWidget *proxy_name, *name_box;
 	proxyDialog *prd = NULL;
-	char *gladefile;
+	gchar *gladefile;
 
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
@@ -1004,10 +1004,10 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 	GtkTreeSelection* account_select;
 	proxyHandler *edited;
 	GtkButton *okButton, *proxyCancel;
-	char *account_mailid;
+	gchar *account_mailid;
 	GtkWidget *contacts;
 	proxyDialog *prd = NULL;
-	char *gladefile;
+	gchar *gladefile;
 
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index c2bd933db4..ca1b651f2c 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -61,6 +61,6 @@ static void proxy_edit_account (GtkWidget *button, EAccount *account);
 void proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data);
 void proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data);
 static void proxy_setup_meta_tree_view (EAccount *account);
-static proxyHandler *proxy_get_item_from_list (EAccount *account, char *account_name);
+static proxyHandler *proxy_get_item_from_list (EAccount *account, gchar *account_name);
 static void proxy_load_edit_dialog (EAccount *account, proxyHandler *edited);
 void free_proxy_list (GList *proxy_list);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 33f1dd2cb4..a739571b83 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -56,9 +56,9 @@ get_cnc (GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
 	const gchar *failed_auth;
-	char *uri, *key, *prompt, *password = NULL;
+	gchar *uri, *key, *prompt, *password = NULL;
 	CamelURL *url;
-	const char *poa_address, *use_ssl, *soap_port;
+	const gchar *poa_address, *use_ssl, *soap_port;
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
@@ -94,7 +94,7 @@ get_cnc (GtkWindow *parent_window)
 
 	cnc = e_gw_connection_new (uri, url->user, password);
 	if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
-		char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+		gchar *http_uri = g_strconcat ("http://", uri + 8, NULL);
 		cnc = e_gw_connection_new (http_uri, url->user, password);
 		g_free (http_uri);
 	}
@@ -122,7 +122,7 @@ e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 
 	gopts->delay_enabled = ggopts->delay_enabled;
 
-	/* TODO convert int to timet comparing the current day */
+	/* TODO convert gint to timet comparing the current day */
 	if (ggopts->delay_until) {
 		gopts->delay_until = time_add_day_with_zone (temp, ggopts->delay_until, NULL);
 	} else
@@ -273,7 +273,7 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 	ggopts->delay_enabled = gopts->delay_enabled;
 
 	if (gopts->delay_until) {
-		int diff;
+		gint diff;
 		icaltimetype temp, current;
 
 		temp = icaltime_from_timet (gopts->delay_until, 0);
@@ -361,14 +361,14 @@ static ESource *
 get_source (ESourceList *list)
 {
 	GSList *p, *l;
-	char **temp = g_strsplit (account->source->url, ";", -1);
-	char *uri = temp [0];
+	gchar **temp = g_strsplit (account->source->url, ";", -1);
+	gchar *uri = temp [0];
 
 
 	l = e_source_list_peek_groups (list);
 
 	for (p = l; p != NULL; p = p->next) {
-		char *so_uri;
+		gchar *so_uri;
 		GSList *r, *s;
 		ESourceGroup *group = E_SOURCE_GROUP (p->data);
 
@@ -398,7 +398,7 @@ add_return_value (EGwSendOptionsReturnNotify track,
                   ESource *source,
                   const gchar *notify)
 {
-	char *value;
+	gchar *value;
 
 	switch (track) {
 		case E_GW_RETURN_NOTIFY_MAIL:
@@ -415,8 +415,8 @@ add_return_value (EGwSendOptionsReturnNotify track,
 static void
 put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOptionsStatusTracking *sopts)
 {
-	char *value;
-	const char *val;
+	gchar *value;
+	const gchar *val;
 	icaltimetype tt;
 	CamelURL  *url;
 
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 74ca71fbb4..c7c315c7f0 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -62,8 +62,8 @@ struct ShareInfo {
 
 GtkWidget * org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 void org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *target);
-static void create_shared_folder(EPopup *ep, EPopupItem *p, void *data);
-static void popup_free (EPopup *ep, GSList *items, void *data);
+static void create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data);
+static void popup_free (EPopup *ep, GSList *items, gpointer data);
 void shared_folder_commit (EPlugin *ep, EConfigTarget *tget);
 void shared_folder_abort (EPlugin *ep, EConfigTarget *target);
 
@@ -126,16 +126,16 @@ struct _EMCreateFolder {
 
 	/* input data */
 	CamelStore *store;
-	char *full_name;
-	char *parent;
-	char *name;
+	gchar *full_name;
+	gchar *parent;
+	gchar *name;
 
 	/* output data */
 	CamelFolderInfo *fi;
 
 	/* callback data */
-	void (* done) (struct _EMCreateFolder *m, void *user_data);
-	void *user_data;
+	void (* done) (struct _EMCreateFolder *m, gpointer user_data);
+	gpointer user_data;
 };
 
 static gchar *
@@ -194,7 +194,7 @@ static MailMsgInfo create_folder_info = {
 };
 
 static void
-new_folder_created_cb (struct _EMCreateFolder *m, void *user_data)
+new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
 {
 	struct ShareInfo *ssi = (struct ShareInfo *) user_data;
 	EMFolderSelector *emfs = ssi->emfs;
@@ -208,12 +208,12 @@ new_folder_created_cb (struct _EMCreateFolder *m, void *user_data)
 }
 
 static int
-create_folder (CamelStore *store, const char *full_name, void (* done) (struct _EMCreateFolder *m, void *user_data), void *user_data)
+create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data)
 {
-	char *name, *namebuf = NULL;
+	gchar *name, *namebuf = NULL;
 	struct _EMCreateFolder *m;
-	const char *parent;
-	int id;
+	const gchar *parent;
+	gint id;
 
 	namebuf = g_strdup (full_name);
 	if (!(name = strrchr (namebuf, '/'))) {
@@ -240,11 +240,11 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _
 }
 
 static void
-users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
+users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	EMFolderSelector *emfs = ssi->emfs;
-	const char *uri, *path;
+	const gchar *uri, *path;
 	CamelException ex;
 	CamelStore *store;
 
@@ -291,12 +291,12 @@ users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
 }
 
 static void
-new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *model)
+new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model)
 {
 	GtkWidget *users_dialog;
 	GtkWidget *w;
 	struct ShareInfo *ssi;
-	const char *uri;
+	const gchar *uri;
 	EGwConnection *cnc;
 	CamelException ex;
 	CamelStore *store;
@@ -341,7 +341,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);
 }
@@ -350,8 +350,8 @@ void
 org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 {
 	GSList *menus = NULL;
-	int i = 0;
-	static int first = 0;
+	gint i = 0;
+	static gint first = 0;
 
 
 	if (! g_strrstr (t->uri, "groupwise://"))
@@ -373,13 +373,13 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 }
 
 static void
-create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
+create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data)
 {
 
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog ;
-	char *uri;
+	gchar *uri;
 
 	model = mail_component_peek_tree_model (mail_component_peek ());
 	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
@@ -457,8 +457,8 @@ EGwConnection *
 get_cnc (CamelStore *store)
 {
 		EGwConnection *cnc;
-		const char *uri, *property_value, *server_name, *user, *port;
-		char *use_ssl;
+		const gchar *uri, *property_value, *server_name, *user, *port;
+		gchar *use_ssl;
 		CamelService *service;
 		CamelURL *url;
 
@@ -485,7 +485,7 @@ get_cnc (CamelStore *store)
 
 		cnc = e_gw_connection_new (uri, user, service->url->passwd);
 		if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
-			char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+			gchar *http_uri = g_strconcat ("http://", uri + 8, NULL);
 			cnc = e_gw_connection_new (http_uri, user, service->url->passwd);
 			g_free (http_uri);
 		}
@@ -503,7 +503,7 @@ get_container_id(EGwConnection *cnc, const gchar *fname)
 	gchar *id = NULL;
 	gchar *name;
 	gchar **names;
-	int i = 0, parts = 0;
+	gint i = 0, parts = 0;
 
 	names = g_strsplit (fname, "/", -1);
 	if(names){
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 382cf75124..2b12d4be9b 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -37,7 +37,7 @@
 
 struct _SharedUser {
 	EShUsers *user_node;
-	int flag;
+	gint flag;
 };
 typedef struct _SharedUser SharedUser;
 
@@ -321,8 +321,8 @@ not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 static void
 add_clicked(GtkButton *button, ShareFolder *sf)
 {
-	const char *email = NULL;
-	const char *self_email = NULL;
+	const gchar *email = NULL;
+	const gchar *self_email = NULL;
 	SharedUser *new_user = NULL;
 	EShUsers *usr = NULL;
 	gint rights = 0;
@@ -513,7 +513,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
 	GtkButton *not_ok;
 	GtkButton *not_cancel;
 	GtkWidget *vbox;
-	char *gladefile;
+	gchar *gladefile;
 
 	sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_type_hint (GTK_WINDOW (sf->window), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -580,7 +580,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
 	EShUsers *user = NULL;
-	char *email = NULL;
+	gchar *email = NULL;
 	GtkTreePath *path = NULL;
 
 	path = gtk_tree_path_new_from_string (arg1);
@@ -613,7 +613,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
 	EShUsers *user = NULL;
-	char *email = NULL;
+	gchar *email = NULL;
 	GtkTreePath *path = NULL;
 
 	path = gtk_tree_path_new_from_string (arg1);
@@ -647,7 +647,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
 	EShUsers *user = NULL;
-	char *email = NULL;
+	gchar *email = NULL;
 	GtkTreePath *path = NULL;
 
 	path = gtk_tree_path_new_from_string (arg1);
@@ -682,7 +682,7 @@ share_folder_construct (ShareFolder *sf)
 	ENameSelectorModel *name_selector_model;
 	ENameSelectorEntry *name_selector_entry;
 	GtkWidget *box;
-	char *gladefile;
+	gchar *gladefile;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 				      "properties.glade",
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index a465752c95..2569cbebd7 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -43,14 +43,14 @@
 #include "share-folder.h"
 
 
-void org_gnome_track_status (void *ep, EMPopupTargetSelect *t);
+void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t);
 
-static char *
-format_date (const char * value)
+static gchar *
+format_date (const gchar * value)
 {
 	time_t time;
 	time_t actual_time;
-	char *str;
+	gchar *str;
 
 	time = e_gw_connection_get_date_from_string (value);
 	actual_time = camel_header_decode_date (ctime(&time), NULL);
@@ -61,12 +61,12 @@ format_date (const char * value)
 }
 
 static void
-track_status (EPopup *ep, EPopupItem *item, void *data)
+track_status (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	EMPopupTargetSelect *t = (EMPopupTargetSelect *)data;
 	CamelMimeMessage *msg = NULL ;
 	const CamelInternetAddress *from ;
-	const char *namep, *addp ;
+	const gchar *namep, *addp ;
 
 	GtkDialog *d ;
 	GtkTable *table ;
@@ -75,11 +75,11 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	GtkVBox *vbox;
 
 	time_t time ;
-	char *time_str ;
+	gchar *time_str ;
 
 	gchar *boldmsg;
 
-	int row = 0;
+	gint row = 0;
 
 	EGwConnection *cnc;
 	EGwItem *gwitem;
@@ -242,17 +242,17 @@ 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);
 }
 
-void org_gnome_track_status (void *ep, EMPopupTargetSelect *t)
+void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
 
-	int i = 0;
-	static int first = 0;
+	gint i = 0;
+	static gint first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://") || g_ascii_strncasecmp ((t->folder)->full_name, "Sent Items", 10))
 		return;