Bug #699555 - prompt-on-mark-all-read doesn't work in context menu

2 files changed, 2 insertions, 16 deletions

diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 16ad279629..3af5fac4ee 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -423,24 +423,18 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
-	EShellBackend *shell_backend;
 	EMailShellContent *mail_shell_content;
 	EMailReader *reader;
 	EMailView *mail_view;
 	CamelFolder *folder;
 	GtkWindow *parent;
-	EMailBackend *backend;
-	EMailSession *session;
-	MailFolderCache *cache;
 	GtkWidget *message_list;
 	GPtrArray *uids;
 	const gchar *key;
-	const gchar *prompt;
 	guint ii;
 
 	shell_view = E_SHELL_VIEW (mail_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell_backend = e_shell_view_get_shell_backend (shell_view);
 	parent = GTK_WINDOW (shell_window);
 
 	mail_shell_content = mail_shell_view->priv->mail_shell_content;
@@ -451,17 +445,9 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
 	folder = e_mail_reader_get_folder (reader);
 	g_return_if_fail (folder != NULL);
 
-	backend = E_MAIL_BACKEND (shell_backend);
-	session = e_mail_backend_get_session (backend);
-	cache = e_mail_session_get_folder_cache (session);
 	key = "prompt-on-mark-all-read";
 
-	if (mail_folder_cache_get_folder_has_children (cache, 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))
+	if (!em_utils_prompt_user (parent, key, "mail:ask-mark-all-read", NULL))
 		return;
 
 	message_list = e_mail_reader_get_message_list (reader);
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index baba27918c..d04553d0bb 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -111,7 +111,7 @@ prompt_user (gboolean has_subfolders)
 		parent = e_shell_get_active_window (shell);
 
 		return em_utils_prompt_user (
-			parent, NULL, "mail:ask-mark-all-read", NULL) ?
+			parent, "prompt-on-mark-all-read", "mail:ask-mark-all-read", NULL) ?
 			MARK_ALL_READ_CURRENT_FOLDER : MARK_ALL_READ_CANCEL;
 	}