Adapt to CamelFolder:name -> display-name.

8 files changed, 11 insertions, 9 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index fd85f5f984..6ef8ec2e29 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -515,7 +515,7 @@ remove_duplicates_got_messages_cb (CamelFolder *folder,
 	if (dups->len == 0) {
 		em_utils_prompt_user (
 			parent, NULL, "mail:info-no-remove-duplicates",
-			camel_folder_get_name (folder), NULL);
+			camel_folder_get_display_name (folder), NULL);
 	} else {
 		gchar *msg = g_strdup_printf (ngettext (
 			/* Translators: %s is replaced with a folder name
@@ -525,7 +525,7 @@ remove_duplicates_got_messages_cb (CamelFolder *folder,
 			"Folder '%s' contains %d duplicate messages. "
 			"Are you sure you want to delete them?",
 			dups->len),
-			camel_folder_get_name (folder), dups->len);
+			camel_folder_get_display_name (folder), dups->len);
 
 		if (em_utils_prompt_user (
 			parent, NULL, "mail:ask-remove-duplicates", msg, NULL)) {
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 014d59d850..bf2322c732 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -241,7 +241,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
 	/* Get number of VISIBLE and DELETED messages, instead of TOTAL
 	 * messages.  VISIBLE+DELETED gives the correct count that matches
 	 * the label below the Send & Receive button. */
-	name = camel_folder_get_name (folder);
+	name = camel_folder_get_display_name (folder);
 	prop_data->total = folder->summary->visible_count;
 	prop_data->unread = folder->summary->unread_count;
 	deleted = folder->summary->deleted_count;
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 182ec200c3..c64972d57f 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -544,7 +544,7 @@ em_folder_utils_delete_folder (EMailBackend *backend,
 	if (mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) {
 		e_mail_backend_submit_alert (
 			backend, "mail:no-delete-special-folder",
-			camel_folder_get_name (folder), NULL);
+			camel_folder_get_display_name (folder), NULL);
 		return;
 	}
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 07957ec456..2bc8831ad4 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -911,7 +911,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
 		/* Drop filename for messages from a mailbox */
 		file = g_strdup_printf (
 			_("Messages from %s"),
-			camel_folder_get_name (folder));
+			camel_folder_get_display_name (folder));
 	}
 
 	e_filename_make_safe (file);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 0526084016..e6bee3e534 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1282,7 +1282,9 @@ struct _get_quota_msg {
 static gchar *
 get_quota_desc (struct _get_quota_msg *m)
 {
-	return g_strdup_printf (_("Retrieving quota information for folder '%s'"), camel_folder_get_name (m->folder));
+	return g_strdup_printf (
+		_("Retrieving quota information for folder '%s'"),
+		camel_folder_get_display_name (m->folder));
 }
 
 static void
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 70ef327aaf..3b52abcd1d 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -399,7 +399,7 @@ exit:
 		const gchar *folder_name = data;
 
 		if (folder != NULL)
-			folder_name = camel_folder_get_name (folder);
+			folder_name = camel_folder_get_display_name (folder);
 
 		e_alert_run_dialog_for_args (
 			parent, "mail-composer:attach-nomessages",
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 361f10bbca..c5f555d757 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -1121,7 +1121,7 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 		return;
 	}
 
-	folder_name = camel_folder_get_name (folder);
+	folder_name = camel_folder_get_display_name (folder);
 	parent_store = camel_folder_get_parent_store (folder);
 
 	num_deleted = folder->summary->deleted_count;
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 9f236c072a..ba7d84c09c 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -249,7 +249,7 @@ read_notify_dbus (EMEventTargetMessage *t)
 	if (connection != NULL)
 		send_dbus_message (
 			"MessageReading",
-			camel_folder_get_name (t->folder),
+			camel_folder_get_display_name (t->folder),
 			0, NULL, NULL, NULL);
 }