From 50813793c3393e70f5b3c46a7541c26d0e9d9c14 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 9 Jul 2001 18:40:56 +0000 Subject: Check for an exception and print it. Call done anyway. 2001-07-09 Peter Williams * mail-ops.c (get_folderinfo_got): Check for an exception and print it. Call done anyway. (do_update_subfolders): Check for NULL info. svn path=/trunk/; revision=10924 --- mail/ChangeLog | 6 ++++++ mail/mail-ops.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 031095076b..68d75e100e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-07-09 Peter Williams + + * 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 * mail-config.c (mail_config_write): Some NULL protection for our strings: 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); } -- cgit v1.2.3