=?utf-8?q?=5Bevolution=5D_Bug_=23687503_-_Improve_error_message_=C2=BBFai?= =?utf-8?q?led_to_refresh_folders=C2=AB?=
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug #687503 - Improve error message ÂFailed to refresh foldersÂ
- Date: Mon, 3 Dec 2012 17:33:16 +0000 (UTC)
commit 01a3fd26cdcbafa04e0d67d2be5d8dfb91a2c09b
Author: Milan Crha <mcrha redhat com>
Date: Mon Dec 3 18:32:46 2012 +0100
Bug #687503 - Improve error message ÂFailed to refresh foldersÂ
mail/mail-send-recv.c | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 7d4ebda..3118bf7 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1046,18 +1046,33 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
E_MAIL_SESSION (m->info->session),
m->folders->pdata[i], 0,
cancellable, &local_error);
- if (folder) {
- if (camel_folder_synchronize_sync (folder, FALSE, cancellable, &local_error))
- camel_folder_refresh_info_sync (folder, cancellable, &local_error);
- g_object_unref (folder);
- }
+ if (folder && camel_folder_synchronize_sync (folder, FALSE, cancellable, &local_error))
+ camel_folder_refresh_info_sync (folder, cancellable, &local_error);
if (local_error != NULL) {
- if (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning ("Failed to refresh folder: %s: %s", (const gchar *) m->folders->pdata[i], local_error->message);
+ if (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ const gchar *account_name = NULL, *full_name;
+
+ if (folder) {
+ CamelStore *store = camel_folder_get_parent_store (folder);
+
+ account_name = camel_service_get_display_name (CAMEL_SERVICE (store));
+ full_name = camel_folder_get_full_name (folder);
+ } else
+ full_name = (const gchar *) m->folders->pdata[i];
+
+ g_warning ("Failed to refresh folder '%s%s%s': %s",
+ account_name ? account_name : "",
+ account_name ? ": " : "",
+ full_name, local_error->message);
+ }
+
g_clear_error (&local_error);
}
+ if (folder)
+ g_object_unref (folder);
+
if (g_cancellable_is_cancelled (m->info->cancellable) ||
g_cancellable_is_cancelled (cancellable))
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]