[evolution] Use folder display name in status messages when possible.

[Matthew Barnes <mbarnes src gnome org>]

commit 07857224789b165e69bb170d364c9c13366fa952
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 8 16:05:49 2012 -0400

    Use folder display name in status messages when possible.

 libemail-engine/e-mail-folder-utils.c |   10 ++++++----
 mail/importers/mail-importer.c        |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index aa1541c..5e05b64 100644
--- a/libemail-engine/e-mail-folder-utils.c
+++ b/libemail-engine/e-mail-folder-utils.c
@@ -107,7 +107,7 @@ e_mail_folder_append_message_sync (CamelFolder *folder,
 	camel_operation_push_message (
 		cancellable,
 		_("Saving message to folder '%s'"),
-		camel_folder_get_full_name (folder));
+		camel_folder_get_display_name (folder));
 
 	if (camel_medium_get_header (medium, "X-Mailer") == NULL)
 		camel_medium_set_header (medium, "X-Mailer", X_MAILER);
@@ -831,7 +831,9 @@ e_mail_folder_remove_sync (CamelFolder *folder,
 	CamelFolderInfo *to_remove;
 	CamelFolderInfo *next = NULL;
 	CamelStore *parent_store;
+	const gchar *display_name;
 	const gchar *full_name;
+	const gchar *message;
 	gboolean success = TRUE;
 	GCancellable *transparent_cancellable = NULL;
 	gulong cbid = 0;
@@ -879,9 +881,9 @@ e_mail_folder_remove_sync (CamelFolder *folder,
 		to_remove->next = NULL;
 	}
 
-	camel_operation_push_message (
-		cancellable, _("Removing folder '%s'"),
-		camel_folder_get_full_name (folder));
+	message = _("Removing folder '%s'");
+	display_name = camel_folder_get_display_name (folder);
+	camel_operation_push_message (cancellable, message, display_name);
 
 	if (cancellable) {
 		transparent_cancellable = g_cancellable_new ();
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 716d99c..824d48a 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -151,7 +151,7 @@ import_mbox_exec (struct _import_mbox_msg *m,
 
 		camel_operation_push_message (
 			m->cancellable, _("Importing '%s'"),
-			camel_folder_get_full_name (folder));
+			camel_folder_get_display_name (folder));
 		camel_folder_freeze (folder);
 		while (camel_mime_parser_step (mp, NULL, NULL) ==
 				CAMEL_MIME_PARSER_STATE_FROM) {