GNOME.org
 

[evolution-exchange/camel-gobject: 5/6] Replace CamelException with GError.

commit a02d0812ced229268a03fcb82d7d2c41bd2522e3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 28 19:21:32 2009 -0500

    Replace CamelException with GError.

 camel/camel-exchange-folder.c    |   50 ++++++++++++++++----------------
 camel/camel-exchange-folder.h    |    2 +-
 camel/camel-exchange-journal.c   |   18 ++++++------
 camel/camel-exchange-journal.h   |    6 ++--
 camel/camel-exchange-provider.c  |    2 +-
 camel/camel-exchange-store.c     |   58 +++++++++++++++++++-------------------
 camel/camel-exchange-store.h     |    2 +-
 camel/camel-exchange-summary.c   |    4 +-
 camel/camel-exchange-transport.c |    4 +-
 camel/camel-exchange-utils.c     |   54 +++++++++++++++++-----------------
 camel/camel-exchange-utils.h     |   40 +++++++++++++-------------
 11 files changed, 120 insertions(+), 120 deletions(-)
---
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 9b5a396..59e2dda 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -44,39 +44,39 @@ static CamelOfflineFolderClass *parent_class = NULL;
 /* Returns the class for a CamelFolder */
 #define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 
-static void exchange_expunge (CamelFolder *folder, CamelException *ex);
+static void exchange_expunge (CamelFolder *folder, GError **error);
 static void append_message (CamelFolder *folder, CamelMimeMessage *message,
 			    const CamelMessageInfo *info, gchar **appended_uid,
-			    CamelException *ex);
+			    GError **error);
 static CamelMimeMessage *get_message         (CamelFolder *folder,
 					      const gchar *uid,
-					      CamelException *ex);
+					      GError **error);
 static GPtrArray      *search_by_expression  (CamelFolder *folder,
 					      const gchar *exp,
-					      CamelException *ex);
+					      GError **error);
 static guint32	      count_by_expression  (CamelFolder *folder,
 					      const gchar *exp,
-					      CamelException *ex);
+					      GError **error);
 
 static GPtrArray      *search_by_uids        (CamelFolder *folder,
 					      const gchar *expression,
 					      GPtrArray *uids,
-					      CamelException *ex);
+					      GError **error);
 static void            transfer_messages_to  (CamelFolder *source,
 					      GPtrArray *uids,
 					      CamelFolder *dest,
 					      GPtrArray **transferred_uids,
 					      gboolean delete_originals,
-					      CamelException *ex);
+					      GError **error);
 static void   transfer_messages_the_hard_way (CamelFolder *source,
 					      GPtrArray *uids,
 					      CamelFolder *dest,
 					      GPtrArray **transferred_uids,
 					      gboolean delete_originals,
-					      CamelException *ex);
-static void refresh_info (CamelFolder *folder, CamelException *ex);
-static void exchange_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static gchar * get_filename (CamelFolder *folder, const gchar *uid, CamelException *ex);
+					      GError **error);
+static void refresh_info (CamelFolder *folder, GError **error);
+static void exchange_sync (CamelFolder *folder, gboolean expunge, GError **error);
+static gchar * get_filename (CamelFolder *folder, const gchar *uid, GError **error);
 static gint cmp_uids (CamelFolder *folder, const gchar *uid1, const gchar *uid2);
 
 static void
@@ -155,7 +155,7 @@ camel_exchange_folder_get_type (void)
 }
 
 static void
-refresh_info (CamelFolder *folder, CamelException *ex)
+refresh_info (CamelFolder *folder, GError **error)
 {
 	CamelExchangeFolder *exch = CAMEL_EXCHANGE_FOLDER (folder);
 	CamelExchangeStore *store = CAMEL_EXCHANGE_STORE (folder->parent_store);
@@ -177,7 +177,7 @@ refresh_info (CamelFolder *folder, CamelException *ex)
 }
 
 static void
