Prefer GLib basic types over C types.

1 files changed, 71 insertions, 71 deletions

diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 55816ca24b..2fc570ca93 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -40,114 +40,114 @@ extern "C" {
 #include "libedataserver/e-account.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
-		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
-				    const char *appended_uid, void *data),
-		       void *data);
+		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok,
+				    const gchar *appended_uid, gpointer data),
+		       gpointer data);
 
 void mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
 			     gboolean delete_from_source,
-			     const char *dest_uri,
+			     const gchar *dest_uri,
 			     guint32 dest_flags,
-			     void (*done) (gboolean ok, void *data),
-			     void *data);
+			     void (*done) (gboolean ok, gpointer data),
+			     gpointer data);
 
 /* get a single message, asynchronously */
-void mail_get_message (CamelFolder *folder, const char *uid,
-		       void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data),
-		       void *data,
+void mail_get_message (CamelFolder *folder, const gchar *uid,
+		       void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data),
+		       gpointer data,
 		       MailMsgDispatchFunc dispatch);
 
 CamelOperation *
-mail_get_messagex(CamelFolder *folder, const char *uid,
-		  void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *),
-		  void *data, MailMsgDispatchFunc dispatch);
+mail_get_messagex(CamelFolder *folder, const gchar *uid,
+		  void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *),
+		  gpointer data, MailMsgDispatchFunc dispatch);
 
 /* get several messages */
 void mail_get_messages (CamelFolder *folder, GPtrArray *uids,
-			void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data),
-			void *data);
+			void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer data),
+			gpointer data);
 
 /* same for a folder */
-int mail_get_folder (const char *uri, guint32 flags,
-		     void (*done) (char *uri, CamelFolder *folder, void *data), void *data,
+gint mail_get_folder (const gchar *uri, guint32 flags,
+		     void (*done) (gchar *uri, CamelFolder *folder, gpointer data), gpointer data,
 		     MailMsgDispatchFunc dispatch);
 
 /* get quota information for a folder */
-int mail_get_folder_quota (CamelFolder *folder,
+gint mail_get_folder_quota (CamelFolder *folder,
 		 const gchar *folder_uri,
-		 void (*done)(CamelFolder *folder, const gchar *folder_uri, CamelFolderQuotaInfo *quota, void *data),
-		 void *data, MailMsgDispatchFunc dispatch);
+		 void (*done)(CamelFolder *folder, const gchar *folder_uri, CamelFolderQuotaInfo *quota, gpointer data),
+		 gpointer data, MailMsgDispatchFunc dispatch);
 
 /* and for a store */
-int mail_get_store (const char *uri, CamelOperation *op,
-		    void (*done) (char *uri, CamelStore *store, void *data), void *data);
+gint mail_get_store (const gchar *uri, CamelOperation *op,
+		    void (*done) (gchar *uri, CamelStore *store, gpointer data), gpointer data);
 
 /* build an attachment */
 void mail_build_attachment (CamelFolder *folder, GPtrArray *uids,
 			    void (*done)(CamelFolder *folder, GPtrArray *messages,
-					 CamelMimePart *part, char *subject, void *data),
-			    void *data);
+					 CamelMimePart *part, gchar *subject, gpointer data),
+			    gpointer data);
 
 void mail_sync_folder (CamelFolder *folder,
-		       void (*done) (CamelFolder *folder, void *data), void *data);
+		       void (*done) (CamelFolder *folder, gpointer data), gpointer data);
 
-void mail_sync_store(CamelStore *store, int expunge,
-		     void (*done) (CamelStore *store, void *data), void *data);
+void mail_sync_store(CamelStore *store, gint expunge,
+		     void (*done) (CamelStore *store, gpointer data), gpointer data);
 
 void mail_refresh_folder (CamelFolder *folder,
-			  void (*done) (CamelFolder *folder, void *data),
-			  void *data);
+			  void (*done) (CamelFolder *folder, gpointer data),
+			  gpointer data);
 
 void mail_expunge_folder (CamelFolder *folder,
-			  void (*done) (CamelFolder *folder, void *data),
-			  void *data);
+			  void (*done) (CamelFolder *folder, gpointer data),
+			  gpointer data);
 
 void mail_empty_trash (EAccount *account,
-		       void (*done) (EAccount *account, void *data),
-		       void *data);
+		       void (*done) (EAccount *account, gpointer data),
+		       gpointer data);
 
 /* get folder info asynchronously */
