From 98cc37b8e5605bc3f1065c0a9d5b22a0ddf7c15c Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Fri, 23 Dec 2005 04:04:16 +0000
Subject: Commited evolution.xml and evolution-mail-message.xml

2005-12-23  Srinivasa Ragavan <sragavan@novell.com>

	* Commited evolution.xml and evolution-mail-message.xml

svn path=/trunk/; revision=30940
---
 ui/ChangeLog                  | 13 +++++++++++++
 ui/evolution-mail-message.xml |  2 ++
 ui/evolution.xml              |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 55de0830d4..3454637c64 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-23  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fixes bug #324677
+
+	* evolution-mail-message.xml: Added Clear and
+	Completed flag options to menu.
+
+2005-12-22  M Victor Aloysius J  <victoraloy@gmail.com>
+
+	** Fixes bug #313293
+
+	* evolution.xml: Added Shortcut for preferences.
+
 2005-12-20  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* evolution-mail-message.xml: Reverting David's patch
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 073d7dec59..c237753df4 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -372,6 +372,8 @@
       	    <separator f="" name="emaillist2"/>
 
             <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
+            <menuitem name="MessageFollowUpClear" verb="" _label="_Clear Flag"/>
+            <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed" pixtype="pixbuf"/>
 
           </submenu>
           <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 9e77eef1ba..b2177661bf 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -105,7 +105,7 @@
 
       <placeholder name="PluginManagerPlaceholder"/>
 
-      <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings"/>
+      <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings" accel="*Control**Shift*s"/>
     </submenu>
 
     <submenu name="View" _label="_View">
-- 
cgit