-exchange_expunge (CamelFolder *folder, CamelException *ex)
+exchange_expunge (CamelFolder *folder, GError **error)
 {
 	CamelFolder *trash;
 	GPtrArray *uids;
@@ -204,7 +204,7 @@ exchange_expunge (CamelFolder *folder, CamelException *ex)
 static void
 append_message_data (CamelFolder *folder, GByteArray *message,
 		     const gchar *subject, const CamelMessageInfo *info,
-		     gchar **appended_uid, CamelException *ex)
+		     gchar **appended_uid, GError **error)
 {
 	CamelExchangeFolder *exch = CAMEL_EXCHANGE_FOLDER (folder);
 	CamelStream *stream_cache;
@@ -242,7 +242,7 @@ append_message_data (CamelFolder *folder, GByteArray *message,
 static void
 append_message (CamelFolder *folder, CamelMimeMessage *message,
 		const CamelMessageInfo *info, gchar **appended_uid,
-		CamelException *ex)
+		GError **error)
 {
 	CamelStream *stream_mem;
 	CamelExchangeStore *store = CAMEL_EXCHANGE_STORE (folder->parent_store);
@@ -345,7 +345,7 @@ fix_broken_multipart_related (CamelMimePart *part)
 }
 
 static gchar *
-get_filename (CamelFolder *folder, const gchar *uid, CamelException *ex)
+get_filename (CamelFolder *folder, const gchar *uid, GError **error)
 {
 	CamelExchangeFolder *exch = CAMEL_EXCHANGE_FOLDER (folder);
 
@@ -353,7 +353,7 @@ get_filename (CamelFolder *folder, const gchar *uid, CamelException *ex)
 }
 
 static GByteArray *
-get_message_data (CamelFolder *folder, const gchar *uid, CamelException *ex)
+get_message_data (CamelFolder *folder, const gchar *uid, GError **error)
 {
 	CamelExchangeFolder *exch = CAMEL_EXCHANGE_FOLDER (folder);
 	CamelExchangeStore *store = CAMEL_EXCHANGE_STORE (folder->parent_store);
@@ -398,7 +398,7 @@ get_message_data (CamelFolder *folder, const gchar *uid, CamelException *ex)
 #define MAILING_LIST_HEADERS "X-MAILING-LIST X-LOOP LIST-ID LIST-POST MAILING-LIST ORIGINATOR X-LIST RETURN-PATH X-BEENTHERE "
 
 static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
+get_message (CamelFolder *folder, const gchar *uid, GError **error)
 {
 	CamelExchangeFolder *exch = CAMEL_EXCHANGE_FOLDER (folder);
 	CamelMimeMessage *msg;
@@ -451,7 +451,7 @@ get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 
 static GPtrArray *
 search_by_expression (CamelFolder *folder, const gchar *expression,
-		      CamelException *ex)
+		      GError **error)
 {
 	CamelFolderSearch *search;
 	GPtrArray *matches;
@@ -467,7 +467,7 @@ search_by_expression (CamelFolder *folder, const gchar *expression,
 
 static guint32
 count_by_expression (CamelFolder *folder, const gchar *expression,
-		      CamelException *ex)
+		      GError **error)
 {
 	CamelFolderSearch *search;
 	guint32 matches;
@@ -492,7 +492,7 @@ cmp_uids (CamelFolder *folder, const gchar *uid1, const gchar *uid2)
 
 static GPtrArray *
 search_by_uids (CamelFolder *folder, const gchar *expression,
-		GPtrArray *uids, CamelException *ex)
+		GPtrArray *uids, GError **error)
 {
 	CamelFolderSearch *search;
 	GPtrArray *matches;
@@ -511,7 +511,7 @@ static void
 transfer_messages_the_hard_way (CamelFolder *source, GPtrArray *uids,
 				CamelFolder *dest,
 				GPtrArray **transferred_uids,
-				gboolean delete_originals, CamelException *ex)
+				gboolean delete_originals, GError **error)
 {
 	CamelException local_ex;
 	CamelMessageInfo *info;
@@ -591,7 +591,7 @@ cache_xfer (CamelExchangeFolder *folder_source, CamelExchangeFolder *folder_dest
 static void
 transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 		      CamelFolder *dest, GPtrArray **transferred_uids,
-		      gboolean delete_originals, CamelException *ex)
+		      gboolean delete_originals, GError **error)
 {
 	CamelExchangeFolder *exch_source = CAMEL_EXCHANGE_FOLDER (source);
 	CamelExchangeFolder *exch_dest = CAMEL_EXCHANGE_FOLDER (dest);
@@ -950,7 +950,7 @@ gboolean
 camel_exchange_folder_construct (CamelFolder *folder, CamelStore *parent,
 				 const gchar *name, guint32 camel_flags,
 				 const gchar *folder_dir, gint offline_state,
-				 CamelException *ex)
+				 GError **error)
 {
 	CamelExchangeFolder *exch = (CamelExchangeFolder *)folder;
 	const gchar *short_name;
@@ -1087,7 +1087,7 @@ camel_exchange_folder_construct (CamelFolder *folder, CamelStore *parent,
 }
 
 static void
-exchange_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
+exchange_sync (CamelFolder *folder, gboolean expunge, GError **error)
 {
 	if (expunge)
 		exchange_expunge (folder, ex);
diff --git a/camel/camel-exchange-folder.h b/camel/camel-exchange-folder.h
index b673177..8259bc3 100644
--- a/camel/camel-exchange-folder.h
+++ b/camel/camel-exchange-folder.h
@@ -39,7 +39,7 @@ gboolean camel_exchange_folder_construct            (CamelFolder *folder,
 						     guint32 camel_flags,
 						     const gchar *folder_dir,
 						     gint offline_state,
-						     CamelException *ex);
+						     GError **error);
 
 void     camel_exchange_folder_add_message          (CamelExchangeFolder *exch,
 						     const gchar *uid,
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index 27dc5b7..8b2033c 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -49,7 +49,7 @@ static void camel_exchange_journal_finalize (CamelObject *object);
 static void exchange_entry_free (CamelOfflineJournal *journal, CamelDListNode *entry);
 static CamelDListNode *exchange_entry_load (CamelOfflineJournal *journal, FILE *in);
 static gint exchange_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out);
-static gint exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex);
+static gint exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, GError **error);
 
 static CamelOfflineJournalClass *parent_class = NULL;
 
@@ -226,7 +226,7 @@ exchange_message_info_dup_to (CamelMessageInfoBase *dest, CamelMessageInfoBase *
 }
 
 static gint
-exchange_entry_play_delete (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, CamelException *ex)
+exchange_entry_play_delete (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, GError **error)
 {
 	CamelFolder *folder = (CamelFolder *) journal->folder;
 
@@ -240,7 +240,7 @@ exchange_entry_play_delete (CamelOfflineJournal *journal, CamelExchangeJournalEn
 }
 
 static gint
-exchange_entry_play_append (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, CamelException *ex)
+exchange_entry_play_append (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, GError **error)
 {
 	CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) journal->folder;
 	CamelFolder *folder = journal->folder;
@@ -296,7 +296,7 @@ exchange_entry_play_append (CamelOfflineJournal *journal, CamelExchangeJournalEn
 }
 
 static gint
-exchange_entry_play_transfer (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, CamelException *ex)
+exchange_entry_play_transfer (CamelOfflineJournal *journal, CamelExchangeJournalEntry *entry, GError **error)
 {
 	CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) journal->folder;
 	CamelFolder *folder = journal->folder;
@@ -377,7 +377,7 @@ exception:
 }
 
 static gint
-exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex)
+exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, GError **error)
 {
 	CamelExchangeJournalEntry *exchange_entry = (CamelExchangeJournalEntry *) entry;
 
@@ -409,7 +409,7 @@ camel_exchange_journal_new (CamelExchangeFolder *folder, const gchar *filename)
 
 static gboolean
 update_cache (CamelExchangeJournal *exchange_journal, CamelMimeMessage *message,
-		const CamelMessageInfo *mi, gchar **updated_uid, CamelException *ex)
+		const CamelMessageInfo *mi, gchar **updated_uid, GError **error)
 {
 	CamelOfflineJournal *journal = (CamelOfflineJournal *) exchange_journal;
 	CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) journal->folder;
