Prefer GLib basic types over C types.

7 files changed, 30 insertions, 30 deletions

diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index f3a47e1181..1f79754757 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -75,8 +75,8 @@ ca_trust_dialog_show (ECert *cert, gboolean importing)
 {
 	CATrustDialogData *ctd_data;
 	GtkWidget *w;
-	char *txt;
-	char *gladefile;
+	gchar *txt;
+	gchar *gladefile;
 
 	ctd_data = g_new0 (CATrustDialogData, 1);
 
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 0e4af90edc..b32a7c58c7 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -51,7 +51,7 @@ typedef struct {
 } CertTrustDialogData;
 
 static void
-free_data (void *data)
+free_data (gpointer data)
 {
 	CertTrustDialogData *ctd = data;
 
@@ -116,7 +116,7 @@ cert_trust_dialog_show (ECert *cert)
 {
 	CertTrustDialogData *ctd_data;
 	CERTCertificate *icert;
-	char *gladefile;
+	gchar *gladefile;
 
 	ctd_data = g_new0 (CertTrustDialogData, 1);
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index c5261e879b..e0663f0578 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -93,7 +93,7 @@ static void add_ca_cert (CertificateManagerData *cfm, ECert *cert);
 
 static void
 handle_selection_changed (GtkTreeSelection *selection,
-			  int cert_column,
+			  gint cert_column,
 			  GtkWidget *view_button,
 			  GtkWidget *edit_button,
 			  GtkWidget *delete_button)
@@ -153,7 +153,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-		char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+		gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 
 		/* destroy dialog to get rid of it in the GUI */
 		gtk_widget_destroy (filesel);
@@ -400,7 +400,7 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-		char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+		gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 
 		/* destroy dialog to get rid of it in the GUI */
 		gtk_widget_destroy (filesel);
@@ -627,7 +627,7 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-		char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+		gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 
 		/* destroy dialog to get rid of it in the GUI */
 		gtk_widget_destroy (filesel);
@@ -739,7 +739,7 @@ add_user_cert (CertificateManagerData *cfm, ECert *cert)
 {
 	GtkTreeIter iter;
 	GtkTreeIter *parent_iter = NULL;
-	const char *organization = e_cert_get_org (cert);
+	const gchar *organization = e_cert_get_org (cert);
 	GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->yourcerts_streemodel));
 
 	if (organization) {
@@ -783,7 +783,7 @@ add_contact_cert (CertificateManagerData *cfm, ECert *cert)
 {
 	GtkTreeIter iter;
 	GtkTreeIter *parent_iter = NULL;
-	const char *organization = e_cert_get_org (cert);
+	const gchar *organization = e_cert_get_org (cert);
 	GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->contactcerts_streemodel));
 
 	if (organization) {
@@ -825,7 +825,7 @@ add_ca_cert (CertificateManagerData *cfm, ECert *cert)
 {
 	GtkTreeIter iter;
 	GtkTreeIter *parent_iter = NULL;
-	const char *organization = e_cert_get_org (cert);
+	const gchar *organization = e_cert_get_org (cert);
 	GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->authoritycerts_streemodel));
 
 	if (organization) {
@@ -994,7 +994,7 @@ certificate_manager_config_control_new (void)
 {
 	CertificateManagerData *cfm_data;
 	GtkWidget *control_widget;
-	char *gladefile;
+	gchar *gladefile;
 
 	/* We need to peek the db here to make sure it (and NSS) are fully initialized. */
 	e_cert_db_peek ();
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 997bbace46..37289c3e8b 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -64,8 +64,8 @@ static void
 fill_in_general (CertificateViewerData *cvm_data, ECert *cert)
 {
 	GtkWidget *label;
-	const char *text;
-	char *markup;
+	const gchar *text;
+	gchar *markup;
 
 	/* issued to */
 	label = glade_xml_get_widget (cvm_data->gui, "issued-to-cn");
@@ -225,7 +225,7 @@ fields_selection_changed (GtkTreeSelection *selection, CertificateViewerData *cv
 					     &model,
 					     &iter)) {
 		EASN1Object *asn1_object;
-		const char *value;
+		const gchar *value;
 
 		gtk_tree_model_get (model,
 				    &iter,
@@ -296,7 +296,7 @@ fill_in_details (CertificateViewerData *cvm_data, ECert *cert)
 	cvm_data->cert_chain = g_list_reverse (cvm_data->cert_chain);
 	for (l = cvm_data->cert_chain; l; l = l->next) {
 		ECert *c = l->data;
-		const char *str;
+		const gchar *str;
 		GtkTreeIter new_iter;
 
 		str = e_cert_get_cn (c);
@@ -319,8 +319,8 @@ GtkWidget*
 certificate_viewer_show (ECert *cert)
 {
 	CertificateViewerData *cvm_data;
-	char *title;
-	char *gladefile;
+	gchar *title;
+	gchar *gladefile;
 
 	cvm_data = g_new0 (CertificateViewerData, 1);
 
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 1096aa2a5e..48546bf75f 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -36,10 +36,10 @@
 #include "pk11func.h"
 
 static gboolean
-smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passwd, gpointer arg)
+smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, gchar **passwd, gpointer arg)
 {
-	char *prompt;
-	char *slot_name = g_strdup (PK11_GetSlotName (slot));
+	gchar *prompt;
+	gchar *slot_name = g_strdup (PK11_GetSlotName (slot));
 
 	g_strchomp (slot_name);
 
@@ -58,9 +58,9 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passw
 }
 
 static gboolean
-smime_pk11_change_passwd (ECertDB *db, char **old_passwd, char **passwd, gpointer arg)
+smime_pk11_change_passwd (ECertDB *db, gchar **old_passwd, gchar **passwd, gpointer arg)
 {
-	char *prompt;
+	gchar *prompt;
 
 	/* XXX need better strings here, just copy mozilla's? */
 
@@ -86,7 +86,7 @@ static gboolean
 smime_confirm_ca_cert_import (ECertDB *db, ECert *cert, gboolean *trust_ssl, gboolean *trust_email, gboolean *trust_objsign, gpointer arg)
 {
 	GtkWidget *dialog = ca_trust_dialog_show (cert, TRUE);
-	int response;
+	gint response;
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 0ac946b5b8..e84b933a81 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -68,7 +68,7 @@ ecs_find_current(ECertSelector *ecs)
 {
 	struct _ECertSelectorPrivate *p = ecs->priv;
 	CERTCertListNode *node;
-	int n;
+	gint n;
 
 	if (p->certlist == NULL || CERT_LIST_EMPTY(p->certlist))
 		return NULL;
@@ -141,7 +141,7 @@ ecs_cert_changed(GtkWidget *w, ECertSelector *ecs)
  * Return value: A dialogue to be shown.
  **/
 GtkWidget *
-e_cert_selector_new(int type, const char *currentid)
+e_cert_selector_new(gint type, const gchar *currentid)
 {
 	ECertSelector *ecs;
 	struct _ECertSelectorPrivate *p;
@@ -150,8 +150,8 @@ e_cert_selector_new(int type, const char *currentid)
 	CERTCertListNode *node;
 	GladeXML *gui;
 	GtkWidget *w;
-	int n=0, active=0;
-	char *gladefile;
+	gint n=0, active=0;
+	gchar *gladefile;
 
 	ecs = g_object_new(e_cert_selector_get_type(), NULL);
 	p = ecs->priv;
diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h
index 85cfa0ba9f..5520b5621c 100644
--- a/smime/gui/e-cert-selector.h
+++ b/smime/gui/e-cert-selector.h
@@ -49,7 +49,7 @@ struct _ECertSelector {
 struct _ECertSelectorClass {
 	GtkDialogClass parent_class;
 
-	void (*selected)(ECertSelector *, const char *certid);
+	void (*selected)(ECertSelector *, const gchar *certid);
 };
 
 enum _e_cert_selector_type {
@@ -58,7 +58,7 @@ enum _e_cert_selector_type {
 };
 
 GType      e_cert_selector_get_type (void);
-GtkWidget *e_cert_selector_new      (int type, const char *currentid);
+GtkWidget *e_cert_selector_new      (gint type, const gchar *currentid);
 
 #ifdef cplusplus
 }