aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-05-21 22:30:40 +0800
committerMilan Crha <mcrha@redhat.com>2010-05-21 22:30:40 +0800
commita5d79e9f915dc49ef0259ce7681c1f552c335a4c (patch)
tree85a17cf63e8ac8fe68e0cb2ff8b42404f63917b1 /modules
parent22b33668db988f628e411ef67ecc10520c9f20d3 (diff)
downloadgsoc2013-evolution-a5d79e9f915dc49ef0259ce7681c1f552c335a4c.tar.gz
gsoc2013-evolution-a5d79e9f915dc49ef0259ce7681c1f552c335a4c.tar.zst
gsoc2013-evolution-a5d79e9f915dc49ef0259ce7681c1f552c335a4c.zip
Bug #546551 - Dialog for mark-all-read always mentions subfolders
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c6
1 files changed, 5 insertions, 1 deletions
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;