@@ -465,7 +465,7 @@ update_cache (CamelExchangeJournal *exchange_journal, CamelMimeMessage *message,
 
 void
 camel_exchange_journal_append (CamelExchangeJournal *exchange_journal, CamelMimeMessage *message,
-			       const CamelMessageInfo *mi, gchar **appended_uid, CamelException *ex)
+			       const CamelMessageInfo *mi, gchar **appended_uid, GError **error)
 {
 	CamelOfflineJournal *journal = (CamelOfflineJournal *) exchange_journal;
 	CamelExchangeJournalEntry *entry;
@@ -530,7 +530,7 @@ void
 camel_exchange_journal_transfer (CamelExchangeJournal *exchange_journal, CamelExchangeFolder *source_folder,
 				CamelMimeMessage *message, const CamelMessageInfo *mi,
 				const gchar *original_uid, gchar **transferred_uid, gboolean delete_original,
-				CamelException *ex)
+				GError **error)
 {
 	CamelOfflineJournal *journal = (CamelOfflineJournal *) exchange_journal;
 	CamelExchangeJournalEntry *entry;
@@ -570,7 +570,7 @@ camel_exchange_journal_transfer (CamelExchangeJournal *exchange_journal, CamelEx
 void
 camel_exchange_journal_delete (CamelExchangeJournal *exchange_journal,
 			       const gchar *uid, guint32 flags, guint32 set,
-			       CamelException *ex)
+			       GError **error)
 {
 	CamelOfflineJournal *journal = (CamelOfflineJournal *) exchange_journal;
 	CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) journal->folder;
diff --git a/camel/camel-exchange-journal.h b/camel/camel-exchange-journal.h
index 6b92573..4ae7e2f 100644
--- a/camel/camel-exchange-journal.h
+++ b/camel/camel-exchange-journal.h
@@ -78,15 +78,15 @@ CamelOfflineJournal *camel_exchange_journal_new (CamelExchangeFolder *folder, co
 
 /* interfaces for adding a journal entry */
 void camel_exchange_journal_append (CamelExchangeJournal *journal, CamelMimeMessage *message,
-				    const CamelMessageInfo *mi, gchar **appended_uid, CamelException *ex);
+				    const CamelMessageInfo *mi, gchar **appended_uid, GError **error);
 
 void camel_exchange_journal_transfer (CamelExchangeJournal *journal, CamelExchangeFolder *source_folder,
 				      CamelMimeMessage *message, const CamelMessageInfo *mi,
 				      const gchar *original_uid, gchar **transferred_uid,
-				      gboolean delete_original, CamelException *ex);
+				      gboolean delete_original, GError **error);
 
 void camel_exchange_journal_delete (CamelExchangeJournal *journal, const gchar *uid,
-				    guint32 flags, guint32 set, CamelException *ex);
+				    guint32 flags, guint32 set, GError **error);
 
 G_END_DECLS
 
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index c6be281..4bd060c 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -149,7 +149,7 @@ CamelServiceAuthType camel_exchange_password_authtype = {
 
 static gint
 exchange_auto_detect_cb (CamelURL *url, GHashTable **auto_detected,
-			 CamelException *ex)
+			 GError **error)
 {
 	*auto_detected = g_hash_table_new (g_str_hash, g_str_equal);
 
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index 77ec2b0..78a2246 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -46,43 +46,43 @@ static CamelOfflineStoreClass *parent_class = NULL;
 
 static void construct (CamelService *service, CamelSession *session,
 		       CamelProvider *provider, CamelURL *url,
-		       CamelException *ex);
+		       GError **error);
 
