From ee974e6d09d80808df9275e44295575815a230e4 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Thu, 9 Aug 2001 06:44:50 +0000
Subject: Remove "Tools" and "Actions" menus. Create a
 "ComponentActionsPlaceholder"

* evolution.xml: Remove "Tools" and "Actions" menus.  Create a
"ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder"
instead.
* evolution-mail-messagedisplay.xml: Likewise, put "Tools" and
"Actions" in placeholders.

svn path=/trunk/; revision=11823
---
 ui/evolution-comp-editor.xml         |  2 +-
 ui/evolution-mail-list.xml           |  8 ++++----
 ui/evolution-mail-messagedisplay.xml | 26 +++++++++++++-------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ui/evolution-comp-editor.xml b/ui/evolution-comp-editor.xml
index d4e4ae6c1d..17c7910749 100644
--- a/ui/evolution-comp-editor.xml
+++ b/ui/evolution-comp-editor.xml
@@ -55,7 +55,7 @@
 
 </submenu>	
 
-<submenu name="Actions" _label="_Action">
+<submenu name="Actions" _label="_Actions">
 
 	<placeholder name="Actions"/>
 
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 210a49ad47..9bb23f012c 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -107,13 +107,13 @@
      </placeholder>
     </submenu>
 
-    <submenu name="Actions">
-      <placeholder name="Component">
+    <placeholder name="ComponentActionsPlaceholder">
+      <submenu name="Actions" _label="_Actions">
         <placeholder name="MailListActions">
           <menuitem name="FolderExpunge" verb="" _label="_Expunge"/>
         </placeholder>
-      </placeholder>
-    </submenu>
+      </submenu>
+    </placeholder>
   </menu>
 
 </Root>
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 3507abfa7f..1be99c0a5d 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -26,20 +26,20 @@
       <placeholder name="MailMessageView"/>
     </submenu>
 
-    <placeholder name="Component"/>
-
-    <submenu name="Actions" _label="_Actions">
-      <placeholder name="Component">
+    <placeholder name="ComponentActionsPlaceholder">
+      <submenu name="Actions" _label="_Actions">
         <placeholder name="MailMessageActions"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Tools" _label="_Tools">
-      <placeholder name="Component">
-        <placeholder name="MailFilterTools"/>
-        <placeholder name="MailVFolderTools"/>
-      </placeholder>
-    </submenu>
+      </submenu>
+    </placeholder>
+
+    <placeholder name="ComponentToolsPlaceholder">
+      <submenu name="Tools" _label="_Tools">
+	<placeholder name="Component">
+	  <placeholder name="MailFilterTools"/>
+	  <placeholder name="MailVFolderTools"/>
+	</placeholder>
+      </submenu>
+    </placeholder>
 
   </menu>
 
-- 
cgit v1.2.3