aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-ops.c9
2 files changed, 14 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 031095076b..68d75e100e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2001-07-09 Peter Williams <peterw@ximian.com>
+ * mail-ops.c (get_folderinfo_got): Check for an exception and print it.
+ Call done anyway.
+ (do_update_subfolders): Check for NULL info.
+
+2001-07-09 Peter Williams <peterw@ximian.com>
+
* mail-config.c (mail_config_write): Some NULL protection for our strings:
pgp_key, html_signature, smime_key. Probably we should do this for all
strings. Either that or change Bonobo Config.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 5725e27980..09e4c51c06 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -384,7 +384,7 @@ do_update_subfolders (CamelStore *store, CamelFolderInfo *info, void *data)
{
struct _update_info *uinfo = data;
- if (uinfo) {
+ if (uinfo && info) {
do_update_subfolders_rec(store, info, uinfo->storage, "");
}
@@ -1035,6 +1035,13 @@ static void get_folderinfo_got(struct _mail_msg *mm)
{
struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
+ if (camel_exception_is_set (&(mm->ex)))
+ g_warning ("Error getting folder info from store at %s: %s",
+ camel_service_get_url (CAMEL_SERVICE (m->store)),
+ camel_exception_get_description (&(mm->ex)));
+
+ /* 'done' is probably guaranteed to fail, but... */
+
if (m->done)
m->done(m->store, m->info, m->data);
}