-static GList *query_auth_types (CamelService *service, CamelException *ex);
+static GList *query_auth_types (CamelService *service, GError **error);
 static gchar  *get_name         (CamelService *service, gboolean brief);
 static CamelFolder     *get_trash       (CamelStore *store,
-					 CamelException *ex);
+					 GError **error);
 
 gchar * exchange_path_to_physical (const gchar *prefix, const gchar *vpath);
-static gboolean exchange_connect (CamelService *service, CamelException *ex);
-static gboolean exchange_disconnect (CamelService *service, gboolean clean, CamelException *ex);
+static gboolean exchange_connect (CamelService *service, GError **error);
+static gboolean exchange_disconnect (CamelService *service, gboolean clean, GError **error);
 
 static CamelFolder *exchange_get_folder (CamelStore *store, const gchar *folder_name,
-					 guint32 flags, CamelException *ex);
+					 guint32 flags, GError **error);
 
 static CamelFolderInfo *exchange_get_folder_info (CamelStore *store, const gchar *top,
-						  guint32 flags, CamelException *ex);
+						  guint32 flags, GError **error);
 
 static CamelFolderInfo *exchange_create_folder (CamelStore *store,
 						const gchar *parent_name,
 						const gchar *folder_name,
-						CamelException *ex);
+						GError **error);
 static void             exchange_delete_folder (CamelStore *store,
 						const gchar *folder_name,
-						CamelException *ex);
+						GError **error);
 static void             exchange_rename_folder (CamelStore *store,
 						const gchar *old_name,
 						const gchar *new_name,
-						CamelException *ex);
+						GError **error);
 static gboolean		exchange_folder_subscribed (CamelStore *store,
 						const gchar *folder_name);
 static void		exchange_subscribe_folder (CamelStore *store,
 						const gchar *folder_name,
-						CamelException *ex);
+						GError **error);
 static void		exchange_unsubscribe_folder (CamelStore *store,
 						const gchar *folder_name,
-						CamelException *ex);
-static gboolean exchange_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, CamelException *ex);
+						GError **error);
+static gboolean exchange_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, GError **error);
 
 static void
 class_init (CamelExchangeStoreClass *camel_exchange_store_class)
@@ -167,7 +167,7 @@ camel_exchange_store_get_type (void)
 /* Use this to ensure that the camel session is online and we are connected
    too. Also returns the current status of the store */
 gboolean
