[evolution] e_mail_folder_to_full_display_name: Use display-name for folders with no parent



commit b62c5f51be23e41f363f074b8536a16a05e1b71c
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jul 5 20:23:59 2022 +0200

    e_mail_folder_to_full_display_name: Use display-name for folders with no parent

 src/libemail-engine/e-mail-folder-utils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/libemail-engine/e-mail-folder-utils.c b/src/libemail-engine/e-mail-folder-utils.c
index 8c2857cf1d..13a0e6b90c 100644
--- a/src/libemail-engine/e-mail-folder-utils.c
+++ b/src/libemail-engine/e-mail-folder-utils.c
@@ -2154,9 +2154,10 @@ e_mail_folder_to_full_display_name (CamelFolder *folder,
 
                service_display_name = camel_service_get_display_name (CAMEL_SERVICE (store));
 
-               if (CAMEL_IS_VEE_FOLDER (folder) && (
+               if (!folder_name || !strchr (folder_name, '/') || (
+                   CAMEL_IS_VEE_FOLDER (folder) && (
                    g_strcmp0 (folder_name, CAMEL_VTRASH_NAME) == 0 ||
-                   g_strcmp0 (folder_name, CAMEL_VJUNK_NAME) == 0)) {
+                   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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]