-int mail_get_folderinfo (CamelStore *store, CamelOperation *op,
-			 gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data),
-			 void *data);
+gint mail_get_folderinfo (CamelStore *store, CamelOperation *op,
+			 gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data),
+			 gpointer data);
 
 /* remove an existing folder */
 void mail_remove_folder (CamelFolder *folder,
-			 void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data),
-			 void *data);
+			 void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data),
+			 gpointer data);
 
 /* transfer (copy/move) a folder */
-void mail_xfer_folder (const char *src_uri, const char *dest_uri, gboolean remove_source,
-		       void (*done) (char *src_uri, char *dest_uri, gboolean remove_source,
-				     CamelFolder *folder, void *data),
-		       void *data);
+void mail_xfer_folder (const gchar *src_uri, const gchar *dest_uri, gboolean remove_source,
+		       void (*done) (gchar *src_uri, gchar *dest_uri, gboolean remove_source,
+				     CamelFolder *folder, gpointer data),
+		       gpointer data);
 
 /* save messages */
-int mail_save_messages (CamelFolder *folder, GPtrArray *uids, const char *path,
-			void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data),
-			void *data);
+gint mail_save_messages (CamelFolder *folder, GPtrArray *uids, const gchar *path,
+			void (*done) (CamelFolder *folder, GPtrArray *uids, gchar *path, gpointer data),
+			gpointer data);
 
-int mail_save_part (CamelMimePart *part, const char *path,
-		    void (*done)(CamelMimePart *part, char *path, int saved, void *data),
-		    void *data, gboolean readonly);
+gint mail_save_part (CamelMimePart *part, const gchar *path,
+		    void (*done)(CamelMimePart *part, gchar *path, gint saved, gpointer data),
+		    gpointer data, gboolean readonly);
 
 /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
-void mail_send_queue (CamelFolder *queue, const char *destination,
-		      const char *type, CamelOperation *cancel,
-		      CamelFilterGetFolderFunc get_folder, void *get_data,
-		      CamelFilterStatusFunc *status, void *status_data,
-		      void (*done)(const char *destination, void *data),
-		      void *data);
-
-void mail_fetch_mail (const char *source, int keep,
-		      const char *type, CamelOperation *cancel,
-		      CamelFilterGetFolderFunc get_folder, void *get_data,
-		      CamelFilterStatusFunc *status, void *status_data,
-		      void (*done)(const char *source, void *data),
-		      void *data);
+void mail_send_queue (CamelFolder *queue, const gchar *destination,
+		      const gchar *type, CamelOperation *cancel,
+		      CamelFilterGetFolderFunc get_folder, gpointer get_data,
+		      CamelFilterStatusFunc *status, gpointer status_data,
+		      void (*done)(const gchar *destination, gpointer data),
+		      gpointer data);
+
+void mail_fetch_mail (const gchar *source, gint keep,
+		      const gchar *type, CamelOperation *cancel,
+		      CamelFilterGetFolderFunc get_folder, gpointer get_data,
+		      CamelFilterStatusFunc *status, gpointer status_data,
+		      void (*done)(const gchar *source, gpointer data),
+		      gpointer data);
 
 void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
-			 const char *type, gboolean notify,
+			 const gchar *type, gboolean notify,
 			 CamelOperation *cancel);
 
 /* convenience functions for above */
@@ -155,19 +155,19 @@ void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids);
 void mail_filter_junk (CamelFolder *folder, GPtrArray *uids);
 
 /* Work Offline */
-void mail_prep_offline(const char *uri, CamelOperation *cancel,
-		       void (*done)(const char *, void *data),
-		       void *data);
-int mail_store_set_offline(CamelStore *store, gboolean offline,
-			   void (*done)(CamelStore *, void *data),
-			   void *data);
-int mail_store_prepare_offline (CamelStore *store);
+void mail_prep_offline(const gchar *uri, CamelOperation *cancel,
+		       void (*done)(const gchar *, gpointer data),
+		       gpointer data);
+gint mail_store_set_offline(CamelStore *store, gboolean offline,
+			   void (*done)(CamelStore *, gpointer data),
+			   gpointer data);
+gint mail_store_prepare_offline (CamelStore *store);
 
 /* filter driver execute shell command async callback */
-void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);
+void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer data);
 
-int mail_check_service(const char *url, CamelProviderType type,
-		       void (*done)(const char *url, CamelProviderType type, GList *authtypes, void *data), void *data);
+gint mail_check_service(const gchar *url, CamelProviderType type,
+		       void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data);
 
 #ifdef __cplusplus
 }