aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-send-recv.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 717d89e810..ddfa166bab 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-02 Ross Burton <ross@openedhand.com>
+
+ * mail-send-recv.c:
+ Pass a CamelException when refreshing folders, removing the spew
+ of warnings (#439957).
+
2007-06-02 Srinivasa Ragavan <sragavan@novell.com>
* em-utils.c: (em_utils_contact_photo): Removing few debug statements.
@@ -4140,7 +4146,7 @@ t2006-02-20 Parthasarathi Susarla <sparthasarathi@novell.com>
(emfb_folder_changed, emfb_gui_folder_changed): if a select_uid is
set, and the message is now available, then select it.
-2004-11-28 S.Çağlar Onur <caglar@uludag.org.tr>
+2004-11-28 S.Ã?aÄ?lar Onur <caglar@uludag.org.tr>
** See bug #69446.
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 506ca09931..55a0a99260 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -786,12 +786,16 @@ refresh_folders_get (struct _mail_msg *mm)
CamelException ex = CAMEL_EXCEPTION_INITIALISER;
for (i=0;i<m->folders->len;i++) {
- folder = mail_tool_uri_to_folder(m->folders->pdata[i], 0, NULL);
+ folder = mail_tool_uri_to_folder(m->folders->pdata[i], 0, &ex);
if (folder) {
camel_folder_refresh_info(folder, &ex);
camel_exception_clear(&ex);
camel_object_unref(folder);
+ } else if (camel_exception_is_set(&ex)) {
+ g_warning ("Failed to refresh folders: %s", camel_exception_get_description (&ex));
+ camel_exception_clear (&ex);
}
+
if (camel_operation_cancel_check(m->info->cancel))
break;
}