[evolution-data-server] A bit less 'camel_exception_get_id called with NULL parameter' on console

[Milan Crha <mcrha src gnome org>]

commit caedb28a08ce6d1de915eb404e881261d4e5f64d
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jan 19 18:19:23 2010 +0100

    A bit less 'camel_exception_get_id called with NULL parameter' on console

 camel/camel-folder.c                      |    9 +++++----
 camel/providers/imap/camel-imap-folder.c  |    5 ++++-
 camel/providers/imap/camel-imap-wrapper.c |    6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index e5af4af..bf6edce 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1901,16 +1901,17 @@ filter_filter(CamelSession *session, CamelSessionThreadMsg *tmsg)
 	gint i, status = 0;
 	CamelURL *uri;
 	gchar *source_url;
-	CamelException ex;
+	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
 	CamelJunkPlugin *csp = ((CamelService *)m->folder->parent_store)->session->junk_plugin;
 
 	if (m->junk) {
 		camel_operation_start (NULL, _("Learning junk"));
 
 		for (i = 0; i < m->junk->len; i ++) {
-			CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->junk->pdata[i], NULL);
+			CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->junk->pdata[i], &ex);
 			gint pc = 100 * i / m->junk->len;
 
+			camel_exception_clear (&ex);
 			camel_operation_progress(NULL, pc);
 
 			if (msg) {
@@ -1924,9 +1925,10 @@ filter_filter(CamelSession *session, CamelSessionThreadMsg *tmsg)
 	if (m->notjunk) {
 		camel_operation_start (NULL, _("Learning non-junk"));
 		for (i = 0; i < m->notjunk->len; i ++) {
-			CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->notjunk->pdata[i], NULL);
+			CamelMimeMessage *msg = camel_folder_get_message(m->folder, m->notjunk->pdata[i], &ex);
 			gint pc = 100 * i / m->notjunk->len;
 
+			camel_exception_clear (&ex);
 			camel_operation_progress(NULL, pc);
 
 			if (msg) {
@@ -1973,7 +1975,6 @@ filter_filter(CamelSession *session, CamelSessionThreadMsg *tmsg)
 			camel_folder_free_message_info(m->folder, info);
 		}
 
-		camel_exception_init(&ex);
 		camel_filter_driver_flush(m->driver, &ex);
 		if (!camel_exception_is_set(&m->ex))
 			camel_exception_xfer(&m->ex, &ex);
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 0a298a5..4c3ebaf 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -3767,8 +3767,11 @@ imap_thaw (CamelFolder *folder)
 
 	imap_folder = CAMEL_IMAP_FOLDER (folder);
 	if (imap_folder->need_refresh) {
+		CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
 		imap_folder->need_refresh = FALSE;
-		imap_refresh_info (folder, NULL);
+		imap_refresh_info (folder, &ex);
+		camel_exception_clear (&ex);
 	}
 }
 
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index a0d9b9b..454dcdb 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -134,11 +134,15 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 
 	CAMEL_IMAP_WRAPPER_LOCK (imap_wrapper, lock);
 	if (data_wrapper->offline) {
+		CamelException ex = CAMEL_EXCEPTION_INITIALISER;
 		CamelStream *datastream;
 
 		datastream = camel_imap_folder_fetch_data (
 			imap_wrapper->folder, imap_wrapper->uid,
-			imap_wrapper->part_spec, FALSE, NULL);
+			imap_wrapper->part_spec, FALSE, &ex);
+
+		camel_exception_clear (&ex);
+
 		if (!datastream) {
 			CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);
 #ifdef ENETUNREACH