[evolution] Use camel_folder_get_full_display_name() in user-visible strings

[Milan Crha <mcrha src gnome org>]

commit 60248ddbb7dab1477ad884a8cb6b55fd915890a6
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jul 8 12:59:16 2022 +0200

    Use camel_folder_get_full_display_name() in user-visible strings

 src/libemail-engine/e-mail-folder-utils.c  |  2 +-
 src/libemail-engine/e-mail-session-utils.c |  6 +++---
 src/libemail-engine/mail-ops.c             | 10 +++++-----
 src/libemail-engine/mail-vfolder.c         |  2 +-
 src/mail/e-mail-reader-utils.c             |  6 +++---
 src/mail/em-folder-properties.c            |  3 ++-
 src/mail/mail-send-recv.c                  |  2 +-
 src/mail/message-list.c                    | 30 +++++++++++++++++++-----------
 8 files changed, 35 insertions(+), 26 deletions(-)
---
diff --git a/src/libemail-engine/e-mail-folder-utils.c b/src/libemail-engine/e-mail-folder-utils.c
index 13a0e6b90c..32901788c4 100644
--- a/src/libemail-engine/e-mail-folder-utils.c
+++ b/src/libemail-engine/e-mail-folder-utils.c
@@ -2160,7 +2160,7 @@ e_mail_folder_to_full_display_name (CamelFolder *folder,
                    g_strcmp0 (folder_name, CAMEL_VJUNK_NAME) == 0))) {
                        full_display_name = g_strdup_printf ("%s : %s", service_display_name, 
camel_folder_get_display_name (folder));
                } else {
-                       full_display_name = g_strdup_printf ("%s : %s", service_display_name, folder_name);
+                       full_display_name = g_strdup_printf ("%s : %s", service_display_name, 
camel_folder_get_full_display_name (folder));
                }
 
                g_free (folder_name);
diff --git a/src/libemail-engine/e-mail-session-utils.c b/src/libemail-engine/e-mail-session-utils.c
index 983bac5769..8923fcb7d0 100644
--- a/src/libemail-engine/e-mail-session-utils.c
+++ b/src/libemail-engine/e-mail-session-utils.c
@@ -615,7 +615,7 @@ skip_send:
 
                g_return_if_fail (CAMEL_IS_FOLDER (folder));
 
-               camel_operation_push_message (cancellable, _("Posting message to “%s”"), 
camel_folder_get_full_name (folder));
+               camel_operation_push_message (cancellable, _("Posting message to “%s”"), 
camel_folder_get_full_display_name (folder));
 
                camel_folder_append_message_sync (
                        folder, context->message, context->info,
@@ -686,7 +686,7 @@ skip_send:
 
        /* Append the message. */
        if (folder != NULL) {
-               camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_name (folder));
+               camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_display_name (folder));
 
                camel_folder_append_message_sync (
                        folder, context->message,
@@ -721,7 +721,7 @@ skip_send:
 
                g_clear_error (&error);
 
-               camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_name (local_sent_folder));
+               camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_display_name (local_sent_folder));
 
                camel_folder_append_message_sync (
                        local_sent_folder, context->message,
diff --git a/src/libemail-engine/mail-ops.c b/src/libemail-engine/mail-ops.c
index fa7014d398..ad279e45d5 100644
--- a/src/libemail-engine/mail-ops.c
+++ b/src/libemail-engine/mail-ops.c
@@ -702,7 +702,7 @@ mail_send_message (struct _send_queue_msg *m,
                folder = e_mail_session_uri_to_folder_sync (
                        m->session, uri, 0, cancellable, &local_error);
                if (folder != NULL) {
-                       camel_operation_push_message (cancellable, _("Posting message to “%s”"), 
camel_folder_get_full_name (folder));
+                       camel_operation_push_message (cancellable, _("Posting message to “%s”"), 
camel_folder_get_full_display_name (folder));
 
                        camel_folder_append_message_sync (
                                folder, message, info, NULL, cancellable, &local_error);
@@ -766,7 +766,7 @@ mail_send_message (struct _send_queue_msg *m,
                        ((folder != NULL) && (local_error == NULL)));
 
                if (local_error == NULL) {
-                       camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_name (folder));
+                       camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_display_name (folder));
 
                        camel_folder_append_message_sync (
                                folder, message, info, NULL,
@@ -801,7 +801,7 @@ mail_send_message (struct _send_queue_msg *m,
                        g_clear_error (&local_error);
                        folder = g_object_ref (local_sent_folder);
 
-                       camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_name (folder));
+                       camel_operation_push_message (cancellable, _("Storing sent message to “%s”"), 
camel_folder_get_full_display_name (folder));
 
                        camel_folder_append_message_sync (
                                folder, message, info, NULL,
@@ -1333,7 +1333,7 @@ sync_folder_desc (struct _sync_folder_msg *m)
 {
        return g_strdup_printf (
                _("Storing folder “%s”"),
-               camel_folder_get_full_name (m->folder));
+               camel_folder_get_full_display_name (m->folder));
 }
 
 static void
@@ -1635,7 +1635,7 @@ static gchar *
 process_folder_changes_desc (struct _process_folder_changes_msg *m)
 {
        return g_strdup_printf (
-               _("Processing folder changes in “%s”"), camel_folder_get_full_name (m->folder));
+               _("Processing folder changes in “%s”"), camel_folder_get_full_display_name (m->folder));
 }
 
 static void
diff --git a/src/libemail-engine/mail-vfolder.c b/src/libemail-engine/mail-vfolder.c
index a2fdf3dd66..c869a85d69 100644
--- a/src/libemail-engine/mail-vfolder.c
+++ b/src/libemail-engine/mail-vfolder.c
@@ -147,7 +147,7 @@ vfolder_setup_desc (struct _setup_msg *m)
 {
        return g_strdup_printf (
                _("Setting up Search Folder: %s"),
-               camel_folder_get_full_name (m->folder));
+               camel_folder_get_full_display_name (m->folder));
 }
 
 static void
diff --git a/src/mail/e-mail-reader-utils.c b/src/mail/e-mail-reader-utils.c
index df95f3c83f..5b4b9ef0a2 100644
--- a/src/mail/e-mail-reader-utils.c
+++ b/src/mail/e-mail-reader-utils.c
@@ -137,7 +137,7 @@ e_mail_reader_confirm_delete (EMailReader *reader)
 
        dialog = e_alert_dialog_new_for_args (
                window, "mail:ask-delete-vfolder-msg",
-               camel_folder_get_full_name (folder), NULL);
+               camel_folder_get_full_display_name (folder), NULL);
 
        container = e_alert_dialog_get_content_area (E_ALERT_DIALOG (dialog));
 