-camel_exchange_store_connected (CamelExchangeStore *store, CamelException *ex)
+camel_exchange_store_connected (CamelExchangeStore *store, GError **error)
 {
 	CamelService *service;
 	CamelSession *session;
@@ -267,7 +267,7 @@ exchange_path_to_physical (const gchar *prefix, const gchar *vpath)
 
 static void
 construct (CamelService *service, CamelSession *session,
-	   CamelProvider *provider, CamelURL *url, CamelException *ex)
+	   CamelProvider *provider, CamelURL *url, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (service);
 	gchar *p;
@@ -291,7 +291,7 @@ extern CamelServiceAuthType camel_exchange_password_authtype;
 extern CamelServiceAuthType camel_exchange_ntlm_authtype;
 
 static GList *
-query_auth_types (CamelService *service, CamelException *ex)
+query_auth_types (CamelService *service, GError **error)
 {
 	return g_list_prepend (g_list_prepend (NULL, &camel_exchange_password_authtype),
 			       &camel_exchange_ntlm_authtype);
@@ -313,7 +313,7 @@ get_name (CamelService *service, gboolean brief)
 #define EXCHANGE_STOREINFO_VERSION 1
 
 static void
-camel_exchange_get_password (CamelService *service, CamelException *ex)
+camel_exchange_get_password (CamelService *service, GError **error)
 {
 	CamelSession *session = camel_service_get_session (service);
 
@@ -332,7 +332,7 @@ camel_exchange_get_password (CamelService *service, CamelException *ex)
 }
 
 static void
-camel_exchange_forget_password (CamelService *service, CamelException *ex)
+camel_exchange_forget_password (CamelService *service, GError **error)
 {
 	CamelSession *session = camel_service_get_session (service);
 
@@ -346,7 +346,7 @@ camel_exchange_forget_password (CamelService *service, CamelException *ex)
 }
 
 static gboolean
-exchange_connect (CamelService *service, CamelException *ex)
+exchange_connect (CamelService *service, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (service);
 	gchar *password = NULL;
@@ -393,7 +393,7 @@ exchange_connect (CamelService *service, CamelException *ex)
 }
 
 static gboolean
-exchange_disconnect (CamelService *service, gboolean clean, CamelException *ex)
+exchange_disconnect (CamelService *service, gboolean clean, GError **error)
 {
 	/* CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (service); */
 	/* keep account connect as it can be used for other parts like cal, gal or addressbook? */
@@ -409,7 +409,7 @@ exchange_disconnect (CamelService *service, gboolean clean, CamelException *ex)
 
 static CamelFolder *
 exchange_get_folder (CamelStore *store, const gchar *folder_name,
-		     guint32 flags, CamelException *ex)
+		     guint32 flags, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 	CamelFolder *folder;
@@ -489,7 +489,7 @@ exchange_folder_subscribed (CamelStore *store, const gchar *folder_name)
 
 static void
 exchange_subscribe_folder (CamelStore *store, const gchar *folder_name,
-				CamelException *ex)
+				GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 
@@ -504,7 +504,7 @@ exchange_subscribe_folder (CamelStore *store, const gchar *folder_name,
 
 static void
 exchange_unsubscribe_folder (CamelStore *store, const gchar *folder_name,
-				CamelException *ex)
+				GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 
@@ -518,7 +518,7 @@ exchange_unsubscribe_folder (CamelStore *store, const gchar *folder_name,
 }
 
 static CamelFolder *
-get_trash (CamelStore *store, CamelException *ex)
+get_trash (CamelStore *store, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 
@@ -630,7 +630,7 @@ postprocess_tree (CamelFolderInfo *info)
 }
 
 static CamelFolderInfo *
-exchange_get_folder_info (CamelStore *store, const gchar *top, guint32 flags, CamelException *ex)
+exchange_get_folder_info (CamelStore *store, const gchar *top, guint32 flags, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 	GPtrArray *folders, *folder_names = NULL, *folder_uris = NULL;
@@ -696,7 +696,7 @@ exchange_get_folder_info (CamelStore *store, const gchar *top, guint32 flags, Ca
 
 static CamelFolderInfo *
 exchange_create_folder (CamelStore *store, const gchar *parent_name,
-			const gchar *folder_name, CamelException *ex)
+			const gchar *folder_name, GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 	gchar *folder_uri;
@@ -722,7 +722,7 @@ exchange_create_folder (CamelStore *store, const gchar *parent_name,
 
 static void
 exchange_delete_folder (CamelStore *store, const gchar *folder_name,
-			CamelException *ex)
+			GError **error)
 {
 	CamelExchangeStore *exch = CAMEL_EXCHANGE_STORE (store);
 
@@ -736,7 +736,7 @@ exchange_delete_folder (CamelStore *store, const gchar *folder_name,
 
 static void
 exchange_rename_folder (CamelStore *store, const gchar *old_name,
-			const gchar *new_name, CamelException *ex)
+			const gchar *new_name, GError **error)
 {
 	GPtrArray *folders = NULL, *folder_names = NULL, *folder_uris = NULL;
 	GArray *unread_counts = NULL;
@@ -803,7 +803,7 @@ exchange_rename_folder (CamelStore *store, const gchar *old_name,
 }
 
 static gboolean
-exchange_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, CamelException *ex)
+exchange_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, GError **error)
 {
 	gboolean res;
 
diff --git a/camel/camel-exchange-store.h b/camel/camel-exchange-store.h
index ae552f1..707c839 100644
--- a/camel/camel-exchange-store.h
+++ b/camel/camel-exchange-store.h
@@ -35,7 +35,7 @@ typedef struct {
 /* Standard Camel function */
 CamelType camel_exchange_store_get_type (void);
 
-gboolean camel_exchange_store_connected (CamelExchangeStore *store, CamelException *ex);
+gboolean camel_exchange_store_connected (CamelExchangeStore *store, GError **error);
 
 void camel_exchange_store_folder_created (CamelExchangeStore *estore, const gchar *name, const gchar *uri);
 void camel_exchange_store_folder_deleted (CamelExchangeStore *estore, const gchar *name, const gchar *uri);
diff --git a/camel/camel-exchange-summary.c b/camel/camel-exchange-summary.c
index 1a3b14f..9db2bea 100644
--- a/camel/camel-exchange-summary.c
+++ b/camel/camel-exchange-summary.c
@@ -52,7 +52,7 @@ static gint               message_info_save (CamelFolderSummary *summary,
 					    FILE *out,
 					    CamelMessageInfo *info);
 static gint summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
-static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, CamelException *ex);
+static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
 static CamelMIRecord * message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info);
 static CamelMessageInfo * message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir);
 static CamelMessageInfo *message_info_new_from_header  (CamelFolderSummary *summary,
@@ -211,7 +211,7 @@ header_load (CamelFolderSummary *summary, FILE *in)
 }
 
 static CamelFIRecord *
-summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
+summary_header_to_db (CamelFolderSummary *s, GError **error)
 {
 	CamelExchangeSummary *exchange = (CamelExchangeSummary *) s;
 	struct _CamelFIRecord *fir;
diff --git a/camel/camel-exchange-transport.c b/camel/camel-exchange-transport.c
index 92ffbb0..71e8309 100644
--- a/camel/camel-exchange-transport.c
+++ b/camel/camel-exchange-transport.c
@@ -36,7 +36,7 @@ static gboolean exchange_send_to (CamelTransport *transport,
 				  CamelMimeMessage *message,
 				  CamelAddress *from,
 				  CamelAddress *recipients,
-				  CamelException *ex);
+				  GError **error);
 
 static void
 camel_exchange_transport_class_init (CamelExchangeTransportClass *camel_exchange_transport_class)
@@ -76,7 +76,7 @@ camel_exchange_transport_get_type (void)
 static gboolean
 exchange_send_to (CamelTransport *transport, CamelMimeMessage *message,
 		  CamelAddress *from, CamelAddress *recipients,
-		  CamelException *ex)
+		  GError **error)
 {
 	CamelService *service = CAMEL_SERVICE (transport);
 	CamelStore *store = NULL;
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index 6de0c8d..c4f017d 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -212,7 +212,7 @@ is_online (ExchangeData *ed)
 }
 
 static void
-set_exception (CamelException *ex, const gchar *err)
+set_exception (GError **error, const gchar *err)
 {
 	g_return_if_fail (err != NULL);
 
@@ -402,7 +402,7 @@ change_flags (ExchangeFolder *mfld, CamelFolder *folder, ExchangeMessage *mmsg,
 }
 
 static void
-refresh_folder_internal (ExchangeFolder *mfld, CamelException *ex)
+refresh_folder_internal (ExchangeFolder *mfld, GError **error)
 {
 	static const gchar *new_message_props[] = {
 		E2K_PR_REPL_UID,
@@ -823,7 +823,7 @@ free_folder (gpointer value)
 }
 
 static void
-got_folder_error (ExchangeFolder *mfld, CamelException *ex, const gchar *err)
+got_folder_error (ExchangeFolder *mfld, GError **error, const gchar *err)
 {
 	set_exception (ex, err);
 
@@ -870,7 +870,7 @@ mfld_get_folder_online_sync_updates (gpointer key, gpointer value, gpointer user
 }
 
 static gboolean
-get_folder_contents_online (ExchangeFolder *mfld, CamelException *ex)
+get_folder_contents_online (ExchangeFolder *mfld, GError **error)
 {
 	static const gchar *open_folder_sync_props[] = {
 		E2K_PR_REPL_UID,
@@ -1183,7 +1183,7 @@ notify_cb (E2kContext *ctx, const gchar *uri, E2kContextChangeType type, gpointe
 }
 
 static gboolean
-get_folder_online (ExchangeFolder *mfld, CamelException *ex)
+get_folder_online (ExchangeFolder *mfld, GError **error)
 {
 	static const gchar *open_folder_props[] = {
 		PR_ACCESS,
@@ -1264,7 +1264,7 @@ get_folder_online (ExchangeFolder *mfld, CamelException *ex)
 }
 
 static ExchangeFolder *
-folder_from_name (ExchangeData *ed, const gchar *folder_name, guint32 perms, CamelException *ex)
+folder_from_name (ExchangeData *ed, const gchar *folder_name, guint32 perms, GError **error)
 {
 	ExchangeFolder *mfld;
 
@@ -2036,7 +2036,7 @@ struct update_linestatus
 {
 	CamelExchangeStore *estore;
 	gint linestatus;
-	CamelException *ex;
+	GError **error;
 };
 
 static void
@@ -2068,7 +2068,7 @@ gboolean
 camel_exchange_utils_connect (CamelService *service,
 				const gchar *pwd,
 				guint32 *status, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeAccount *account;
@@ -2136,7 +2136,7 @@ camel_exchange_utils_get_folder (CamelService *service,
 				guint32 *folder_flags, /* out */
 				gchar **folder_uri, /* out */
 				gboolean *readonly, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2246,7 +2246,7 @@ camel_exchange_utils_get_folder (CamelService *service,
 gboolean
 camel_exchange_utils_get_trash_name (CamelService *service,
 				gchar **trash_name, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 
@@ -2266,7 +2266,7 @@ camel_exchange_utils_get_trash_name (CamelService *service,
 gboolean
 camel_exchange_utils_refresh_folder (CamelService *service,
 				const gchar *folder_name,
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2289,7 +2289,7 @@ camel_exchange_utils_sync_count (CamelService *service,
 				const gchar *folder_name,
 				guint32 *unread_count, /* out */
 				guint32 *visible_count, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2314,7 +2314,7 @@ gboolean
 camel_exchange_utils_expunge_uids (CamelService *service,
 				const gchar *folder_name,
 				GPtrArray *uids,
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2404,7 +2404,7 @@ camel_exchange_utils_append_message (CamelService *service,
 				const gchar *subject,
 				const GByteArray *message,
 				gchar **new_uid, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2481,7 +2481,7 @@ camel_exchange_utils_set_message_flags (CamelService *service,
 					const gchar *uid,
 					guint32 flags,
 					guint32 mask,
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2557,7 +2557,7 @@ camel_exchange_utils_set_message_tag (CamelService *service,
 				const gchar *uid,
 				const gchar *name,
 				const gchar *value,
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2585,7 +2585,7 @@ camel_exchange_utils_get_message (CamelService *service,
 				const gchar *folder_name,
 				const gchar *uid,
 				GByteArray **message_bytes, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2702,7 +2702,7 @@ camel_exchange_utils_search (CamelService *service,
 				const gchar *folder_name,
 				const gchar *text,
 				GPtrArray **found_uids, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -2755,7 +2755,7 @@ camel_exchange_utils_transfer_messages (CamelService *service,
 					GPtrArray *uids,
 					gboolean delete_originals,
 					GPtrArray **ret_uids, /* out */
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *source, *dest;
@@ -2913,7 +2913,7 @@ camel_exchange_utils_get_folder_info (CamelService *service,
 					GPtrArray **folder_uris, /* out */
 					GArray **unread_counts, /* out */
 					GArray **folder_flags, /* out */
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 
@@ -2938,7 +2938,7 @@ camel_exchange_utils_send_message (CamelService *service,
 				const gchar *from,
 				GPtrArray *recipients,
 				const GByteArray *message,
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	SoupMessage *msg;
@@ -3020,7 +3020,7 @@ camel_exchange_utils_create_folder (CamelService *service,
 				gchar **folder_uri, /* out */
 				guint32 *unread_count, /* out */
 				guint32 *flags, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeAccountFolderResult result;
@@ -3065,7 +3065,7 @@ camel_exchange_utils_create_folder (CamelService *service,
 gboolean
 camel_exchange_utils_delete_folder (CamelService *service,
 				const gchar *folder_name,
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeAccountFolderResult result;
@@ -3118,7 +3118,7 @@ camel_exchange_utils_rename_folder (CamelService *service,
 				GPtrArray **folder_uris, /* out */
 				GArray **unread_counts, /* out */
 				GArray **folder_flags, /* out */
-				CamelException *ex)
+				GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeFolder *mfld;
@@ -3280,7 +3280,7 @@ camel_exchange_utils_rename_folder (CamelService *service,
 gboolean
 camel_exchange_utils_subscribe_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeAccountFolderResult result;
@@ -3332,7 +3332,7 @@ camel_exchange_utils_subscribe_folder (CamelService *service,
 gboolean
 camel_exchange_utils_unsubscribe_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	ExchangeAccountFolderResult result;
@@ -3403,7 +3403,7 @@ gboolean
 camel_exchange_utils_is_subscribed_folder (CamelService *service,
 					const gchar *folder_name,
 					gboolean *is_subscribed, /* out */
-					CamelException *ex)
+					GError **error)
 {
 	ExchangeData *ed = get_data_for_service (service);
 	EFolder *folder;
diff --git a/camel/camel-exchange-utils.h b/camel/camel-exchange-utils.h
index 848dcc4..22617f6 100644
--- a/camel/camel-exchange-utils.h
+++ b/camel/camel-exchange-utils.h
@@ -11,7 +11,7 @@ G_BEGIN_DECLS
 gboolean camel_exchange_utils_connect (CamelService *service,
 					const gchar *pwd,
 					guint32 *status, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_get_folder (CamelService *service,
 					const gchar *name,
@@ -23,26 +23,26 @@ gboolean camel_exchange_utils_get_folder (CamelService *service,
 					guint32 *folder_flags, /* out */
 					gchar **folder_uri, /* out */
 					gboolean *readonly, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_get_trash_name (CamelService *service,
 					gchar **trash_name, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_refresh_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_sync_count (CamelService *service,
 					const gchar *folder_name,
 					guint32 *unread_count, /* out */
 					guint32 *visible_count, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_expunge_uids (CamelService *service,
 					const gchar *folder_name,
 					GPtrArray *uids,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_append_message (CamelService *service,
 					const gchar *folder_name,
@@ -50,33 +50,33 @@ gboolean camel_exchange_utils_append_message (CamelService *service,
 					const gchar *subject,
 					const GByteArray *message,
 					gchar **new_uid, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_set_message_flags (CamelService *service,
 					const gchar *folder_name,
 					const gchar *uid,
 					guint32 flags,
 					guint32 mask,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_set_message_tag (CamelService *service,
 					const gchar *folder_name,
 					const gchar *uid,
 					const gchar *name,
 					const gchar *value,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_get_message (CamelService *service,
 					const gchar *folder_name,
 					const gchar *uid,
 					GByteArray **message_bytes, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_search (CamelService *service,
 					const gchar *folder_name,
 					const gchar *text,
 					GPtrArray **found_uids, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_transfer_messages (CamelService *service,
 					const gchar *source_name,
@@ -84,7 +84,7 @@ gboolean camel_exchange_utils_transfer_messages (CamelService *service,
 					GPtrArray *uids,
 					gboolean delete_originals,
 					GPtrArray **ret_uids, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_get_folder_info (CamelService *service,
 					const gchar *top,
@@ -93,13 +93,13 @@ gboolean camel_exchange_utils_get_folder_info (CamelService *service,
 					GPtrArray **folder_uris, /* out */
 					GArray **unread_counts, /* out */
 					GArray **folder_flags, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_send_message (CamelService *service,
 					const gchar *from,
 					GPtrArray *recipients,
 					const GByteArray *message,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_create_folder (CamelService *service,
 					const gchar *parent_name,
@@ -107,11 +107,11 @@ gboolean camel_exchange_utils_create_folder (CamelService *service,
 					gchar **folder_uri, /* out */
 					guint32 *unread_count, /* out */
 					guint32 *flags, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_delete_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_rename_folder (CamelService *service,
 					const gchar *old_name,
@@ -120,20 +120,20 @@ gboolean camel_exchange_utils_rename_folder (CamelService *service,
 					GPtrArray **folder_uris, /* out */
 					GArray **unread_counts, /* out */
 					GArray **folder_flags, /* out */
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_subscribe_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_unsubscribe_folder (CamelService *service,
 					const gchar *folder_name,
-					CamelException *ex);
+					GError **error);
 
 gboolean camel_exchange_utils_is_subscribed_folder (CamelService *service,
 					const gchar *folder_name,
 					gboolean *is_subscribed, /* out */
-					CamelException *ex);
+					GError **error);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]