From b5bff5c072a009e81447c2db2491bdfcb5855dca Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Fri, 14 Jul 2006 05:42:26 +0000
Subject: Fix for bug #335747

svn path=/trunk/; revision=32307
---
 mail/ChangeLog                    |  9 +++++++++
 mail/em-folder-browser.c          |  3 +--
 mail/evolution-mail.schemas.in.in | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8be31801dd..5f25965f35 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-14  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #335747
+
+	* em-folder-browser.c: (emfb_mark_all_read): Prompt optionally while
+	marking multiple messages.
+	* evolution-mail.schemas.in.in: Added a schema for prompting while
+	marking multiple messages.
+
 2006-07-13  Andre Klapper  <a9016009@gmx.de>
 
 	* mail-config.glade: remove empty strings from translation
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index f15df9984c..465e9dfb0a 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1307,8 +1307,7 @@ emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path)
 
 	if (emfv->folder == NULL)
 		return;
-	
-	if( e_error_run ((GtkWidget *)emfv,"mail:ask-mark-all-read",NULL) == GTK_RESPONSE_YES){
+	if( em_utils_prompt_user((GtkWindow *)emfv, "/apps/evolution/mail/prompts/mark_all_read","mail:ask-mark-all-read", NULL)){
 		uids = message_list_get_uids(emfv->list);
 		camel_folder_freeze(emfv->folder);
 		for (i=0;i<uids->len;i++)
diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in
index 9041f3a356..d869554de9 100644
--- a/mail/evolution-mail.schemas.in.in
+++ b/mail/evolution-mail.schemas.in.in
@@ -747,6 +747,20 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/prompts/mark_all_read</key>
+      <applyto>/apps/evolution/mail/prompts/mark_all_read</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Prompt while marking multiple messages</short>
+         <long>
+	 It disables/enables the prompt while marking multiple messages.
+         </long>
+      </locale>
+    </schema>
+    
     <!-- Trash settings -->
 
     <schema>
-- 
cgit v1.2.3