@@ -189,7 +189,7 @@ mail_reader_delete_folder_cb (GObject *source_object,
        } else if (local_error != NULL) {
                e_alert_submit (
                        alert_sink, "mail:no-delete-folder",
-                       camel_folder_get_full_name (folder),
+                       camel_folder_get_full_display_name (folder),
                        local_error->message, NULL);
                g_error_free (local_error);
 
@@ -1359,7 +1359,7 @@ e_mail_reader_mark_selected_ignore_thread (EMailReader *reader,
                        alert_sink = e_mail_reader_get_alert_sink (reader);
 
                        activity = e_alert_sink_submit_thread_job (alert_sink, description, alert_id,
-                               camel_folder_get_full_name (folder), 
mail_reader_utils_mark_ignore_thread_thread,
+                               camel_folder_get_full_display_name (folder), 
mail_reader_utils_mark_ignore_thread_thread,
                                mit, mark_ignore_thread_data_free);
 
 
diff --git a/src/mail/em-folder-properties.c b/src/mail/em-folder-properties.c
index e0fdc570a8..9fbc89deb4 100644
--- a/src/mail/em-folder-properties.c
+++ b/src/mail/em-folder-properties.c
@@ -513,7 +513,8 @@ emfp_get_folder_item (EConfig *ec,
        if (store) {
                gchar *path;
 
-               path = g_strconcat (camel_service_get_display_name (CAMEL_SERVICE (store)), "/", folder_name, 
NULL);
+               path = g_strconcat (camel_service_get_display_name (CAMEL_SERVICE (store)), "/",
+                       camel_folder_get_full_display_name (context->folder), NULL);
                row = add_text_row (GTK_TABLE (table), row, _("Path:"), path, TRUE);
                g_free (path);
        }
diff --git a/src/mail/mail-send-recv.c b/src/mail/mail-send-recv.c
index 09ce3b414b..ce5bb9fd3e 100644
--- a/src/mail/mail-send-recv.c
+++ b/src/mail/mail-send-recv.c
@@ -1504,7 +1504,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
 
                                if (folder) {
                                        store = camel_folder_get_parent_store (folder);
-                                       full_name = camel_folder_get_full_name (folder);
+                                       full_name = camel_folder_get_full_display_name (folder);
                                } else {
                                        store = m->store;
                                        full_name = (const gchar *) m->folders->pdata[i];
diff --git a/src/mail/message-list.c b/src/mail/message-list.c
index 51e3fd79e0..1da5b812d3 100644
--- a/src/mail/message-list.c
+++ b/src/mail/message-list.c
@@ -2081,27 +2081,35 @@ ml_tree_value_at_ex (ETreeModel *etm,
                return GINT_TO_POINTER (camel_message_info_get_user_flag (msg_info, "ignore-thread") ? 1 : 0);
        }
        case COL_LOCATION: {
-               /* Fixme : freeing memory stuff (mem leaks) */
-               CamelStore *store;
                CamelFolder *folder;
-               CamelService *service;
-               const gchar *store_name;
-               const gchar *folder_name;
+               gchar *full_display_name;
 
                folder = message_list->priv->folder;
 
-               if (CAMEL_IS_VEE_FOLDER (folder))
+               if (CAMEL_IS_VEE_FOLDER (folder)) {
                        folder = camel_vee_folder_get_location (
                                CAMEL_VEE_FOLDER (folder),
                                (CamelVeeMessageInfo *) msg_info, NULL);
+               }
+
+               full_display_name = e_mail_folder_to_full_display_name (folder, NULL);
+
+               if (!full_display_name) {
+                       CamelStore *store;
+                       CamelService *service;
+                       const gchar *store_name;
+                       const gchar *folder_name;
 
-               store = camel_folder_get_parent_store (folder);
-               folder_name = camel_folder_get_full_name (folder);
+                       store = camel_folder_get_parent_store (folder);
+                       folder_name = camel_folder_get_full_name (folder);
 
-               service = CAMEL_SERVICE (store);
-               store_name = camel_service_get_display_name (service);
+                       service = CAMEL_SERVICE (store);
+                       store_name = camel_service_get_display_name (service);
+
+                       full_display_name = g_strdup_printf ("%s : %s", store_name, folder_name);
+               }
 
-               return g_strdup_printf ("%s : %s", store_name, folder_name);
+               return full_display_name;
        }
        case COL_MIXED_RECIPIENTS:
        case COL_RECIPIENTS: