From a5d79e9f915dc49ef0259ce7681c1f552c335a4c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 21 May 2010 16:30:40 +0200 Subject: Bug #546551 - Dialog for mark-all-read always mentions subfolders --- modules/mail/e-mail-shell-view-actions.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 15694111ab..9bac5dfb4a 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -19,6 +19,7 @@ * */ +#include "mail/mail-folder-cache.h" #include "e-mail-shell-view-private.h" static void @@ -232,7 +233,10 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action, g_return_if_fail (folder != NULL); key = "/apps/evolution/mail/prompts/mark_all_read"; - prompt = "mail:ask-mark-all-read"; + if (mail_folder_cache_get_folder_has_children (mail_folder_cache_get_default (), folder, NULL)) + prompt = "mail:ask-mark-all-read-sub"; + else + prompt = "mail:ask-mark-all-read"; if (!em_utils_prompt_user (parent, key, prompt, NULL)) return; -- cgit