From c8cc95d20cc90c2ab3c4118a859e2fc22950c72b Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Thu, 15 Jan 2004 16:13:39 +0000
Subject: moved 'Forget Passwords' item...

2004-01-15  Rodrigo Moya <rodrigo@ximian.com>

	* evolution-mail-global.xml: moved 'Forget Passwords' item...

	* evolution.xml: ...to the shell.

svn path=/trunk/; revision=24244
---
 ui/ChangeLog                 | 6 ++++++
 ui/evolution-mail-global.xml | 5 -----
 ui/evolution.xml             | 4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 7c7a874638..8e3f49922a 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* evolution-mail-global.xml: moved 'Forget Passwords' item...
+
+	* evolution.xml: ...to the shell.
+
 2004-01-12  Meilof Veeningen  <meilof@wanadoo.nl>
 
 	* evolution-message-composer.xml: Add menu items to show To and
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index b760d089c3..6c6716cfe6 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -5,9 +5,6 @@
     <cmd name="EmptyTrash"
      _tip="Permanently remove all deleted messages from all folders"/>
 
-    <cmd name="ForgetPasswords"
-     _tip="Forget remembered passwords so you will be prompted for them again"/>
-
     <cmd name="MailCompose"
      _tip="Open a window for composing a mail message"
      pixtype="pixbuf"/>
@@ -69,8 +66,6 @@
 
         <placeholder name="MailMessageActions"/>
 
-        <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
-
         <placeholder name="MailListActions"/>
 
         <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index d78ac04df3..3c85fbc489 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -13,6 +13,9 @@
      _tip="Send queued items and retrieve new items"
      pixtype="pixbuf"/>
 
+    <cmd name="ForgetPasswords"
+     _tip="Forget remembered passwords so you will be prompted for them again"/>
+
     <cmd name="Settings" pixtype="pixbuf"/>
 
     <cmd name="ToggleOffline" 
@@ -72,6 +75,7 @@
 
     <submenu name="Actions" _label="_Actions">
       <menuitem name="SendReceive" verb="" _label="_Send / Receive" accel="F9"/>
+      <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
       <placeholder name="ComponentActionsPlaceholder"/>
     </submenu>
 
-- 
cgit v1.2.3