From cfa1f110a7dabe96457a17f0e42f632f8b111828 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 21 May 2004 03:30:00 +0000 Subject: re-arrange the code so exception debug will print the expanded 2004-05-20 Not Zed * camel-exception.c (camel_exception_setv): re-arrange the code so exception debug will print the expanded description. (camel_exception_set): print exception debug. * providers/pop3/camel-pop3-folder.c (pop3_get_message): same. * providers/local/camel-mh-folder.c (mh_get_message) * providers/local/camel-mbox-folder.c (mbox_get_message): * providers/local/camel-maildir-folder.c (maildir_get_message): Don't use INVALID_UID for errors which are more system related. And sync up all the error messages. svn path=/trunk/; revision=26028 --- camel/providers/local/camel-mbox-folder.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'camel/providers/local/camel-mbox-folder.c') diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c index eeeb974a52..0d86b6d766 100644 --- a/camel/providers/local/camel-mbox-folder.c +++ b/camel/providers/local/camel-mbox-folder.c @@ -414,7 +414,8 @@ retry: if (info == NULL) { camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, - _("Cannot get message: %s\n %s"), uid, _("No such message")); + _("Cannot get message: %s from folder %s\n %s"), + uid, lf->folder_path, _("No such message")); goto fail; } @@ -431,7 +432,7 @@ retry: fd = open(lf->folder_path, O_RDONLY); if (fd == -1) { - camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, + camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message: %s from folder %s\n %s"), uid, lf->folder_path, g_strerror (errno)); goto fail; @@ -462,7 +463,7 @@ retry: goto retry; } - camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, + camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID, _("Cannot get message: %s from folder %s\n %s"), uid, lf->folder_path, _("The folder appears to be irrecoverably corrupted.")); goto fail; @@ -470,9 +471,9 @@ retry: message = camel_mime_message_new(); if (camel_mime_part_construct_from_parser((CamelMimePart *)message, parser) == -1) { - camel_exception_setv(ex, errno==EINTR?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_FOLDER_INVALID_UID, + camel_exception_setv(ex, errno==EINTR?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_SYSTEM, _("Cannot get message: %s from folder %s\n %s"), uid, lf->folder_path, - _("Message construction failed: Corrupt mailbox?")); + _("Message construction failed.")); camel_object_unref((CamelObject *)message); message = NULL; goto fail; -- cgit v1.2.3