Commit 30fe010c authored by Matthew Barnes's avatar Matthew Barnes Committed by Rodrigo Moya
Browse files

Adapt to CamelFolder:name -> display-name.

parent 708ce513
......@@ -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)) {
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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
......
......@@ -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",
......
......@@ -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;
......
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment