From b452caf1791ce100a9f8f3024aa701a4344bbe7e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 16 May 2008 19:51:18 +0000
Subject: ** Fixes bug #514383

2008-05-16  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #514383

	* plugins/mark-all-read/mark-all-read.c: Add a Cancel button.

	* mail/mail.error.xml: Remove the "ask-mark-read" error.

	* e-error.c (e_error_newv): Widget packing adjustments.


svn path=/trunk/; revision=35504
---
 mail/ChangeLog      | 6 ++++++
 mail/mail.error.xml | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 534338ec3c..7cb095136e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-16  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #514383
+
+	* mail.error.xml: Remove the "ask-mark-read" error.
+
 2008-05-14  Jeffrey Stedfast  <fejj@novell.com>
 
 	Needed so that IMAP4 can allow users to configure cache
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 9caf7158a6..0c6c7f3332 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -368,14 +368,6 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
     <button stock="gtk-yes" _label="Send Receipt" response="GTK_RESPONSE_YES"/>
   </error>
 
-  <error id="ask-mark-read" type="question" default="GTK_RESPONSE_NO">
-    <_title>Mark all messages as read</_title>
-    <_primary>Mark all messages in this folder and subfolders as read?</_primary>
-    <_secondary xml:space="preserve">Do you want the operation to be performed also in the subfolders?</_secondary>
-    <button stock="gtk-no" _label="Only on _Current Folder" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-yes" _label="on Current Folder and _Subfolders" response="GTK_RESPONSE_YES"/>
-  </error>
-
   <error id="ask-quick-offline" type="question" default="GTK_RESPONSE_NO">
     <_primary>Synchronize folders locally for offline usage?</_primary>
     <_secondary xml:space="preserve">Do you want to locally synchronize the folders that are marked for offline usage?</_secondary>
-- 
cgit v1.2.3